def __init__(self, parent, titlebar):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(
self, N_('Ignore all whitespace'), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(tooltip=N_('Diff Options'),
icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar.add_corner_widget(self.diffopts_button)
self.action_apply_selection = qtutils.add_action(
self, '', self.apply_selection, Qt.Key_S)
self.action_revert_selection = qtutils.add_action(
self, '', self.revert_selection)
self.action_revert_selection.setIcon(qtutils.icon('undo.svg'))
self.launch_editor = qtutils.add_action(self, cmds.LaunchEditor.name(),
run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(),
run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.git_icon())
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('set_text'), self.setPlainText)
def __init__(self, parent, titlebar):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
tooltip=N_('Diff Options'), icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar.add_corner_widget(self.diffopts_button)
self.action_apply_selection = qtutils.add_action(self, '',
self.apply_selection, Qt.Key_S)
self.action_revert_selection = qtutils.add_action(self, '',
self.revert_selection)
self.action_revert_selection.setIcon(qtutils.icon('undo.svg'))
self.launch_editor = qtutils.add_action(self,
cmds.LaunchEditor.name(), run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(), run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('set_text'), self.setPlainText)
def _create_unstaged_context_menu(self, menu, s):
modified_submodule = (s.modified and
s.modified[0] in self.m.submodules)
if modified_submodule:
return self._create_modified_submodule_context_menu(menu, s)
if self.unstaged():
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.Edit.SHORTCUT)
if s.modified and self.m.stageable():
action = menu.addAction(qtutils.git_icon(),
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool))
action.setShortcut(cmds.LaunchDifftool.SHORTCUT)
if self.m.stageable():
menu.addSeparator()
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
if s.modified and self.m.stageable():
if self.m.undoable():
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Unstaged Edits...'),
self._revert_unstaged_edits)
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Uncommited Edits...'),
lambda: self._revert_uncommitted_edits(
self.modified()))
if self.unstaged() and not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
cmds.OpenDefaultApp.name(),
cmds.run(cmds.OpenDefaultApp, self.unstaged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
cmds.OpenParentDir.name(),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
if s.untracked:
menu.addSeparator()
menu.addAction(qtutils.discard_icon(),
N_('Delete File(s)...'), self._delete_files)
menu.addSeparator()
menu.addAction(qtutils.icon('edit-clear.svg'),
N_('Add to .gitignore'),
cmds.run(cmds.Ignore,
map(lambda x: '/' + x, self.untracked())))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_unstaged_context_menu(self, menu, s):
modified_submodule = (s.modified and
s.modified[0] in self.m.submodules)
if modified_submodule:
return self._create_modified_submodule_context_menu(menu, s)
if self.unstaged():
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.Edit.SHORTCUT)
if s.modified and self.m.stageable():
action = menu.addAction(qtutils.git_icon(),
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool))
action.setShortcut(cmds.LaunchDifftool.SHORTCUT)
if self.m.stageable():
menu.addSeparator()
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
if s.modified and self.m.stageable():
if self.m.undoable():
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Unstaged Edits...'),
self._revert_unstaged_edits)
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Uncommited Edits...'),
lambda: self._revert_uncommitted_edits(
self.modified()))
if self.unstaged() and not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
cmds.OpenDefaultApp.name(),
cmds.run(cmds.OpenDefaultApp, self.unstaged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
cmds.OpenParentDir.name(),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
if s.untracked:
menu.addSeparator()
menu.addAction(qtutils.discard_icon(),
N_('Delete File(s)...'), self._delete_files)
menu.addSeparator()
menu.addAction(qtutils.icon('edit-clear.svg'),
N_('Add to .gitignore'),
cmds.run(cmds.Ignore,
map(lambda x: '/' + x, self.untracked())))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_unmerged_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(), self.tr('Launch Merge Tool'),
cmds.run(cmds.Mergetool, self.unmerged()))
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addSeparator()
action = menu.addAction(qtutils.options_icon(),
self.tr(cmds.LaunchEditor.NAME),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(
qtutils.file_icon(), self.tr(cmds.OpenDefaultApp.NAME),
cmds.run(cmds.OpenDefaultApp, self.unmerged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
self.tr(cmds.OpenParentDir.NAME),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_unmerged_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(),
N_('Launch Merge Tool'),
cmds.run(cmds.Mergetool, self.unmerged()))
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addSeparator()
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
cmds.OpenDefaultApp.name(),
cmds.run(cmds.OpenDefaultApp, self.unmerged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
cmds.OpenParentDir.name(),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def __init__(self, parent):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
self.mode = self.model.mode_none
self.action_process_section = qtutils.add_action(self,
N_('Process Section'),
self.apply_section, Qt.Key_H)
self.action_process_selection = qtutils.add_action(self,
N_('Process Selection'),
self.apply_selection, Qt.Key_S)
self.launch_editor = qtutils.add_action(self,
cmds.LaunchEditor.name(), run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(), run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.action_stage_selection = qtutils.add_action(self,
N_('Stage &Selected Lines'),
self.stage_selection)
self.action_stage_selection.setIcon(qtutils.icon('add.svg'))
self.action_stage_selection.setShortcut(Qt.Key_S)
self.action_revert_selection = qtutils.add_action(self,
N_('Revert Selected Lines...'),
self.revert_selection)
self.action_revert_selection.setIcon(qtutils.icon('undo.svg'))
self.action_unstage_selection = qtutils.add_action(self,
N_('Unstage &Selected Lines'),
self.unstage_selection)
self.action_unstage_selection.setIcon(qtutils.icon('remove.svg'))
self.action_unstage_selection.setShortcut(Qt.Key_S)
self.action_apply_selection = qtutils.add_action(self,
N_('Apply Diff Selection to Work Tree'),
self.stage_selection)
self.action_apply_selection.setIcon(qtutils.apply_icon())
model.add_observer(model.message_mode_about_to_change,
self._mode_about_to_change)
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('copyAvailable(bool)'),
self.enable_selection_actions)
self.connect(self, SIGNAL('set_text'), self.setPlainText)
def _create_staged_context_menu(self, menu, s):
if s.staged[0] in self.m.submodules:
return self._create_staged_submodule_context_menu(menu, s)
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
action = menu.addAction(qtutils.git_icon(),
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool))
action.setShortcut(cmds.LaunchDifftool.SHORTCUT)
if self.m.unstageable():
menu.addSeparator()
action = menu.addAction(qtutils.icon('remove.svg'),
N_('Unstage Selected'),
cmds.run(cmds.Unstage, self.staged()))
action.setShortcut(cmds.Unstage.SHORTCUT)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
cmds.OpenDefaultApp.name(),
cmds.run(cmds.OpenDefaultApp, self.staged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
cmds.OpenParentDir.name(),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
if self.m.undoable():
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Unstaged Edits...'),
lambda: self._revert_unstaged_edits(staged=True))
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Uncommited Edits...'),
lambda: self._revert_uncommitted_edits(
self.staged()))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_staged_context_menu(self, menu, s):
if s.staged[0] in self.m.submodules:
return self._create_staged_submodule_context_menu(menu, s)
if self.m.unstageable():
action = menu.addAction(qtutils.icon('remove.svg'),
N_('Unstage Selected'),
cmds.run(cmds.Unstage, self.staged()))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addSeparator()
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
action = menu.addAction(qtutils.git_icon(),
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool))
action.setShortcut(cmds.LaunchDifftool.SHORTCUT)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
cmds.OpenDefaultApp.name(),
cmds.run(cmds.OpenDefaultApp, self.staged()))
action.setShortcut(cmds.OpenDefaultApp.SHORTCUT)
action = menu.addAction(qtutils.open_file_icon(),
cmds.OpenParentDir.name(),
self._open_parent_dir)
action.setShortcut(cmds.OpenParentDir.SHORTCUT)
if self.m.undoable():
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Unstaged Edits...'),
lambda: self._revert_unstaged_edits(staged=True))
menu.addAction(qtutils.icon('undo.svg'),
N_('Revert Uncommited Edits...'),
self._revert_uncommitted_edits)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_staged_submodule_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(), self.tr('Launch git-cola'),
cmds.run(cmds.OpenRepo, os.path.abspath(s.staged[0])))
action = menu.addAction(qtutils.options_icon(),
self.tr(cmds.LaunchEditor.NAME),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
menu.addSeparator()
action = menu.addAction(qtutils.icon('remove.svg'),
self.tr('Unstage Selected'),
cmds.run(cmds.Unstage, self.staged()))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_staged_submodule_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
os.path.abspath(s.staged[0])))
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.LaunchEditor.SHORTCUT)
menu.addSeparator()
action = menu.addAction(qtutils.icon('remove.svg'),
N_('Unstage Selected'),
cmds.run(cmds.Unstage, self.staged()))
action.setShortcut(cmds.Unstage.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_modified_submodule_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(),
self.tr('Launch git-cola'),
cmds.run(cmds.OpenRepo,
os.path.abspath(s.modified[0])))
action = menu.addAction(qtutils.options_icon(),
self.tr(cmds.LaunchEditor.NAME),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.Edit.SHORTCUT)
if self.m.stageable():
menu.addSeparator()
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def _create_modified_submodule_context_menu(self, menu, s):
menu.addAction(qtutils.git_icon(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
os.path.abspath(s.modified[0])))
action = menu.addAction(qtutils.options_icon(),
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor))
action.setShortcut(cmds.Edit.SHORTCUT)
if self.m.stageable():
menu.addSeparator()
action = menu.addAction(qtutils.icon('add.svg'),
N_('Stage Selected'),
cmds.run(cmds.Stage, self.unstaged()))
action.setShortcut(cmds.Stage.SHORTCUT)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def launch_editor(widget, *shortcuts):
icon = qtutils.options_icon()
return cmd_action(widget, cmds.LaunchEditor, icon, *shortcuts)
def __init__(self, parent):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(
self, N_('Ignore all whitespace'), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(tooltip=N_('Diff Options'),
icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar = parent.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
self.action_process_section = qtutils.add_action(
self, N_('Process Section'), self.apply_section, Qt.Key_H)
self.action_process_selection = qtutils.add_action(
self, N_('Process Selection'), self.apply_selection, Qt.Key_S)
self.launch_editor = qtutils.add_action(self, cmds.LaunchEditor.name(),
run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(),
run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.action_stage_selection = qtutils.add_action(
self, N_('Stage &Selected Lines'), self.stage_selection)
self.action_stage_selection.setIcon(qtutils.icon('add.svg'))
self.action_stage_selection.setShortcut(Qt.Key_S)
self.action_revert_selection = qtutils.add_action(
self, N_('Revert Selected Lines...'), self.revert_selection)
self.action_revert_selection.setIcon(qtutils.icon('undo.svg'))
self.action_unstage_selection = qtutils.add_action(
self, N_('Unstage &Selected Lines'), self.unstage_selection)
self.action_unstage_selection.setIcon(qtutils.icon('remove.svg'))
self.action_unstage_selection.setShortcut(Qt.Key_S)
self.action_apply_selection = qtutils.add_action(
self, N_('Apply Diff Selection to Work Tree'),
self.stage_selection)
self.action_apply_selection.setIcon(qtutils.apply_icon())
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('copyAvailable(bool)'),
self.enable_selection_actions)
self.connect(self, SIGNAL('set_text'), self.setPlainText)
def launch_editor(widget, *shortcuts):
icon = qtutils.options_icon()
return cmd_action(widget, cmds.LaunchEditor, icon, hotkeys.EDIT,
*shortcuts)
def __init__(self, parent):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.add_item('Staged', 'plus.png', hide=True)
self.add_item('Unmerged', 'unmerged.png', hide=True)
self.add_item('Modified', 'modified.png', hide=True)
self.add_item('Untracked', 'untracked.png', hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.expanded_items = set()
self.process_selection = qtutils.add_action(self,
'Process Selection', self._process_selection,
defs.stage_shortcut)
self.launch_difftool = qtutils.add_action(self,
'Launch Diff Tool', self._launch_difftool,
defs.difftool_shortcut)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.launch_editor = qtutils.add_action(self,
'Launch Editor', self._launch_editor,
defs.editor_shortcut)
self.launch_editor.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(self,
self.txt_default_app,
self._open_using_default_app,
defs.default_app_shortcut)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir = qtutils.add_action(self,
self.txt_parent_dir,
self._open_parent_dir,
defs.parent_dir_shortcut)
self.open_parent_dir.setIcon(qtutils.open_file_icon())
self.up = qtutils.add_action(self,
'Move Up', self.move_up, Qt.Key_K)
self.down = qtutils.add_action(self,
'Move Down', self.move_down, Qt.Key_J)
self.copy_path_action = qtutils.add_action(self,
'Copy Path to Clipboard',
self.copy_path,
QtGui.QKeySequence.Copy)
self.copy_path_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.connect(self, SIGNAL('about_to_update'), self._about_to_update)
self.connect(self, SIGNAL('updated'), self._updated)
self.m = cola.model()
self.m.add_observer(self.m.message_about_to_update,
self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL('itemSelectionChanged()'),
self.show_selection)
self.connect(self,
SIGNAL('itemDoubleClicked(QTreeWidgetItem*,int)'),
self.double_clicked)
self.connect(self,
SIGNAL('itemCollapsed(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
self.connect(self,
SIGNAL('itemExpanded(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.summary = CommitSummaryLineEdit()
self.description = CommitMessageTextEdit()
self.commit_button = create_toolbutton(text='Commit@@verb',
tooltip='Commit staged changes',
icon=save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = create_toolbutton(icon=options_icon(),
tooltip='Actions...')
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
# Amend checkbox
self.signoff_action = self.actions_menu.addAction(tr('Sign Off'))
self.signoff_action.setToolTip('Sign off on this commit')
self.signoff_action.setShortcut('Ctrl+i')
self.commit_action = self.actions_menu.addAction(tr('Commit@@verb'))
self.commit_action.setToolTip(tr('Commit staged changes'))
self.commit_action.setShortcut('Ctrl+Return')
self.actions_menu.addSeparator()
self.amend_action = self.actions_menu.addAction(tr('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.prev_commits_menu = self.actions_menu.addMenu(
'Load Previous Commit Message')
self.connect(self.prev_commits_menu, SIGNAL('aboutToShow()'),
self.build_prev_commits_menu)
self.toplayout = QtGui.QHBoxLayout()
self.toplayout.setMargin(0)
self.toplayout.setSpacing(defs.spacing)
self.toplayout.addWidget(self.actions_button)
self.toplayout.addWidget(self.summary)
self.toplayout.addWidget(self.commit_button)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.mainlayout.addLayout(self.toplayout)
self.mainlayout.addWidget(self.description)
self.setLayout(self.mainlayout)
relay_signal(self, self.description,
SIGNAL(signals.load_previous_message))
connect_button(self.commit_button, self.commit)
connect_action(self.commit_action, self.commit)
connect_action(self.signoff_action, emit(self, signals.signoff))
cola.notifier().connect(signals.amend, self.amend_action.setChecked)
# Broadcast the amend mode
connect_action_bool(self.amend_action, emit(self, signals.amend_mode))
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('returnPressed()'),
self.focus_description)
self.connect(self.summary, SIGNAL('downPressed()'),
self.focus_description)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('shiftTab()'),
self.focus_summary)
self.setFont(diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = add_action(self, cmds.SignOff.name(),
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = add_action(self,
N_('Commit@@verb'),
self.commit,
cmds.Commit.SHORTCUT)
self.commit_action.setToolTip(N_('Commit staged changes'))
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = N_('Commit staged changes\n'
'Shortcut: Ctrl+Enter')
self.commit_button = create_toolbutton(text=N_('Commit@@verb'),
tooltip=commit_button_tooltip,
icon=save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = create_toolbutton(icon=options_icon(),
tooltip=N_('Actions...'))
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
N_('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.amend_action.setShortcut(cmds.AmendMode.SHORTCUT)
self.amend_action.setShortcutContext(Qt.ApplicationShortcut)
# Spell checker
self.check_spelling_action = self.actions_menu.addAction(
N_('Check Spelling'))
self.check_spelling_action.setCheckable(True)
self.check_spelling_action.setChecked(False)
# Line wrapping
self.actions_menu.addSeparator()
self.autowrap_action = self.actions_menu.addAction(
N_('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(linebreak())
self.prev_commits_menu = self.actions_menu.addMenu(
N_('Load Previous Commit Message'))
self.connect(self.prev_commits_menu, SIGNAL('aboutToShow()'),
self.build_prev_commits_menu)
self.toplayout = QtGui.QHBoxLayout()
self.toplayout.setMargin(0)
self.toplayout.setSpacing(defs.spacing)
self.toplayout.addWidget(self.actions_button)
self.toplayout.addWidget(self.summary)
self.toplayout.addWidget(self.commit_button)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.mainlayout.addLayout(self.toplayout)
self.mainlayout.addWidget(self.description)
self.setLayout(self.mainlayout)
connect_button(self.commit_button, self.commit)
notifier = cola.notifier()
notifier.connect(notifier.AMEND, self.amend_action.setChecked)
# Broadcast the amend mode
connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
connect_action_bool(self.check_spelling_action,
self.toggle_check_spelling)
# Handle the one-off autowrapping
connect_action_bool(self.autowrap_action, self.set_linebreak)
add_action(self.summary, N_('Move Down'), self.focus_description,
Qt.Key_Down, Qt.Key_Return, Qt.Key_Enter)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('leave()'),
self.focus_summary)
self.setFont(diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(tabwidth())
self.set_textwidth(textwidth())
self.set_linebreak(linebreak())
# Loading message
commit_msg = ""
commit_msg_path = commit_message_path()
if commit_msg_path:
commit_msg = utils.slurp(commit_msg_path)
self.set_commit_message(commit_msg)
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = qtutils.add_action(self, cmds.SignOff.name(),
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self,
N_('Commit@@verb'),
self.commit,
cmds.Commit.SHORTCUT)
self.commit_action.setToolTip(N_('Commit staged changes'))
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.setMinimumHeight(defs.tool_button_height)
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = N_('Commit staged changes\n'
'Shortcut: Ctrl+Enter')
self.commit_button = qtutils.create_toolbutton(
text=N_('Commit@@verb'), tooltip=commit_button_tooltip,
icon=qtutils.save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = qtutils.create_toolbutton(
icon=qtutils.options_icon(), tooltip=N_('Actions...'))
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
qtutils.hide_button_menu_indicator(self.actions_button)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
N_('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.amend_action.setShortcut(cmds.AmendMode.SHORTCUT)
self.amend_action.setShortcutContext(Qt.ApplicationShortcut)
# Bypass hooks
self.bypass_commit_hooks_action = self.actions_menu.addAction(
N_('Bypass Commit Hooks'))
self.bypass_commit_hooks_action.setCheckable(True)
self.bypass_commit_hooks_action.setChecked(False)
# Sign commits
cfg = gitcfg.current()
self.sign_action = self.actions_menu.addAction(
N_('Create Signed Commit'))
self.sign_action.setCheckable(True)
self.sign_action.setChecked(cfg.get('cola.signcommits', False))
# Spell checker
self.check_spelling_action = self.actions_menu.addAction(
N_('Check Spelling'))
self.check_spelling_action.setCheckable(True)
self.check_spelling_action.setChecked(False)
# Line wrapping
self.autowrap_action = self.actions_menu.addAction(
N_('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(prefs.linebreak())
# Commit message
self.actions_menu.addSeparator()
self.load_commitmsg_menu = self.actions_menu.addMenu(
N_('Load Previous Commit Message'))
self.connect(self.load_commitmsg_menu, SIGNAL('aboutToShow()'),
self.build_commitmsg_menu)
self.fixup_commit_menu = self.actions_menu.addMenu(
N_('Fixup Previous Commit'))
self.connect(self.fixup_commit_menu, SIGNAL('aboutToShow()'),
self.build_fixup_menu)
self.toplayout = qtutils.hbox(defs.no_margin, defs.spacing,
self.actions_button, self.summary,
self.commit_button)
self.toplayout.setContentsMargins(defs.margin, defs.no_margin,
defs.no_margin, defs.no_margin)
self.mainlayout = qtutils.vbox(defs.no_margin, defs.spacing,
self.toplayout, self.description)
self.setLayout(self.mainlayout)
qtutils.connect_button(self.commit_button, self.commit)
# Broadcast the amend mode
qtutils.connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
qtutils.connect_action_bool(self.check_spelling_action,
self.toggle_check_spelling)
# Handle the one-off autowrapping
qtutils.connect_action_bool(self.autowrap_action, self.set_linebreak)
qtutils.add_action(self.summary, N_('Move Down'),
self.focus_description,
Qt.Key_Return, Qt.Key_Enter)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down,
Qt.Key_Down)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_summary_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('leave()'),
self.focus_summary)
self.setFont(qtutils.diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(prefs.tabwidth())
self.set_textwidth(prefs.textwidth())
self.set_linebreak(prefs.linebreak())
# Loading message
commit_msg = ''
commit_msg_path = commit_message_path()
if commit_msg_path:
commit_msg = core.read(commit_msg_path)
self.set_commit_message(commit_msg)
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, parent=None):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
self.setDragEnabled(True)
self.add_item(N_('Staged'), hide=True)
self.add_item(N_('Unmerged'), hide=True)
self.add_item(N_('Modified'), hide=True)
self.add_item(N_('Untracked'), hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.old_current_item = None
self.expanded_items = set()
self.process_selection_action = qtutils.add_action(self,
cmds.StageOrUnstage.name(),
cmds.run(cmds.StageOrUnstage),
cmds.StageOrUnstage.SHORTCUT)
self.revert_unstaged_edits_action = qtutils.add_action(self,
cmds.RevertUnstagedEdits.name(),
cmds.run(cmds.RevertUnstagedEdits),
cmds.RevertUnstagedEdits.SHORTCUT)
self.revert_unstaged_edits_action.setIcon(qtutils.icon('undo.svg'))
self.revert_uncommitted_edits_action = qtutils.add_action(self,
cmds.RevertUncommittedEdits.name(),
cmds.run(cmds.RevertUncommittedEdits),
cmds.RevertUncommittedEdits.SHORTCUT)
self.revert_uncommitted_edits_action.setIcon(qtutils.icon('undo.svg'))
self.launch_difftool_action = qtutils.add_action(self,
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool_action.setIcon(qtutils.git_icon())
self.launch_editor_action = qtutils.add_action(self,
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor_action.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(self,
cmds.OpenDefaultApp.name(),
self._open_using_default_app,
cmds.OpenDefaultApp.SHORTCUT)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir_action = qtutils.add_action(self,
cmds.OpenParentDir.name(),
self._open_parent_dir,
cmds.OpenParentDir.SHORTCUT)
self.open_parent_dir_action.setIcon(qtutils.open_file_icon())
self.up_action = qtutils.add_action(self,
N_('Move Up'), self.move_up, Qt.Key_K)
self.down_action = qtutils.add_action(self,
N_('Move Down'), self.move_down, Qt.Key_J)
self.copy_path_action = qtutils.add_action(self,
N_('Copy Path to Clipboard'),
self.copy_path, QtGui.QKeySequence.Copy)
self.copy_path_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.copy_relpath_action = qtutils.add_action(self,
N_('Copy Relative Path to Clipboard'),
self.copy_relpath, QtGui.QKeySequence.Cut)
self.copy_relpath_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
if cmds.MoveToTrash.AVAILABLE:
self.move_to_trash_action = qtutils.add_action(self,
N_('Move file(s) to trash'),
self._trash_untracked_files, cmds.MoveToTrash.SHORTCUT)
self.move_to_trash_action.setIcon(qtutils.discard_icon())
delete_shortcut = cmds.Delete.SHORTCUT
else:
self.move_to_trash_action = None
delete_shortcut = cmds.Delete.ALT_SHORTCUT
self.delete_untracked_files_action = qtutils.add_action(self,
N_('Delete File(s)...'),
self._delete_untracked_files, delete_shortcut)
self.delete_untracked_files_action.setIcon(qtutils.discard_icon())
self.connect(self, SIGNAL('about_to_update'), self._about_to_update)
self.connect(self, SIGNAL('updated'), self._updated)
self.m = main.model()
self.m.add_observer(self.m.message_about_to_update,
self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL('itemSelectionChanged()'),
self.show_selection)
self.connect(self, SIGNAL('itemDoubleClicked(QTreeWidgetItem*,int)'),
self.double_clicked)
self.connect(self, SIGNAL('itemCollapsed(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
self.connect(self, SIGNAL('itemExpanded(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
def __init__(self, parent):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
self.add_item(N_('Staged'), hide=True)
self.add_item(N_('Unmerged'), hide=True)
self.add_item(N_('Modified'), hide=True)
self.add_item(N_('Untracked'), hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.expanded_items = set()
self.process_selection = qtutils.add_action(self,
N_('Stage / Unstage'), self._process_selection,
cmds.Stage.SHORTCUT)
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.launch_editor = qtutils.add_action(self,
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(self,
cmds.OpenDefaultApp.name(),
self._open_using_default_app,
cmds.OpenDefaultApp.SHORTCUT)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir = qtutils.add_action(self,
cmds.OpenParentDir.name(),
self._open_parent_dir,
cmds.OpenParentDir.SHORTCUT)
self.open_parent_dir.setIcon(qtutils.open_file_icon())
self.up = qtutils.add_action(self,
N_('Move Up'), self.move_up, Qt.Key_K)
self.down = qtutils.add_action(self,
N_('Move Down'), self.move_down, Qt.Key_J)
self.copy_path_action = qtutils.add_action(self,
N_('Copy Path to Clipboard'),
self.copy_path, QtGui.QKeySequence.Copy)
self.copy_path_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.connect(self, SIGNAL('about_to_update'), self._about_to_update)
self.connect(self, SIGNAL('updated'), self._updated)
self.m = cola.model()
self.m.add_observer(self.m.message_about_to_update,
self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL('itemSelectionChanged()'),
self.show_selection)
self.connect(self,
SIGNAL('itemDoubleClicked(QTreeWidgetItem*,int)'),
self.double_clicked)
self.connect(self,
SIGNAL('itemCollapsed(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
self.connect(self,
SIGNAL('itemExpanded(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
def __init__(self, parent=None):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
self.setDragEnabled(True)
self.add_item(N_('Staged'), hide=True)
self.add_item(N_('Unmerged'), hide=True)
self.add_item(N_('Modified'), hide=True)
self.add_item(N_('Untracked'), hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.old_current_item = None
self.expanded_items = set()
self.process_selection_action = qtutils.add_action(self,
cmds.StageOrUnstage.name(),
cmds.run(cmds.StageOrUnstage), hotkeys.STAGE_SELECTION)
self.revert_unstaged_edits_action = qtutils.add_action(self,
cmds.RevertUnstagedEdits.name(),
cmds.run(cmds.RevertUnstagedEdits), hotkeys.REVERT)
icon = qtutils.theme_icon('edit-undo.svg')
self.revert_unstaged_edits_action.setIcon(icon)
self.launch_difftool_action = qtutils.add_action(self,
cmds.LaunchDifftool.name(),
cmds.run(cmds.LaunchDifftool), hotkeys.DIFF)
self.launch_difftool_action.setIcon(qtutils.git_icon())
self.launch_editor_action = qtutils.add_action(self,
cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor), hotkeys.EDIT, *hotkeys.ACCEPT)
self.launch_editor_action.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(self,
cmds.OpenDefaultApp.name(),
self._open_using_default_app, hotkeys.PRIMARY_ACTION)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir_action = qtutils.add_action(self,
cmds.OpenParentDir.name(),
self._open_parent_dir, hotkeys.SECONDARY_ACTION)
self.open_parent_dir_action.setIcon(qtutils.open_file_icon())
self.up_action = qtutils.add_action(self,
N_('Move Up'), self.move_up,
hotkeys.MOVE_UP, hotkeys.MOVE_UP_SECONDARY)
self.down_action = qtutils.add_action(self,
N_('Move Down'), self.move_down,
hotkeys.MOVE_DOWN, hotkeys.MOVE_DOWN_SECONDARY)
self.copy_path_action = qtutils.add_action(self,
N_('Copy Path to Clipboard'), self.copy_path, hotkeys.COPY)
self.copy_path_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.copy_relpath_action = qtutils.add_action(self,
N_('Copy Relative Path to Clipboard'),
self.copy_relpath, hotkeys.CUT)
self.copy_relpath_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.view_history_action = qtutils.add_action(self,
N_('View History...'),
self.view_history, hotkeys.HISTORY)
# MoveToTrash and Delete use the same shortcut.
# We will only bind one of them, depending on whether or not the
# MoveToTrash command is avaialble. When available, the hotkey
# is bound to MoveToTrash, otherwise it is bound to Delete.
if cmds.MoveToTrash.AVAILABLE:
self.move_to_trash_action = qtutils.add_action(self,
N_('Move file(s) to trash'),
self._trash_untracked_files, hotkeys.TRASH)
self.move_to_trash_action.setIcon(qtutils.discard_icon())
delete_shortcut = hotkeys.DELETE_FILE
else:
self.move_to_trash_action = None
delete_shortcut = hotkeys.DELETE_FILE_SECONDARY
self.delete_untracked_files_action = qtutils.add_action(self,
N_('Delete File(s)...'),
self._delete_untracked_files, delete_shortcut)
self.delete_untracked_files_action.setIcon(qtutils.discard_icon())
self.connect(self, SIGNAL('about_to_update()'),
self._about_to_update, Qt.QueuedConnection)
self.connect(self, SIGNAL('updated()'),
self._updated, Qt.QueuedConnection)
self.m = main.model()
self.m.add_observer(self.m.message_about_to_update,
self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL('itemSelectionChanged()'),
self.show_selection)
self.connect(self, SIGNAL('itemDoubleClicked(QTreeWidgetItem*,int)'),
self.double_clicked)
self.connect(self, SIGNAL('itemCollapsed(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
self.connect(self, SIGNAL('itemExpanded(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
def __init__(self, parent, titlebar):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(
self, N_('Ignore all whitespace'), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(tooltip=N_('Diff Options'),
icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar.add_corner_widget(self.diffopts_button)
self.action_apply_selection = qtutils.add_action(
self, '', self.apply_selection, hotkeys.STAGE_DIFF)
self.action_revert_selection = qtutils.add_action(
self, '', self.revert_selection, hotkeys.REVERT)
icon = qtutils.theme_icon('edit-undo.svg')
self.action_revert_selection.setIcon(icon)
self.launch_editor = actions.launch_editor(self, 'Return', 'Enter')
self.launch_difftool = actions.launch_difftool(self)
self.stage_or_unstage = actions.stage_or_unstage(self)
# Emit up/down signals so that they can be routed by the main widget
self.move_down = actions.move_down(self)
self.move_up = actions.move_up(self)
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.selection_model = selection_model = selection.selection_model()
selection_model.add_observer(selection_model.message_selection_changed,
self._update)
self.connect(self, SIGNAL('update()'), self._update_callback,
Qt.QueuedConnection)
self.connect(self, SIGNAL('set_text(PyQt_PyObject)'),
self.setPlainText)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = qtutils.add_action(self, cmds.SignOff.name(),
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self,
N_('Commit@@verb'),
self.commit,
cmds.Commit.SHORTCUT)
self.commit_action.setToolTip(N_('Commit staged changes'))
self.clear_action = qtutils.add_action(self, N_('Clear...'), self.clear)
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.setMinimumHeight(defs.tool_button_height)
self.summary.extra_actions.append(self.clear_action)
self.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.clear_action)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = N_('Commit staged changes\n'
'Shortcut: Ctrl+Enter')
self.commit_button = qtutils.create_toolbutton(
text=N_('Commit@@verb'), tooltip=commit_button_tooltip,
icon=qtutils.save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = qtutils.create_toolbutton(
icon=qtutils.options_icon(), tooltip=N_('Actions...'))
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
qtutils.hide_button_menu_indicator(self.actions_button)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
N_('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.amend_action.setShortcut(cmds.AmendMode.SHORTCUT)
self.amend_action.setShortcutContext(Qt.ApplicationShortcut)
# Bypass hooks
self.bypass_commit_hooks_action = self.actions_menu.addAction(
N_('Bypass Commit Hooks'))
self.bypass_commit_hooks_action.setCheckable(True)
self.bypass_commit_hooks_action.setChecked(False)
# Sign commits
cfg = gitcfg.current()
self.sign_action = self.actions_menu.addAction(
N_('Create Signed Commit'))
self.sign_action.setCheckable(True)
self.sign_action.setChecked(cfg.get('cola.signcommits', False))
# Spell checker
self.check_spelling_action = self.actions_menu.addAction(
N_('Check Spelling'))
self.check_spelling_action.setCheckable(True)
self.check_spelling_action.setChecked(False)
# Line wrapping
self.autowrap_action = self.actions_menu.addAction(
N_('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(prefs.linebreak())
# Commit message
self.actions_menu.addSeparator()
self.load_commitmsg_menu = self.actions_menu.addMenu(
N_('Load Previous Commit Message'))
self.connect(self.load_commitmsg_menu, SIGNAL('aboutToShow()'),
self.build_commitmsg_menu)
self.fixup_commit_menu = self.actions_menu.addMenu(
N_('Fixup Previous Commit'))
self.connect(self.fixup_commit_menu, SIGNAL('aboutToShow()'),
self.build_fixup_menu)
self.toplayout = qtutils.hbox(defs.no_margin, defs.spacing,
self.actions_button, self.summary,
self.commit_button)
self.toplayout.setContentsMargins(defs.margin, defs.no_margin,
defs.no_margin, defs.no_margin)
self.mainlayout = qtutils.vbox(defs.no_margin, defs.spacing,
self.toplayout, self.description)
self.setLayout(self.mainlayout)
qtutils.connect_button(self.commit_button, self.commit)
# Broadcast the amend mode
qtutils.connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
qtutils.connect_action_bool(self.check_spelling_action,
self.toggle_check_spelling)
# Handle the one-off autowrapping
qtutils.connect_action_bool(self.autowrap_action, self.set_linebreak)
qtutils.add_action(self.summary, N_('Move Down'),
self.focus_description,
Qt.Key_Return, Qt.Key_Enter)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down,
Qt.Key_Down)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_summary_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('leave()'),
self.focus_summary)
self.setFont(qtutils.diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(prefs.tabwidth())
self.set_textwidth(prefs.textwidth())
self.set_linebreak(prefs.linebreak())
# Loading message
commit_msg = ''
commit_msg_path = commit_message_path()
if commit_msg_path:
commit_msg = core.read(commit_msg_path)
self.set_commit_message(commit_msg)
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, model, parent):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# Internal field used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.classic_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.classic_dockable:
self.classicdockwidget = create_dock(N_('Browser'), self)
self.classicwidget = classic_widget(self)
self.classicdockwidget.setWidget(self.classicwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Action'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_('Options'),
icon=options_icon(),
tooltip=N_('Diff Options'))
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon('remove.svg'))
self.menu_unstage_selected = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon('remove.svg'))
self.menu_show_diffstat = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), 'Alt+D')
self.menu_stage_modified = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.menu_stage_modified.setIcon(qtutils.icon('add.svg'))
self.menu_stage_untracked = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), 'Alt+U')
self.menu_stage_untracked.setIcon(qtutils.icon('add.svg'))
self.menu_export_patches = add_action(self,
N_('Export Patches...'), guicmds.export_patches, 'Alt+E')
self.menu_preferences = add_action(self,
N_('Preferences'), self.preferences,
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.menu_edit_remotes = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self,
N_('Recently Modified Files...'),
browse_recent, 'Shift+Ctrl+E')
self.menu_cherry_pick = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.menu_load_commitmsg = add_action(self,
N_('Load Commit Message...'), guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self,
N_('Save As Tarball/Zip...'), self.save_archive)
self.menu_quit = add_action(self,
N_('Quit'), self.close, 'Ctrl+Q')
self.menu_manage_bookmarks = add_action(self,
N_('Bookmarks...'), manage_bookmarks)
self.menu_grep = add_action(self,
N_('Grep'), guicmds.grep, 'Ctrl+G')
self.menu_merge_local = add_action(self,
N_('Merge...'), merge.local_merge)
self.menu_merge_abort = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.menu_fetch = add_action(self,
N_('Fetch...'), remote.fetch)
self.menu_push = add_action(self,
N_('Push...'), remote.push)
self.menu_pull = add_action(self,
N_('Pull...'), remote.pull)
self.menu_open_repo = add_action(self,
N_('Open...'), guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self,
N_('Stash...'), stash.stash, 'Alt+Shift+S')
self.menu_clone_repo = add_action(self,
N_('Clone...'), guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(self,
N_('Documentation'), resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.menu_help_shortcuts = add_action(self,
N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(self,
N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.menu_visualize_all = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self,
N_('Search...'), search)
self.menu_browse_branch = add_action(self,
N_('Browse Current Branch...'), guicmds.browse_current)
self.menu_browse_other_branch = add_action(self,
N_('Browse Other Branch...'), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(self,
N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitTemplate))
self.menu_help_about = add_action(self,
N_('About'), launch_about_dialog)
self.menu_diff_expression = add_action(self,
N_('Expression...'), guicmds.diff_expression)
self.menu_branch_compare = add_action(self,
N_('Branches...'), compare_branches)
self.menu_create_tag = add_action(self,
N_('Create Tag...'), create_tag)
self.menu_create_branch = add_action(self,
N_('Create...'), create_new_branch, 'Ctrl+B')
self.menu_delete_branch = add_action(self,
N_('Delete...'), guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(self,
N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, 'Alt+B')
self.menu_rebase_branch = add_action(self,
N_('Rebase...'), guicmds.rebase)
self.menu_branch_review = add_action(self,
N_('Review...'), guicmds.review_branch)
self.menu_classic = add_action(self,
N_('Browser...'), cola_classic)
self.menu_classic.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self,
N_('DAG...'), lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
# Relayed actions
if not self.classic_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_('Open Recent'))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addAction(self.menu_quit)
# Add to menubar
self.menubar.addAction(self.file_menu.menuAction())
# Commit Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
# Add to menubar
self.menubar.addAction(self.commit_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_rebase_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
# Add to menubar
self.menubar.addAction(self.branch_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
# Add to menubar
self.menubar.addAction(self.actions_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
# Add to menubar
self.menubar.addAction(self.diff_menu.menuAction())
# Tools Menu
self.tools_menu = create_menu(N_('Tools'), self.menubar)
self.tools_menu.addAction(self.menu_classic)
self.tools_menu.addAction(self.menu_dag)
self.tools_menu.addSeparator()
if self.classic_dockable:
self.tools_menu.addAction(self.classicdockwidget.toggleViewAction())
self.setup_dockwidget_tools_menu()
self.menubar.addAction(self.tools_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
# Add to menubar
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.classic_dockable:
self.addDockWidget(left, self.classicdockwidget)
self.tabifyDockWidget(self.classicdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update_view)
prefs_model.add_observer(prefs_model.message_config_updated,
self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.menu_open_recent, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.summary_placeholder = u'Commit summary'
self.description_placeholder = u'Extended description...'
# Palette for normal text
self.default_palette = QtGui.QPalette(self.palette())
# Palette used for the placeholder text
self.placeholder_palette = pal = QtGui.QPalette(self.palette())
color = pal.text().color()
color.setAlpha(128)
pal.setColor(QtGui.QPalette.Active, QtGui.QPalette.Text, color)
pal.setColor(QtGui.QPalette.Inactive, QtGui.QPalette.Text, color)
self.summary = QtGui.QLineEdit()
self.description = CommitMessageTextEdit()
self.commit_button = create_toolbutton(text='Commit@@verb',
tooltip='Commit staged changes',
icon=save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = create_toolbutton(icon=options_icon(),
tooltip='Actions...')
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
# Amend checkbox
self.signoff_action = self.actions_menu.addAction(tr('Sign Off'))
self.signoff_action.setToolTip('Sign off on this commit')
self.signoff_action.setShortcut('Ctrl+i')
self.commit_action = self.actions_menu.addAction(tr('Commit@@verb'))
self.commit_action.setToolTip(tr('Commit staged changes'))
self.commit_action.setShortcut('Ctrl+m')
self.actions_menu.addSeparator()
self.amend_action = self.actions_menu.addAction(tr('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.prev_commits_menu = self.actions_menu.addMenu(
'Load Previous Commit Message')
self.connect(self.prev_commits_menu, SIGNAL('aboutToShow()'),
self.build_prev_commits_menu)
self.toplayout = QtGui.QHBoxLayout()
self.toplayout.setMargin(0)
self.toplayout.setSpacing(defs.spacing)
self.toplayout.addWidget(self.actions_button)
self.toplayout.addWidget(self.summary)
self.toplayout.addWidget(self.commit_button)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.mainlayout.addLayout(self.toplayout)
self.mainlayout.addWidget(self.description)
self.setLayout(self.mainlayout)
relay_signal(self, self.description,
SIGNAL(signals.load_previous_message))
connect_button(self.commit_button, self.commit)
connect_action(self.commit_action, self.commit)
connect_action(self.signoff_action, emit(self, signals.signoff))
cola.notifier().connect(signals.amend, self.amend_action.setChecked)
# Broadcast the amend mode
connect_action_bool(self.amend_action, emit(self, signals.amend_mode))
self.model.add_message_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('returnPressed()'),
self.summary_return_pressed)
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.setFocusProxy(self.summary)
self.setFont(diff_font())
self.summary.installEventFilter(self)
self.description.installEventFilter(self)
self.enable_placeholder_summary(True)
self.enable_placeholder_description(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
def __init__(self, parent, titlebar):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
tooltip=N_('Diff Options'), icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar.add_corner_widget(self.diffopts_button)
self.action_apply_selection = qtutils.add_action(self, '',
self.apply_selection, hotkeys.STAGE_DIFF)
self.action_revert_selection = qtutils.add_action(self, '',
self.revert_selection, hotkeys.REVERT)
icon = qtutils.theme_icon('edit-undo.svg')
self.action_revert_selection.setIcon(icon)
self.launch_editor = actions.launch_editor(self, 'Return', 'Enter')
self.launch_difftool = actions.launch_difftool(self)
self.stage_or_unstage = actions.stage_or_unstage(self)
# Emit up/down signals so that they can be routed by the main widget
self.move_down = actions.move_down(self)
self.move_up = actions.move_up(self)
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.selection_model = selection_model = selection.selection_model()
selection_model.add_observer(selection_model.message_selection_changed,
self._update)
self.connect(self, SIGNAL('update()'),
self._update_callback, Qt.QueuedConnection)
self.connect(self, SIGNAL('set_text(PyQt_PyObject)'), self.setPlainText)
def __init__(self, parent, titlebar):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
tooltip=N_('Diff Options'), icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar.add_corner_widget(self.diffopts_button)
self.action_apply_selection = qtutils.add_action(self, '',
self.apply_selection, Qt.Key_S)
self.action_revert_selection = qtutils.add_action(self, '',
self.revert_selection)
self.action_revert_selection.setIcon(qtutils.theme_icon('edit-undo.svg'))
self.launch_editor = qtutils.add_action(self,
cmds.LaunchEditor.name(), run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(), run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.git_icon())
# Emit up/down signals so that they can be routed by the main widget
self.move_down = qtutils.add_action(self,
N_('Next File'), lambda: self.emit(SIGNAL('move_down()')),
Qt.AltModifier + Qt.Key_J)
self.move_up = qtutils.add_action(self,
N_('Previous File'), lambda: self.emit(SIGNAL('move_up()')),
Qt.AltModifier + Qt.Key_K)
self.stage_or_unstage = qtutils.add_action(self,
cmds.StageOrUnstage.name(), cmds.run(cmds.StageOrUnstage),
cmds.StageOrUnstage.SHORTCUT)
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('set_text(PyQt_PyObject)'), self.setPlainText)
def __init__(self, parent):
DiffTextEdit.__init__(self, parent)
self.model = model = main.model()
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
tooltip=N_('Diff Options'), icon=options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
qtutils.hide_button_menu_indicator(self.diffopts_button)
titlebar = parent.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
self.action_process_section = qtutils.add_action(self,
N_('Process Diff Region'),
self.apply_section, Qt.Key_H)
self.action_process_selection = qtutils.add_action(self,
N_('Process Selection'),
self.apply_selection, Qt.Key_S)
self.launch_editor = qtutils.add_action(self,
cmds.LaunchEditor.name(), run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
self.launch_difftool = qtutils.add_action(self,
cmds.LaunchDifftool.name(), run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.action_stage_selection = qtutils.add_action(self,
N_('Stage &Selected Lines'),
self.stage_selection)
self.action_stage_selection.setIcon(qtutils.icon('add.svg'))
self.action_stage_selection.setShortcut(Qt.Key_S)
self.action_revert_selection = qtutils.add_action(self,
N_('Revert Selected Lines...'),
self.revert_selection)
self.action_revert_selection.setIcon(qtutils.icon('undo.svg'))
self.action_unstage_selection = qtutils.add_action(self,
N_('Unstage &Selected Lines'),
self.unstage_selection)
self.action_unstage_selection.setIcon(qtutils.icon('remove.svg'))
self.action_unstage_selection.setShortcut(Qt.Key_S)
self.action_apply_selection = qtutils.add_action(self,
N_('Apply Diff Selection to Work Tree'),
self.stage_selection)
self.action_apply_selection.setIcon(qtutils.apply_icon())
model.add_observer(model.message_diff_text_changed, self._emit_text)
self.connect(self, SIGNAL('copyAvailable(bool)'),
self.enable_selection_actions)
self.connect(self, SIGNAL('set_text'), self.setPlainText)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = add_action(self, cmds.SignOff.NAME,
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip('Sign off on this commit')
self.commit_action = add_action(self, 'Commit@@verb', self.commit,
'Ctrl+Return')
self.commit_action.setToolTip(tr('Commit staged changes'))
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = 'Commit staged changes\nShortcut: Ctrl+Enter'
self.commit_button = create_toolbutton(text='Commit@@verb',
tooltip=commit_button_tooltip,
icon=save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = create_toolbutton(icon=options_icon(),
tooltip='Actions...')
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
tr('Amend Last Commit'))
self.amend_action.setCheckable(True)
# Line wrapping
self.actions_menu.addSeparator()
self.autowrap_action = self.actions_menu.addAction(
tr('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(linebreak())
self.prev_commits_menu = self.actions_menu.addMenu(
tr('Load Previous Commit Message'))
self.connect(self.prev_commits_menu, SIGNAL('aboutToShow()'),
self.build_prev_commits_menu)
self.toplayout = QtGui.QHBoxLayout()
self.toplayout.setMargin(0)
self.toplayout.setSpacing(defs.spacing)
self.toplayout.addWidget(self.actions_button)
self.toplayout.addWidget(self.summary)
self.toplayout.addWidget(self.commit_button)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.mainlayout.addLayout(self.toplayout)
self.mainlayout.addWidget(self.description)
self.setLayout(self.mainlayout)
connect_button(self.commit_button, self.commit)
notifier = cola.notifier()
notifier.connect(notifier.AMEND, self.amend_action.setChecked)
# Broadcast the amend mode
connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
# Handle the one-off autowrapping
connect_action_bool(self.autowrap_action, self.set_linebreak)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('returnPressed()'),
self.focus_description)
self.connect(self.summary, SIGNAL('downPressed()'),
self.focus_description)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(
self.description,
SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('shiftTab()'),
self.focus_summary)
self.setFont(diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(tabwidth())
self.set_textwidth(textwidth())
self.set_linebreak(linebreak())
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, model, parent=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# The widget version is used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
cfg = gitcfg.instance()
self.browser_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.browser_dockable:
self.browserdockwidget = create_dock(N_('Browser'), self)
self.browserwidget = worktree_browser_widget(self)
self.browserdockwidget.setWidget(self.browserwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Actions'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Switch Repository" widget
self.bookmarksdockwidget = create_dock(N_('Bookmarks'), self)
self.bookmarkswidget = BookmarksWidget(parent=self.bookmarksdockwidget)
self.bookmarksdockwidget.setWidget(self.bookmarkswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
N_('Diff Options'), options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.unstage_all_action = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.unstage_all_action.setIcon(qtutils.icon('remove.svg'))
self.unstage_selected_action = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.unstage_selected_action.setIcon(qtutils.icon('remove.svg'))
self.show_diffstat_action = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), 'Alt+D')
self.stage_modified_action = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.stage_modified_action.setIcon(qtutils.icon('add.svg'))
self.stage_untracked_action = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), 'Alt+U')
self.stage_untracked_action.setIcon(qtutils.icon('add.svg'))
self.apply_patches_action = add_action(self,
N_('Apply Patches...'), apply_patches)
self.export_patches_action = add_action(self,
N_('Export Patches...'), guicmds.export_patches, 'Alt+E')
self.new_repository_action = add_action(self,
N_('New Repository...'), guicmds.open_new_repo)
self.new_repository_action.setIcon(qtutils.new_icon())
self.preferences_action = add_action(self,
N_('Preferences'), self.preferences,
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.edit_remotes_action = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.edit().exec_())
self.rescan_action = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.rescan_action.setIcon(qtutils.reload_icon())
self.browse_recently_modified_action = add_action(self,
N_('Recently Modified Files...'),
browse_recent_files, 'Shift+Ctrl+E')
self.cherry_pick_action = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.load_commitmsg_action = add_action(self,
N_('Load Commit Message...'), guicmds.load_commitmsg)
self.save_tarball_action = add_action(self,
N_('Save As Tarball/Zip...'), self.save_archive)
self.quit_action = add_action(self,
N_('Quit'), self.close, 'Ctrl+Q')
self.manage_bookmarks_action = add_action(self,
N_('Bookmarks...'), self.manage_bookmarks)
self.grep_action = add_action(self,
N_('Grep'), grep, 'Ctrl+G')
self.merge_local_action = add_action(self,
N_('Merge...'), merge.local_merge)
self.merge_abort_action = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.fetch_action = add_action(self,
N_('Fetch...'), remote.fetch)
self.push_action = add_action(self,
N_('Push...'), remote.push)
self.pull_action = add_action(self,
N_('Pull...'), remote.pull)
self.open_repo_action = add_action(self,
N_('Open...'), guicmds.open_repo)
self.open_repo_action.setIcon(qtutils.open_icon())
self.open_repo_new_action = add_action(self,
N_('Open in New Window...'), guicmds.open_repo_in_new_window)
self.open_repo_new_action.setIcon(qtutils.open_icon())
self.stash_action = add_action(self,
N_('Stash...'), stash, 'Alt+Shift+S')
self.clone_repo_action = add_action(self,
N_('Clone...'), guicmds.clone_repo)
self.clone_repo_action.setIcon(qtutils.git_icon())
self.help_docs_action = add_action(self,
N_('Documentation'), resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.help_shortcuts_action = add_action(self,
N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.visualize_current_action = add_action(self,
N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.visualize_all_action = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.search_commits_action = add_action(self,
N_('Search...'), search)
self.browse_branch_action = add_action(self,
N_('Browse Current Branch...'), guicmds.browse_current)
self.browse_other_branch_action = add_action(self,
N_('Browse Other Branch...'), guicmds.browse_other)
self.load_commitmsg_template_action = add_action(self,
N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitMessageFromTemplate))
self.help_about_action = add_action(self,
N_('About'), launch_about_dialog)
self.diff_expression_action = add_action(self,
N_('Expression...'), guicmds.diff_expression)
self.branch_compare_action = add_action(self,
N_('Branches...'), compare_branches)
self.create_tag_action = add_action(self,
N_('Create Tag...'), create_tag)
self.create_branch_action = add_action(self,
N_('Create...'), create_new_branch, 'Ctrl+B')
self.delete_branch_action = add_action(self,
N_('Delete...'), guicmds.delete_branch)
self.delete_remote_branch_action = add_action(self,
N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.checkout_branch_action = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, 'Alt+B')
self.branch_review_action = add_action(self,
N_('Review...'), guicmds.review_branch)
self.browse_action = add_action(self,
N_('Browser...'), worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self,
N_('DAG...'), lambda: git_dag(self.model).show())
self.dag_action.setIcon(qtutils.git_icon())
self.rebase_start_action = add_action(self,
N_('Start Interactive Rebase...'), self.rebase_start)
self.rebase_edit_todo_action = add_action(self,
N_('Edit...'), self.rebase_edit_todo)
self.rebase_continue_action = add_action(self,
N_('Continue'), self.rebase_continue)
self.rebase_skip_action = add_action(self,
N_('Skip Current Patch'), self.rebase_skip)
self.rebase_abort_action = add_action(self,
N_('Abort'), self.rebase_abort)
# Relayed actions
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.revert_unstaged_edits_action)
if not self.browser_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.lock_layout_action = add_action_bool(self,
N_('Lock Layout'), self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.open_recent_menu = self.file_menu.addMenu(N_('Open Recent'))
self.open_recent_menu.setIcon(qtutils.open_icon())
self.open_recent_new_menu = self.file_menu.addMenu(N_('Open Recent in New Window'))
self.open_recent_new_menu.setIcon(qtutils.open_icon())
self.file_menu.addAction(self.open_repo_action)
self.file_menu.addAction(self.open_repo_new_action)
self.file_menu.addAction(self.clone_repo_action)
self.file_menu.addAction(self.new_repository_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.rescan_action)
self.file_menu.addAction(self.edit_remotes_action)
self.file_menu.addAction(self.browse_recently_modified_action)
self.file_menu.addAction(self.manage_bookmarks_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.load_commitmsg_action)
self.file_menu.addAction(self.load_commitmsg_template_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.apply_patches_action)
self.file_menu.addAction(self.export_patches_action)
self.file_menu.addAction(self.save_tarball_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.preferences_action)
self.file_menu.addAction(self.quit_action)
self.menubar.addAction(self.file_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.fetch_action)
self.actions_menu.addAction(self.push_action)
self.actions_menu.addAction(self.pull_action)
self.actions_menu.addAction(self.stash_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.create_tag_action)
self.actions_menu.addAction(self.cherry_pick_action)
self.actions_menu.addAction(self.merge_local_action)
self.actions_menu.addAction(self.merge_abort_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.grep_action)
self.actions_menu.addAction(self.search_commits_action)
self.menubar.addAction(self.actions_menu.menuAction())
# Index Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.stage_modified_action)
self.commit_menu.addAction(self.stage_untracked_action)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.unstage_all_action)
self.commit_menu.addAction(self.unstage_selected_action)
self.menubar.addAction(self.commit_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.diff_expression_action)
self.diff_menu.addAction(self.branch_compare_action)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.show_diffstat_action)
self.menubar.addAction(self.diff_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.branch_review_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.create_branch_action)
self.branch_menu.addAction(self.checkout_branch_action)
self.branch_menu.addAction(self.delete_branch_action)
self.branch_menu.addAction(self.delete_remote_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.browse_branch_action)
self.branch_menu.addAction(self.browse_other_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.visualize_current_action)
self.branch_menu.addAction(self.visualize_all_action)
self.menubar.addAction(self.branch_menu.menuAction())
# Rebase menu
self.rebase_menu = create_menu(N_('Rebase'), self.actions_menu)
self.rebase_menu.addAction(self.rebase_start_action)
self.rebase_menu.addAction(self.rebase_edit_todo_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_continue_action)
self.rebase_menu.addAction(self.rebase_skip_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_abort_action)
self.menubar.addAction(self.rebase_menu.menuAction())
# View Menu
self.view_menu = create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.browse_action)
self.view_menu.addAction(self.dag_action)
self.view_menu.addSeparator()
if self.browser_dockable:
self.view_menu.addAction(self.browserdockwidget.toggleViewAction())
self.setup_dockwidget_view_menu()
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.help_docs_action)
self.help_menu.addAction(self.help_shortcuts_action)
self.help_menu.addAction(self.help_about_action)
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.browser_dockable:
self.addDockWidget(left, self.browserdockwidget)
self.tabifyDockWidget(self.browserdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(right, self.statusdockwidget)
self.addDockWidget(right, self.bookmarksdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update)
model.add_observer(model.message_mode_changed, lambda x: self._update())
prefs_model.add_observer(prefs_model.message_config_updated,
self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.open_recent_menu, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.open_recent_new_menu, SIGNAL('aboutToShow()'),
self.build_recent_new_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, model, parent):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# Internal field used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ""
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.classic_dockable = cfg.get("cola.browserdockable") or cfg.get("cola.classicdockable")
if self.classic_dockable:
self.classicdockwidget = create_dock(N_("Browser"), self)
self.classicwidget = classic_widget(self)
self.classicdockwidget.setWidget(self.classicwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_("Action"), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_("Status"), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_("Commit"), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_("Console"), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_("Diff"), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_("Ignore changes in whitespace at EOL"), self._update_diff_opts
)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_("Ignore changes in amount of whitespace"), self._update_diff_opts
)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self, N_("Ignore all whitespace"), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_("Show whole surrounding functions of changes"), self._update_diff_opts
)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_("Options"), icon=options_icon(), tooltip=N_("Diff Options"))
self.diffopts_menu = create_menu(N_("Diff Options"), self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self, N_("Unstage All"), cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon("remove.svg"))
self.menu_unstage_selected = add_action(self, N_("Unstage From Commit"), cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon("remove.svg"))
self.menu_show_diffstat = add_action(self, N_("Diffstat"), cmds.run(cmds.Diffstat), "Alt+D")
self.menu_stage_modified = add_action(
self, N_("Stage Changed Files To Commit"), cmds.run(cmds.StageModified), "Alt+A"
)
self.menu_stage_modified.setIcon(qtutils.icon("add.svg"))
self.menu_stage_untracked = add_action(self, N_("Stage All Untracked"), cmds.run(cmds.StageUntracked), "Alt+U")
self.menu_stage_untracked.setIcon(qtutils.icon("add.svg"))
self.menu_export_patches = add_action(self, N_("Export Patches..."), guicmds.export_patches, "Alt+E")
self.new_repository = add_action(self, N_("New Repository..."), guicmds.open_new_repo)
self.new_repository.setIcon(qtutils.new_icon())
self.menu_preferences = add_action(
self, N_("Preferences"), self.preferences, QtGui.QKeySequence.Preferences, "Ctrl+O"
)
self.menu_edit_remotes = add_action(self, N_("Edit Remotes..."), lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self, cmds.Refresh.name(), cmds.run(cmds.Refresh), cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self, N_("Recently Modified Files..."), browse_recent, "Shift+Ctrl+E")
self.menu_cherry_pick = add_action(self, N_("Cherry-Pick..."), guicmds.cherry_pick, "Ctrl+P")
self.menu_load_commitmsg = add_action(self, N_("Load Commit Message..."), guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self, N_("Save As Tarball/Zip..."), self.save_archive)
self.menu_quit = add_action(self, N_("Quit"), self.close, "Ctrl+Q")
self.menu_manage_bookmarks = add_action(self, N_("Bookmarks..."), manage_bookmarks)
self.menu_grep = add_action(self, N_("Grep"), guicmds.grep, "Ctrl+G")
self.menu_merge_local = add_action(self, N_("Merge..."), merge.local_merge)
self.menu_merge_abort = add_action(self, N_("Abort Merge..."), merge.abort_merge)
self.menu_fetch = add_action(self, N_("Fetch..."), remote.fetch)
self.menu_push = add_action(self, N_("Push..."), remote.push)
self.menu_pull = add_action(self, N_("Pull..."), remote.pull)
self.menu_open_repo = add_action(self, N_("Open..."), guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self, N_("Stash..."), stash.stash, "Alt+Shift+S")
self.menu_clone_repo = add_action(self, N_("Clone..."), guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(
self, N_("Documentation"), resources.show_html_docs, QtGui.QKeySequence.HelpContents
)
self.menu_help_shortcuts = add_action(self, N_("Keyboard Shortcuts"), show_shortcuts, QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(
self, N_("Visualize Current Branch..."), cmds.run(cmds.VisualizeCurrent)
)
self.menu_visualize_all = add_action(self, N_("Visualize All Branches..."), cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self, N_("Search..."), search)
self.menu_browse_branch = add_action(self, N_("Browse Current Branch..."), guicmds.browse_current)
self.menu_browse_other_branch = add_action(self, N_("Browse Other Branch..."), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(
self, N_("Get Commit Message Template"), cmds.run(cmds.LoadCommitTemplate)
)
self.menu_help_about = add_action(self, N_("About"), launch_about_dialog)
self.menu_diff_expression = add_action(self, N_("Expression..."), guicmds.diff_expression)
self.menu_branch_compare = add_action(self, N_("Branches..."), compare_branches)
self.menu_create_tag = add_action(self, N_("Create Tag..."), create_tag)
self.menu_create_branch = add_action(self, N_("Create..."), create_new_branch, "Ctrl+B")
self.menu_delete_branch = add_action(self, N_("Delete..."), guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(self, N_("Delete Remote Branch..."), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self, N_("Checkout..."), guicmds.checkout_branch, "Alt+B")
self.menu_rebase_branch = add_action(self, N_("Rebase..."), guicmds.rebase)
self.menu_branch_review = add_action(self, N_("Review..."), guicmds.review_branch)
self.menu_classic = add_action(self, N_("Browser..."), cola_classic)
self.menu_classic.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self, N_("DAG..."), lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
# Relayed actions
if not self.classic_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_("File"), self.menubar)
self.file_menu.addAction(self.new_repository)
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_("Open Recent"))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addAction(self.menu_quit)
# Add to menubar
self.menubar.addAction(self.file_menu.menuAction())
# Commit Menu
self.commit_menu = create_menu(N_("Index"), self.menubar)
self.commit_menu.setTitle(N_("Index"))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
# Add to menubar
self.menubar.addAction(self.commit_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_("Branch"), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_rebase_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
# Add to menubar
self.menubar.addAction(self.branch_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_("Actions"), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
# Add to menubar
self.menubar.addAction(self.actions_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_("Diff"), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
# Add to menubar
self.menubar.addAction(self.diff_menu.menuAction())
# Tools Menu
self.tools_menu = create_menu(N_("Tools"), self.menubar)
self.tools_menu.addAction(self.menu_classic)
self.tools_menu.addAction(self.menu_dag)
self.tools_menu.addSeparator()
if self.classic_dockable:
self.tools_menu.addAction(self.classicdockwidget.toggleViewAction())
self.setup_dockwidget_tools_menu()
self.menubar.addAction(self.tools_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_("Help"), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
# Add to menubar
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.classic_dockable:
self.addDockWidget(left, self.classicdockwidget)
self.tabifyDockWidget(self.classicdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update_view)
prefs_model.add_observer(prefs_model.message_config_updated, self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.menu_open_recent, SIGNAL("aboutToShow()"), self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL("cursorPosition(int,int)"), self.show_cursor_position)
self.connect(self, SIGNAL("update"), self._update_callback)
self.connect(self, SIGNAL("install_config_actions"), self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + "\n" + N_("git cola version %s") % version.version())
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = add_action(self, cmds.SignOff.NAME, cmds.run(cmds.SignOff), cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip("Sign off on this commit")
self.commit_action = add_action(self, "Commit@@verb", self.commit, "Ctrl+Return")
self.commit_action.setToolTip(tr("Commit staged changes"))
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = "Commit staged changes\nShortcut: Ctrl+Enter"
self.commit_button = create_toolbutton(text="Commit@@verb", tooltip=commit_button_tooltip, icon=save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = create_toolbutton(icon=options_icon(), tooltip="Actions...")
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(tr("Amend Last Commit"))
self.amend_action.setCheckable(True)
# Line wrapping
self.actions_menu.addSeparator()
self.autowrap_action = self.actions_menu.addAction(tr("Auto-Wrap Lines"))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(linebreak())
self.prev_commits_menu = self.actions_menu.addMenu(tr("Load Previous Commit Message"))
self.connect(self.prev_commits_menu, SIGNAL("aboutToShow()"), self.build_prev_commits_menu)
self.toplayout = QtGui.QHBoxLayout()
self.toplayout.setMargin(0)
self.toplayout.setSpacing(defs.spacing)
self.toplayout.addWidget(self.actions_button)
self.toplayout.addWidget(self.summary)
self.toplayout.addWidget(self.commit_button)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.mainlayout.addLayout(self.toplayout)
self.mainlayout.addWidget(self.description)
self.setLayout(self.mainlayout)
connect_button(self.commit_button, self.commit)
notifier = cola.notifier()
notifier.connect(notifier.AMEND, self.amend_action.setChecked)
# Broadcast the amend mode
connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
# Handle the one-off autowrapping
connect_action_bool(self.autowrap_action, self.set_linebreak)
self.model.add_observer(self.model.message_commit_message_changed, self.set_commit_message)
self.connect(self.summary, SIGNAL("returnPressed()"), self.focus_description)
self.connect(self.summary, SIGNAL("downPressed()"), self.focus_description)
self.connect(self.summary, SIGNAL("cursorPosition(int,int)"), self.emit_position)
self.connect(
self.description,
SIGNAL("cursorPosition(int,int)"),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col),
)
# Keep model informed of changes
self.connect(self.summary, SIGNAL("textChanged(QString)"), self.commit_message_changed)
self.connect(self.description, SIGNAL("textChanged()"), self.commit_message_changed)
self.connect(self.description, SIGNAL("shiftTab()"), self.focus_summary)
self.setFont(diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(tabwidth())
self.set_textwidth(textwidth())
self.set_linebreak(linebreak())
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def create_context_menu(self):
"""Set up the status menu for the repo status tree."""
s = self.selection()
menu = QtGui.QMenu(self)
selection = self.selected_indexes()
if selection:
category, idx = selection[0]
# A header item e.g. 'Staged', 'Modified', etc.
if category == self.idx_header:
if idx == self.idx_staged:
menu.addAction(qtutils.icon('remove.svg'),
self.tr('Unstage All'),
SLOT(signals.unstage_all))
return menu
elif idx == self.idx_unmerged:
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Merged'),
SLOT(signals.stage_unmerged))
action.setShortcut(defs.stage_shortcut)
return menu
elif idx == self.idx_modified:
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Modified'),
SLOT(signals.stage_modified))
action.setShortcut(defs.stage_shortcut)
return menu
elif idx == self.idx_untracked:
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Untracked'),
SLOT(signals.stage_untracked))
action.setShortcut(defs.stage_shortcut)
return menu
if s.staged and self.m.unstageable():
action = menu.addAction(qtutils.icon('remove.svg'),
self.tr('Unstage Selected'),
SLOT(signals.unstage, self.staged()))
action.setShortcut(defs.stage_shortcut)
if s.staged and s.staged[0] in self.m.submodules:
menu.addAction(qtutils.git_icon(),
self.tr('Launch git-cola'),
SLOT(signals.open_repo,
os.path.abspath(s.staged[0])))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
elif s.staged:
menu.addSeparator()
action = menu.addAction(qtutils.git_icon(),
self.tr('Launch Diff Tool'),
SLOT(signals.difftool, True,
self.staged()))
action.setShortcut(defs.difftool_shortcut)
action = menu.addAction(qtutils.options_icon(),
self.tr('Launch Editor'),
SLOT(signals.edit, self.staged()))
action.setShortcut(defs.editor_shortcut)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
self.tr(self.txt_default_app),
SLOT(signals.open_default_app, self.staged()))
action.setShortcut(defs.default_app_shortcut)
action = menu.addAction(qtutils.open_file_icon(),
self.tr(self.txt_parent_dir),
self._open_parent_dir)
action.setShortcut(defs.parent_dir_shortcut)
if self.m.undoable():
menu.addSeparator()
menu.addAction(qtutils.icon('undo.svg'),
self.tr('Revert Unstaged Edits...'),
lambda: self._revert_unstaged_edits(staged=True))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
if s.unmerged:
menu.addAction(qtutils.git_icon(),
self.tr('Launch Merge Tool'),
SLOT(signals.mergetool, self.unmerged()))
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Selected'),
SLOT(signals.stage, self.unstaged()))
action.setShortcut(defs.stage_shortcut)
menu.addSeparator()
action = menu.addAction(qtutils.options_icon(),
self.tr('Launch Editor'),
SLOT(signals.edit, self.unmerged()))
action.setShortcut(defs.editor_shortcut)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
self.tr(self.txt_default_app),
SLOT(signals.open_default_app, self.unmerged()))
action.setShortcut(defs.default_app_shortcut)
action = menu.addAction(qtutils.open_file_icon(),
self.tr(self.txt_parent_dir),
self._open_parent_dir)
action.setShortcut(defs.parent_dir_shortcut)
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
modified_submodule = (s.modified and
s.modified[0] in self.m.submodules)
if self.m.stageable():
action = menu.addAction(qtutils.icon('add.svg'),
self.tr('Stage Selected'),
SLOT(signals.stage, self.unstaged()))
action.setShortcut(defs.stage_shortcut)
menu.addSeparator()
if s.modified and self.m.stageable() and not modified_submodule:
action = menu.addAction(qtutils.git_icon(),
self.tr('Launch Diff Tool'),
SLOT(signals.difftool, False,
self.modified()))
action.setShortcut(defs.difftool_shortcut)
if modified_submodule:
menu.addAction(qtutils.git_icon(),
self.tr('Launch git-cola'),
SLOT(signals.open_repo,
os.path.abspath(s.modified[0])))
elif self.unstaged():
action = menu.addAction(qtutils.options_icon(),
self.tr('Launch Editor'),
SLOT(signals.edit, self.unstaged()))
action.setShortcut(defs.editor_shortcut)
if not utils.is_win32():
menu.addSeparator()
action = menu.addAction(qtutils.file_icon(),
self.tr(self.txt_default_app),
SLOT(signals.open_default_app, self.unstaged()))
action.setShortcut(defs.default_app_shortcut)
action = menu.addAction(qtutils.open_file_icon(),
self.tr(self.txt_parent_dir),
self._open_parent_dir)
action.setShortcut(defs.parent_dir_shortcut)
menu.addSeparator()
if s.modified and self.m.stageable() and not modified_submodule:
if self.m.undoable():
menu.addAction(qtutils.icon('undo.svg'),
self.tr('Revert Unstaged Edits...'),
self._revert_unstaged_edits)
menu.addAction(qtutils.icon('undo.svg'),
self.tr('Revert Uncommited Edits...'),
self._revert_uncommitted_edits)
if s.untracked:
menu.addSeparator()
menu.addAction(qtutils.discard_icon(),
self.tr('Delete File(s)...'), self._delete_files)
menu.addSeparator()
menu.addAction(qtutils.icon('edit-clear.svg'),
self.tr('Add to .gitignore'),
SLOT(signals.ignore,
map(lambda x: '/' + x, self.untracked())))
menu.addSeparator()
menu.addAction(self.copy_path_action)
return menu
def __init__(self, parent):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
self.add_item(N_('Staged'), hide=True)
self.add_item(N_('Unmerged'), hide=True)
self.add_item(N_('Modified'), hide=True)
self.add_item(N_('Untracked'), hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.old_current_item = None
self.expanded_items = set()
self.process_selection = qtutils.add_action(self,
N_('Stage / Unstage'),
self._process_selection,
cmds.Stage.SHORTCUT)
self.revert_unstaged_edits_action = qtutils.add_action(
self, N_('Revert Unstaged Edits...'),
cmds.run(cmds.RevertUnstagedEdits),
cmds.RevertUnstagedEdits.SHORTCUT)
self.revert_unstaged_edits_action.setIcon(qtutils.icon('undo.svg'))
self.launch_difftool = qtutils.add_action(
self, cmds.LaunchDifftool.name(), cmds.run(cmds.LaunchDifftool),
cmds.LaunchDifftool.SHORTCUT)
self.launch_difftool.setIcon(qtutils.icon('git.svg'))
self.launch_editor = qtutils.add_action(self, cmds.LaunchEditor.name(),
cmds.run(cmds.LaunchEditor),
cmds.LaunchEditor.SHORTCUT,
'Return', 'Enter')
self.launch_editor.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(
self, cmds.OpenDefaultApp.name(), self._open_using_default_app,
cmds.OpenDefaultApp.SHORTCUT)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir = qtutils.add_action(
self, cmds.OpenParentDir.name(), self._open_parent_dir,
cmds.OpenParentDir.SHORTCUT)
self.open_parent_dir.setIcon(qtutils.open_file_icon())
self.up = qtutils.add_action(self, N_('Move Up'), self.move_up,
Qt.Key_K)
self.down = qtutils.add_action(self, N_('Move Down'), self.move_down,
Qt.Key_J)
self.copy_path_action = qtutils.add_action(
self, N_('Copy Path to Clipboard'), self.copy_path,
QtGui.QKeySequence.Copy)
self.copy_path_action.setIcon(qtutils.theme_icon('edit-copy.svg'))
self.connect(self, SIGNAL('about_to_update'), self._about_to_update)
self.connect(self, SIGNAL('updated'), self._updated)
self.m = main.model()
self.m.add_observer(self.m.message_about_to_update,
self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL('itemSelectionChanged()'),
self.show_selection)
self.connect(self, SIGNAL('itemDoubleClicked(QTreeWidgetItem*,int)'),
self.double_clicked)
self.connect(self, SIGNAL('itemCollapsed(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
self.connect(self, SIGNAL('itemExpanded(QTreeWidgetItem*)'),
lambda x: self.update_column_widths())
def __init__(self, parent=None):
QtGui.QTreeWidget.__init__(self, parent)
self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.headerItem().setHidden(True)
self.setAllColumnsShowFocus(True)
self.setSortingEnabled(False)
self.setUniformRowHeights(True)
self.setAnimated(True)
self.setRootIsDecorated(False)
self.setIndentation(0)
self.setDragEnabled(True)
self.add_item(N_("Staged"), hide=True)
self.add_item(N_("Unmerged"), hide=True)
self.add_item(N_("Modified"), hide=True)
self.add_item(N_("Untracked"), hide=True)
# Used to restore the selection
self.old_scroll = None
self.old_selection = None
self.old_contents = None
self.old_current_item = None
self.expanded_items = set()
self.process_selection_action = qtutils.add_action(
self, cmds.StageOrUnstage.name(), cmds.run(cmds.StageOrUnstage), cmds.StageOrUnstage.SHORTCUT
)
self.revert_unstaged_edits_action = qtutils.add_action(
self, cmds.RevertUnstagedEdits.name(), cmds.run(cmds.RevertUnstagedEdits), cmds.RevertUnstagedEdits.SHORTCUT
)
self.revert_unstaged_edits_action.setIcon(qtutils.theme_icon("edit-undo.svg"))
self.launch_difftool_action = qtutils.add_action(
self, cmds.LaunchDifftool.name(), cmds.run(cmds.LaunchDifftool), cmds.LaunchDifftool.SHORTCUT
)
self.launch_difftool_action.setIcon(qtutils.git_icon())
self.launch_editor_action = qtutils.add_action(
self, cmds.LaunchEditor.name(), cmds.run(cmds.LaunchEditor), cmds.LaunchEditor.SHORTCUT, "Return", "Enter"
)
self.launch_editor_action.setIcon(qtutils.options_icon())
if not utils.is_win32():
self.open_using_default_app = qtutils.add_action(
self, cmds.OpenDefaultApp.name(), self._open_using_default_app, cmds.OpenDefaultApp.SHORTCUT
)
self.open_using_default_app.setIcon(qtutils.file_icon())
self.open_parent_dir_action = qtutils.add_action(
self, cmds.OpenParentDir.name(), self._open_parent_dir, cmds.OpenParentDir.SHORTCUT
)
self.open_parent_dir_action.setIcon(qtutils.open_file_icon())
self.up_action = qtutils.add_action(self, N_("Move Up"), self.move_up, Qt.Key_K)
self.down_action = qtutils.add_action(self, N_("Move Down"), self.move_down, Qt.Key_J)
self.copy_path_action = qtutils.add_action(
self, N_("Copy Path to Clipboard"), self.copy_path, QtGui.QKeySequence.Copy
)
self.copy_path_action.setIcon(qtutils.theme_icon("edit-copy.svg"))
self.copy_relpath_action = qtutils.add_action(
self, N_("Copy Relative Path to Clipboard"), self.copy_relpath, QtGui.QKeySequence.Cut
)
self.copy_relpath_action.setIcon(qtutils.theme_icon("edit-copy.svg"))
# MoveToTrash and Delete use the same shortcut.
# We will only bind one of them, depending on whether or not the
# MoveToTrash command is avaialble. When available, the hotkey
# is bound to MoveToTrash, otherwise it is bound to Delete.
if cmds.MoveToTrash.AVAILABLE:
self.move_to_trash_action = qtutils.add_action(
self, N_("Move file(s) to trash"), self._trash_untracked_files, cmds.MoveToTrash.SHORTCUT
)
self.move_to_trash_action.setIcon(qtutils.discard_icon())
delete_shortcut = []
else:
self.move_to_trash_action = None
delete_shortcut = [cmds.Delete.SHORTCUT]
self.delete_untracked_files_action = qtutils.add_action(
self, N_("Delete File(s)..."), self._delete_untracked_files, *delete_shortcut
)
self.delete_untracked_files_action.setIcon(qtutils.discard_icon())
self.connect(self, SIGNAL("about_to_update()"), self._about_to_update, Qt.QueuedConnection)
self.connect(self, SIGNAL("updated()"), self._updated, Qt.QueuedConnection)
self.m = main.model()
self.m.add_observer(self.m.message_about_to_update, self.about_to_update)
self.m.add_observer(self.m.message_updated, self.updated)
self.connect(self, SIGNAL("itemSelectionChanged()"), self.show_selection)
self.connect(self, SIGNAL("itemDoubleClicked(QTreeWidgetItem*,int)"), self.double_clicked)
self.connect(self, SIGNAL("itemCollapsed(QTreeWidgetItem*)"), lambda x: self.update_column_widths())
self.connect(self, SIGNAL("itemExpanded(QTreeWidgetItem*)"), lambda x: self.update_column_widths())
