def context_menu(self):
popup_menu = HintedTextEdit.createStandardContextMenu(self)
# Select the word under the cursor.
cursor = self.textCursor()
cursor.select(QTextCursor.WordUnderCursor)
self.setTextCursor(cursor)
# Check if the selected word is misspelled and offer spelling
# suggestions if it is.
spell_menu = None
if self.textCursor().hasSelection():
text = self.textCursor().selectedText()
if not self.spellcheck.check(text):
title = N_('Spelling Suggestions')
spell_menu = qtutils.create_menu(title, self)
for word in self.spellcheck.suggest(text):
action = SpellAction(word, spell_menu)
self.connect(action, SIGNAL('correct(PyQt_PyObject)'),
self.correct)
spell_menu.addAction(action)
# Only add the spelling suggests to the menu if there are
# suggestions.
if len(spell_menu.actions()) > 0:
popup_menu.addSeparator()
popup_menu.addMenu(spell_menu)
return popup_menu, spell_menu
def context_menu(self):
popup_menu = HintedTextEdit.createStandardContextMenu(self)
# Select the word under the cursor.
cursor = self.textCursor()
cursor.select(QTextCursor.WordUnderCursor)
self.setTextCursor(cursor)
# Check if the selected word is misspelled and offer spelling
# suggestions if it is.
spell_menu = None
if self.textCursor().hasSelection():
text = self.textCursor().selectedText()
if not self.spellcheck.check(text):
title = N_('Spelling Suggestions')
spell_menu = qtutils.create_menu(title, self)
for word in self.spellcheck.suggest(text):
action = SpellAction(word, spell_menu)
self.connect(action, SIGNAL('correct(PyQt_PyObject)'),
self.correct)
spell_menu.addAction(action)
# Only add the spelling suggests to the menu if there are
# suggestions.
if len(spell_menu.actions()) > 0:
popup_menu.addSeparator()
popup_menu.addMenu(spell_menu)
return popup_menu, spell_menu
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 contextMenuEvent(self, event):
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.action_pick)
menu.addAction(self.action_reword)
menu.addAction(self.action_edit)
menu.addAction(self.action_fixup)
menu.addAction(self.action_squash)
menu.addSeparator()
menu.addAction(self.toggle_enabled_action)
menu.addSeparator()
menu.addAction(self.copy_oid_action)
menu.addAction(self.external_diff_action)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
"""Create a context menu."""
self.update_actions()
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.action_editor)
menu.addAction(self.action_stage)
menu.addSeparator()
menu.addAction(self.action_history)
menu.addAction(self.action_difftool)
menu.addAction(self.action_difftool_predecessor)
menu.addSeparator()
menu.addAction(self.action_revert_unstaged)
menu.addAction(self.action_revert_uncommitted)
menu.addAction(self.action_untrack)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
"""Create a context menu."""
self.update_actions()
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.action_editor)
menu.addAction(self.action_stage)
menu.addSeparator()
menu.addAction(self.action_history)
menu.addAction(self.action_difftool)
menu.addAction(self.action_difftool_predecessor)
menu.addSeparator()
menu.addAction(self.action_revert_unstaged)
menu.addAction(self.action_revert_uncommitted)
menu.addAction(self.action_untrack)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.open_action)
menu.addAction(self.open_new_action)
menu.addAction(self.open_default_action)
menu.addSeparator()
menu.addAction(self.copy_action)
menu.addAction(self.launch_editor_action)
menu.addAction(self.launch_terminal_action)
menu.addSeparator()
item = self.selected_item()
is_default = bool(item and item.is_default)
if is_default:
menu.addAction(self.clear_default_repo_action)
else:
menu.addAction(self.set_default_repo_action)
menu.exec_(self.mapToGlobal(event.pos()))
def contextMenuEvent(self, event):
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.open_action)
menu.addAction(self.open_new_action)
menu.addAction(self.open_default_action)
menu.addSeparator()
menu.addAction(self.copy_action)
menu.addAction(self.launch_editor_action)
menu.addAction(self.launch_terminal_action)
menu.addSeparator()
item = self.selected_item()
is_default = bool(item and item.is_default)
if is_default:
menu.addAction(self.clear_default_repo_action)
else:
menu.addAction(self.set_default_repo_action)
menu.exec_(self.mapToGlobal(event.pos()))
def create_context_menu(self):
"""Set up the status menu for the repo status tree."""
s = self.selection()
menu = qtutils.create_menu('Status', self)
selected_indexes = self.selected_indexes()
if selected_indexes:
category, idx = selected_indexes[0]
# A header item e.g. 'Staged', 'Modified', etc.
if category == self.idx_header:
return self._create_header_context_menu(menu, idx)
if s.staged:
return self._create_staged_context_menu(menu, s)
elif s.unmerged:
return self._create_unmerged_context_menu(menu, s)
else:
return self._create_unstaged_context_menu(menu, s)
def create_context_menu(self):
"""Set up the status menu for the repo status tree."""
s = self.selection()
menu = qtutils.create_menu('Status', self)
selected_indexes = self.selected_indexes()
if selected_indexes:
category, idx = selected_indexes[0]
# A header item e.g. 'Staged', 'Modified', etc.
if category == self.idx_header:
return self._create_header_context_menu(menu, idx)
if s.staged:
return self._create_staged_context_menu(menu, s)
elif s.unmerged:
return self._create_unmerged_context_menu(menu, s)
else:
return self._create_unstaged_context_menu(menu, s)
def __init__(self, model, parent=None):
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()
# 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 = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
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)
# "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, '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.LoadCommitMessageFromTemplate))
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_branch_review = add_action(self,
N_('Review...'), guicmds.review_branch)
self.menu_browse = add_action(self,
N_('Browser...'), worktree_browser)
self.menu_browse.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())
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
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.
status_tree = self.statusdockwidget.widget().tree
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.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)
self.menubar.addAction(self.file_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)
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.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)
self.menubar.addAction(self.commit_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)
self.menubar.addAction(self.diff_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_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)
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.menu_browse)
self.view_menu.addAction(self.menu_dag)
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.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
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(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, 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 contextMenuEvent(self, event):
"""Create the context menu for the diff display."""
menu = qtutils.create_menu(N_('Actions'), self)
s = selection.selection()
filename = selection.filename()
if self.model.stageable() or self.model.unstageable():
if self.model.stageable():
self.stage_or_unstage.setText(N_('Stage'))
else:
self.stage_or_unstage.setText(N_('Unstage'))
menu.addAction(self.stage_or_unstage)
if s.modified and self.model.stageable():
if s.modified[0] in main.model().submodules:
action = menu.addAction(icons.add(), cmds.Stage.name(),
cmds.run(cmds.Stage, s.modified))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(icons.cola(), N_('Launch git-cola'),
cmds.run(cmds.OpenRepo,
core.abspath(s.modified[0])))
elif s.modified[0] not in main.model().unstaged_deleted:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
revert_text = N_('Revert Selected Lines...')
else:
apply_text = N_('Stage Diff Hunk')
revert_text = N_('Revert Diff Hunk...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.add())
self.action_revert_selection.setText(revert_text)
menu.addAction(self.action_apply_selection)
menu.addAction(self.action_revert_selection)
if s.staged and self.model.unstageable():
if s.staged[0] in main.model().submodules:
action = menu.addAction(icons.remove(), cmds.Unstage.name(),
cmds.do(cmds.Unstage, s.staged))
action.setShortcut(hotkeys.STAGE_SELECTION)
menu.addAction(icons.cola(), N_('Launch git-cola'),
cmds.do(cmds.OpenRepo,
core.abspath(s.staged[0])))
elif s.staged[0] not in main.model().staged_deleted:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.remove())
menu.addAction(self.action_apply_selection)
if self.model.stageable() or self.model.unstageable():
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
menu.addSeparator()
menu.addAction(self.launch_editor)
# Removed files can still be diffed.
menu.addAction(self.launch_difftool)
# Add the Previous/Next File actions, which improves discoverability
# of their associated shortcuts
menu.addSeparator()
menu.addAction(self.move_up)
menu.addAction(self.move_down)
menu.addSeparator()
action = menu.addAction(icons.copy(), N_('Copy'), self.copy)
action.setShortcut(QtGui.QKeySequence.Copy)
action = menu.addAction(icons.select_all(), N_('Select All'),
self.selectAll)
action.setShortcut(QtGui.QKeySequence.SelectAll)
menu.exec_(self.mapToGlobal(event.pos()))
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=icons.configure())
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, 'Apply', self.apply_selection, hotkeys.STAGE_DIFF)
self.action_revert_selection = qtutils.add_action(
self, 'Revert', self.revert_selection, hotkeys.REVERT)
self.action_revert_selection.setIcon(icons.undo())
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, ctx, parent=None, settings=None):
standard.MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setMinimumSize(420, 420)
# change when widgets are added/removed
self.widget_version = 2
self.model = model
self.ctx = ctx
self.settings = settings
self.commits = {}
self.commit_list = []
self.selection = []
self.thread = ReaderThread(ctx, self)
self.revtext = completion.GitLogLineEdit()
self.maxresults = standard.SpinBox()
self.zoom_out = qtutils.create_action_button(tooltip=N_('Zoom Out'),
icon=icons.zoom_out())
self.zoom_in = qtutils.create_action_button(tooltip=N_('Zoom In'),
icon=icons.zoom_in())
self.zoom_to_fit = qtutils.create_action_button(
tooltip=N_('Zoom to Fit'), icon=icons.zoom_fit_best())
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = 'refs_updated'
self.notifier.add_observer(refs_updated, self.display)
self.notifier.add_observer(filelist.HISTORIES_SELECTED,
self.histories_selected)
self.notifier.add_observer(filelist.DIFFTOOL_SELECTED,
self.difftool_selected)
self.notifier.add_observer(diff.COMMITS_SELECTED,
self.commits_selected)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = diff.DiffWidget(notifier, self)
self.filewidget = filelist.FileWidget(notifier, self)
self.graphview = GraphView(notifier, self)
self.controls_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.revtext, self.maxresults)
self.controls_widget = QtGui.QWidget()
self.controls_widget.setLayout(self.controls_layout)
self.log_dock = qtutils.create_dock(N_('Log'), self, stretch=False)
self.log_dock.setWidget(self.treewidget)
log_dock_titlebar = self.log_dock.titleBarWidget()
log_dock_titlebar.add_corner_widget(self.controls_widget)
self.file_dock = qtutils.create_dock(N_('Files'), self)
self.file_dock.setWidget(self.filewidget)
self.diff_dock = qtutils.create_dock(N_('Diff'), self)
self.diff_dock.setWidget(self.diffwidget)
self.graph_controls_layout = qtutils.hbox(defs.no_margin,
defs.button_spacing,
self.zoom_out, self.zoom_in,
self.zoom_to_fit,
defs.spacing)
self.graph_controls_widget = QtGui.QWidget()
self.graph_controls_widget.setLayout(self.graph_controls_layout)
self.graphview_dock = qtutils.create_dock(N_('Graph'), self)
self.graphview_dock.setWidget(self.graphview)
graph_titlebar = self.graphview_dock.titleBarWidget()
graph_titlebar.add_corner_widget(self.graph_controls_widget)
self.lock_layout_action = qtutils.add_action_bool(
self, N_('Lock Layout'), self.set_lock_layout, False)
self.refresh_action = qtutils.add_action(self, N_('Refresh'),
self.refresh, hotkeys.REFRESH)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# View Menu
self.view_menu = qtutils.create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.refresh_action)
self.view_menu.addAction(self.log_dock.toggleViewAction())
self.view_menu.addAction(self.graphview_dock.toggleViewAction())
self.view_menu.addAction(self.diff_dock.toggleViewAction())
self.view_menu.addAction(self.file_dock.toggleViewAction())
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
self.setMenuBar(self.menubar)
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
self.addDockWidget(left, self.log_dock)
self.addDockWidget(left, self.diff_dock)
self.addDockWidget(right, self.graphview_dock)
self.addDockWidget(right, self.file_dock)
# Update fields affected by model
self.revtext.setText(ctx.ref)
self.maxresults.setValue(ctx.count)
self.update_window_title()
# Also re-loads dag.* from the saved state
if not self.restore_state(settings=settings):
self.resize_to_desktop()
qtutils.connect_button(self.zoom_out, self.graphview.zoom_out)
qtutils.connect_button(self.zoom_in, self.graphview.zoom_in)
qtutils.connect_button(self.zoom_to_fit, self.graphview.zoom_to_fit)
self.thread.connect(self.thread, self.thread.begin, self.thread_begin,
Qt.QueuedConnection)
self.thread.connect(self.thread, self.thread.status,
self.thread_status, Qt.QueuedConnection)
self.thread.connect(self.thread, self.thread.add, self.add_commits,
Qt.QueuedConnection)
self.thread.connect(self.thread, self.thread.end, self.thread_end,
Qt.QueuedConnection)
self.connect(self.treewidget,
SIGNAL('diff_commits(PyQt_PyObject,PyQt_PyObject)'),
self.diff_commits)
self.connect(self.graphview,
SIGNAL('diff_commits(PyQt_PyObject,PyQt_PyObject)'),
self.diff_commits)
self.connect(self.maxresults, SIGNAL('editingFinished()'),
self.display)
self.connect(self.revtext, SIGNAL('textChanged(QString)'),
self.text_changed)
self.connect(self.revtext, SIGNAL('activated()'), self.display)
self.connect(self.revtext, SIGNAL('return()'), self.display)
self.connect(self.revtext, SIGNAL('down()'), self.focus_tree)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_observer(self.model.message_updated,
self.emit_model_updated)
self.connect(self, SIGNAL('model_updated()'), self.model_updated,
Qt.QueuedConnection)
qtutils.add_action(self, 'Focus Input', self.focus_input,
hotkeys.FOCUS)
qtutils.add_close_action(self)
def __init__(self, model, parent=None, settings=None):
standard.MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.model = model
self.settings = settings
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
# Runs asynchronous tasks
self.task_runner = TaskRunner(self)
self.progress = standard.ProgressDialog('', '', self)
cfg = gitcfg.current()
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 = browse.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.statusdockwidget = create_dock(N_('Status'), self)
titlebar = self.statusdockwidget.titleBarWidget()
self.statuswidget = status.StatusWidget(titlebar,
parent=self.statusdockwidget)
self.statusdockwidget.setWidget(self.statuswidget)
# "Switch Repository" widgets
self.bookmarksdockwidget = create_dock(N_('Favorites'), self)
self.bookmarkswidget = bookmarks.BookmarksWidget(
bookmarks.BOOKMARKS, parent=self.bookmarksdockwidget)
self.bookmarksdockwidget.setWidget(self.bookmarkswidget)
self.recentdockwidget = create_dock(N_('Recent'), self)
self.recentwidget = bookmarks.BookmarksWidget(
bookmarks.RECENT_REPOS, parent=self.recentdockwidget)
self.recentdockwidget.setWidget(self.recentwidget)
self.recentdockwidget.hide()
# "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)
# make the position label fixed size to avoid layout issues
fm = self.position_label.fontMetrics()
width = fm.width('999:999')
height = self.position_label.sizeHint().height()
self.position_label.setFixedSize(width, height)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = commitmsg.CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = log.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.diffeditorwidget = diff.DiffEditorWidget(self.diffdockwidget)
self.diffeditor = self.diffeditorwidget.editor
self.diffdockwidget.setWidget(self.diffeditorwidget)
# All Actions
self.unstage_all_action = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.unstage_all_action.setIcon(qtutils.remove_icon())
self.unstage_selected_action = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.unstage_selected_action.setIcon(qtutils.remove_icon())
self.show_diffstat_action = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), hotkeys.DIFFSTAT)
self.stage_modified_action = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), hotkeys.STAGE_MODIFIED)
self.stage_modified_action.setIcon(qtutils.add_icon())
self.stage_untracked_action = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), hotkeys.STAGE_UNTRACKED)
self.stage_untracked_action.setIcon(qtutils.add_icon())
self.apply_patches_action = add_action(self,
N_('Apply Patches...'), patch.apply_patches)
self.export_patches_action = add_action(self,
N_('Export Patches...'), guicmds.export_patches, hotkeys.EXPORT)
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)
self.edit_remotes_action = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.remote_editor().exec_())
self.rescan_action = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh), *hotkeys.REFRESH_HOTKEYS)
self.rescan_action.setIcon(qtutils.reload_icon())
self.find_files_action = add_action(self,
N_('Find Files'), finder.finder,
hotkeys.FINDER, hotkeys.FINDER_SECONDARY)
self.find_files_action.setIcon(qtutils.theme_icon('zoom-in.png'))
self.browse_recently_modified_action = add_action(self,
N_('Recently Modified Files...'),
recent.browse_recent_files, hotkeys.EDIT_SECONDARY)
self.cherry_pick_action = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, hotkeys.CHERRY_PICK)
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, hotkeys.QUIT)
self.grep_action = add_action(self,
N_('Grep'), grep.grep, hotkeys.GREP)
self.merge_local_action = add_action(self,
N_('Merge...'), merge.local_merge, hotkeys.MERGE)
self.merge_abort_action = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.fetch_action = add_action(self,
N_('Fetch...'), remote.fetch, hotkeys.FETCH)
self.push_action = add_action(self,
N_('Push...'), remote.push, hotkeys.PUSH)
self.pull_action = add_action(self,
N_('Pull...'), remote.pull, hotkeys.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.stash, hotkeys.STASH)
self.clone_repo_action = add_action(self,
N_('Clone...'), self.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'), about.show_shortcuts,
hotkeys.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.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'), 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.compare_branches)
self.create_tag_action = add_action(self,
N_('Create Tag...'), createtag.create_tag)
self.create_branch_action = add_action(self,
N_('Create...'), createbranch.create_new_branch, hotkeys.BRANCH)
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.rename_branch_action = add_action(self,
N_('Rename Branch...'), guicmds.rename_branch)
self.checkout_branch_action = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, hotkeys.CHECKOUT)
self.branch_review_action = add_action(self,
N_('Review...'), guicmds.review_branch)
self.browse_action = add_action(self,
N_('File Browser...'), browse.worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self, N_('DAG...'), self.git_dag)
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)
# For "Start Rebase" only, reverse the first argument to setEnabled()
# so that we can operate on it as a group.
# We can do this because can_rebase == not is_rebasing
set_disabled = lambda x: self.rebase_start_action.setEnabled(not x)
self.rebase_start_action_proxy = utils.Proxy(self.rebase_start_action,
setEnabled=set_disabled)
self.rebase_group = utils.Group(self.rebase_start_action_proxy,
self.rebase_edit_todo_action,
self.rebase_continue_action,
self.rebase_skip_action,
self.rebase_abort_action)
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.file_menu.addAction(self.new_repository_action)
self.open_recent_menu = self.file_menu.addMenu(N_('Open Recent'))
self.open_recent_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.addSeparator()
self.file_menu.addAction(self.rescan_action)
self.file_menu.addAction(self.find_files_action)
self.file_menu.addAction(self.edit_remotes_action)
self.file_menu.addAction(self.browse_recently_modified_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())
# Staging Area Menu
self.commit_menu = create_menu(N_('Staging Area'), self.menubar)
self.commit_menu.setTitle(N_('Staging Area'))
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.addAction(self.rename_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(right, self.recentdockwidget)
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.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self.diffeditor, SIGNAL('diff_options_updated()'),
self.statuswidget.refresh)
self.connect(self.diffeditor, SIGNAL('move_down()'),
self.statuswidget.move_down)
self.connect(self.diffeditor, SIGNAL('move_up()'),
self.statuswidget.move_up)
self.connect(self.commitmsgeditor, SIGNAL('move_down()'),
self.statuswidget.move_down)
self.connect(self.commitmsgeditor, SIGNAL('move_up()'),
self.statuswidget.move_up)
self.connect(self, SIGNAL('update()'),
self._update_callback, Qt.QueuedConnection)
self.connect(self, SIGNAL('install_cfg_actions(PyQt_PyObject)'),
self._install_config_actions, Qt.QueuedConnection)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not self.restore_state(settings=settings):
self.resize(987, 610)
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=None, settings=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.model = model
self.settings = settings
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 = ''
# Runs asynchronous tasks
self.task_runner = TaskRunner(self)
self.progress = ProgressDialog('', '', self)
cfg = gitcfg.current()
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.statusdockwidget = create_dock(N_('Status'), self)
self.statuswidget = StatusWidget(self.statusdockwidget.titleBarWidget(),
parent=self.statusdockwidget)
self.statusdockwidget.setWidget(self.statuswidget)
# "Switch Repository" widgets
self.bookmarksdockwidget = create_dock(N_('Bookmarks'), self)
self.bookmarkswidget = bookmarks.BookmarksWidget(
bookmarks.BOOKMARKS, parent=self.bookmarksdockwidget)
self.bookmarksdockwidget.setWidget(self.bookmarkswidget)
self.recentdockwidget = create_dock(N_('Recent'), self)
self.recentwidget = bookmarks.BookmarksWidget(
bookmarks.RECENT_REPOS, parent=self.recentdockwidget)
self.recentdockwidget.setWidget(self.recentwidget)
self.recentdockwidget.hide()
# "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)
# make the position label fixed size to avoid layout issues
fm = self.position_label.fontMetrics()
width = fm.width('999:999')
height = self.position_label.sizeHint().height()
self.position_label.setFixedSize(width, height)
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.diffeditorwidget = DiffEditorWidget(self.diffdockwidget)
self.diffeditor = self.diffeditorwidget.editor
self.diffdockwidget.setWidget(self.diffeditorwidget)
# 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)
self.edit_remotes_action = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.remote_editor().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, 'Shift+Ctrl+C')
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.grep_action = add_action(self,
N_('Grep'), grep, 'Ctrl+G')
self.merge_local_action = add_action(self,
N_('Merge...'), merge.local_merge, 'Shift+Ctrl+M')
self.merge_abort_action = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.fetch_action = add_action(self,
N_('Fetch...'), remote.fetch, 'Ctrl+F')
self.push_action = add_action(self,
N_('Push...'), remote.push, 'Ctrl+P')
self.pull_action = add_action(self,
N_('Pull...'), remote.pull, 'Shift+Ctrl+P')
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...'), self.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, 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_('File Browser...'), worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self, N_('DAG...'), self.git_dag)
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.delete_untracked_files_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.revert_unstaged_edits_action)
self.addAction(status_tree.revert_uncommitted_edits_action)
self.addAction(status_tree.up_action)
self.addAction(status_tree.down_action)
self.addAction(status_tree.process_selection_action)
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.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.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())
# Staging Area Menu
self.commit_menu = create_menu(N_('Staging Area'), self.menubar)
self.commit_menu.setTitle(N_('Staging Area'))
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(right, self.recentdockwidget)
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.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self.diffeditor, SIGNAL('diff_options_updated()'),
self.statuswidget.refresh)
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 self.restore_state(settings=settings):
self.resize(987, 610)
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, dag, parent=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setMinimumSize(420, 420)
# change when widgets are added/removed
self.widget_version = 1
self.model = model
self.dag = dag
self.commits = {}
self.commit_list = []
self.old_count = None
self.old_ref = None
self.thread = ReaderThread(dag, self)
self.revtext = completion.GitLogLineEdit()
self.maxresults = QtGui.QSpinBox()
self.maxresults.setMinimum(1)
self.maxresults.setMaximum(99999)
self.maxresults.setPrefix('')
self.maxresults.setSuffix('')
self.zoom_out = qtutils.create_action_button(
tooltip=N_('Zoom Out'),
icon=qtutils.theme_icon('zoom-out.png'))
self.zoom_in = qtutils.create_action_button(
tooltip=N_('Zoom In'),
icon=qtutils.theme_icon('zoom-in.png'))
self.zoom_to_fit = qtutils.create_action_button(
tooltip=N_('Zoom to Fit'),
icon=qtutils.theme_icon('zoom-fit-best.png'))
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = 'refs_updated'
self.notifier.add_observer(refs_updated, self.display)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = DiffWidget(notifier, self)
self.filewidget = FileWidget(notifier, self)
self.graphview = GraphView(notifier, self)
self.controls_layout = QtGui.QHBoxLayout()
self.controls_layout.setMargin(defs.no_margin)
self.controls_layout.setSpacing(defs.spacing)
self.controls_layout.addWidget(self.revtext)
self.controls_layout.addWidget(self.maxresults)
self.controls_widget = QtGui.QWidget()
self.controls_widget.setLayout(self.controls_layout)
self.log_dock = qtutils.create_dock(N_('Log'), self, stretch=False)
self.log_dock.setWidget(self.treewidget)
log_dock_titlebar = self.log_dock.titleBarWidget()
log_dock_titlebar.add_corner_widget(self.controls_widget)
self.file_dock = qtutils.create_dock(N_('Files'), self)
self.file_dock.setWidget(self.filewidget)
self.diff_dock = qtutils.create_dock(N_('Diff'), self)
self.diff_dock.setWidget(self.diffwidget)
self.graph_controls_layout = QtGui.QHBoxLayout()
self.graph_controls_layout.setMargin(defs.no_margin)
self.graph_controls_layout.setSpacing(defs.button_spacing)
self.graph_controls_layout.addWidget(self.zoom_out)
self.graph_controls_layout.addWidget(self.zoom_in)
self.graph_controls_layout.addWidget(self.zoom_to_fit)
self.graph_controls_widget = QtGui.QWidget()
self.graph_controls_widget.setLayout(self.graph_controls_layout)
self.graphview_dock = qtutils.create_dock(N_('Graph'), self)
self.graphview_dock.setWidget(self.graphview)
graph_titlebar = self.graphview_dock.titleBarWidget()
graph_titlebar.add_corner_widget(self.graph_controls_widget)
self.lock_layout_action = qtutils.add_action_bool(self,
N_('Lock Layout'), self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# View Menu
self.view_menu = qtutils.create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.log_dock.toggleViewAction())
self.view_menu.addAction(self.graphview_dock.toggleViewAction())
self.view_menu.addAction(self.diff_dock.toggleViewAction())
self.view_menu.addAction(self.file_dock.toggleViewAction())
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
self.setMenuBar(self.menubar)
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.log_dock)
self.addDockWidget(right, self.graphview_dock)
self.addDockWidget(right, self.file_dock)
self.addDockWidget(bottom, self.diff_dock)
# Update fields affected by model
self.revtext.setText(dag.ref)
self.maxresults.setValue(dag.count)
self.update_window_title()
# Also re-loads dag.* from the saved state
if not self.restore_state():
self.resize_to_desktop()
qtutils.connect_button(self.zoom_out, self.graphview.zoom_out)
qtutils.connect_button(self.zoom_in, self.graphview.zoom_in)
qtutils.connect_button(self.zoom_to_fit,
self.graphview.zoom_to_fit)
self.thread.connect(self.thread, self.thread.commits_ready,
self.add_commits)
self.thread.connect(self.thread, self.thread.done,
self.thread_done)
self.connect(self.treewidget, SIGNAL('diff_commits'),
self.diff_commits)
self.connect(self.graphview, SIGNAL('diff_commits'),
self.diff_commits)
self.connect(self.maxresults, SIGNAL('editingFinished()'),
self.display)
self.connect(self.revtext, SIGNAL('changed()'),
self.display)
self.connect(self.revtext, SIGNAL('textChanged(QString)'),
self.text_changed)
self.connect(self.revtext, SIGNAL('returnPressed()'),
self.display)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_observer(self.model.message_updated,
self.emit_model_updated)
self.connect(self, SIGNAL('model_updated'),
self.model_updated)
qtutils.add_action(self, 'Focus search field',
lambda: self.revtext.setFocus(), 'Ctrl+l')
qtutils.add_close_action(self)
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)
# "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.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, "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..."), 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.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.file_menu.addAction(self.open_repo_action)
self.open_recent_action = self.file_menu.addMenu(N_("Open Recent"))
self.open_recent_action.setIcon(qtutils.open_icon())
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(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)
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_action, 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 contextMenuEvent(self, event):
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.show_history_action)
menu.addAction(self.launch_difftool_action)
menu.exec_(self.mapToGlobal(event.pos()))
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
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),
hotkeys.SIGNOFF)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self,
N_('Commit@@verb'),
self.commit, hotkeys.COMMIT)
self.commit_action.setToolTip(N_('Commit staged changes'))
self.clear_action = qtutils.add_action(self, N_('Clear...'), self.clear)
self.launch_editor = actions.launch_editor(self)
self.launch_difftool = actions.launch_difftool(self)
self.stage_or_unstage = actions.stage_or_unstage(self)
self.move_up = actions.move_up(self)
self.move_down = actions.move_down(self)
# 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.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.launch_editor)
self.summary.extra_actions.append(self.launch_difftool)
self.summary.extra_actions.append(self.stage_or_unstage)
self.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.move_up)
self.summary.extra_actions.append(self.move_down)
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)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.launch_editor)
self.description.extra_actions.append(self.launch_difftool)
self.description.extra_actions.append(self.stage_or_unstage)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.move_up)
self.description.extra_actions.append(self.move_down)
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=icons.download())
self.commit_group = Group(self.commit_action, self.commit_button)
self.actions_menu = qtutils.create_menu(N_('Actions'), self)
self.actions_button = qtutils.create_toolbutton(
icon=icons.configure(), 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(hotkeys.AMEND)
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, *hotkeys.ACCEPT)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down, hotkeys.DOWN)
self.selection_model = selection_model = selection.selection_model()
selection_model.add_observer(selection_model.message_selection_changed,
self._update)
self.model.add_observer(self.model.message_commit_message_changed,
self._set_commit_message)
self.connect(self, SIGNAL('set_commit_message(PyQt_PyObject)'),
self.set_commit_message, Qt.QueuedConnection)
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.connect(self, SIGNAL('update()'),
self._update_callback, Qt.QueuedConnection)
self.setFont(qtutils.diff_font())
self.summary.hint.enable(True)
self.description.hint.enable(True)
self.commit_group.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=None, settings=None):
standard.MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.model = model
self.settings = settings
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
# Runs asynchronous tasks
self.task_runner = TaskRunner(self)
self.runtask = qtutils.RunTask()
self.progress = standard.ProgressDialog('', '', self)
cfg = gitcfg.current()
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 = browse.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.statusdockwidget = create_dock(N_('Status'), self)
titlebar = self.statusdockwidget.titleBarWidget()
self.statuswidget = status.StatusWidget(titlebar,
parent=self.statusdockwidget)
self.statusdockwidget.setWidget(self.statuswidget)
# "Switch Repository" widgets
self.bookmarksdockwidget = create_dock(N_('Favorites'), self)
self.bookmarkswidget = bookmarks.BookmarksWidget(
bookmarks.BOOKMARKS, parent=self.bookmarksdockwidget)
self.bookmarksdockwidget.setWidget(self.bookmarkswidget)
self.recentdockwidget = create_dock(N_('Recent'), self)
self.recentwidget = bookmarks.BookmarksWidget(
bookmarks.RECENT_REPOS, parent=self.recentdockwidget)
self.recentdockwidget.setWidget(self.recentwidget)
self.recentdockwidget.hide()
# "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)
# make the position label fixed size to avoid layout issues
fm = self.position_label.fontMetrics()
width = fm.width('999:999') + defs.spacing
height = self.position_label.sizeHint().height() + defs.spacing
self.position_label.setFixedSize(width, height)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = commitmsg.CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = log.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.diffeditorwidget = diff.DiffEditorWidget(self.diffdockwidget)
self.diffeditor = self.diffeditorwidget.editor
self.diffdockwidget.setWidget(self.diffeditorwidget)
# All Actions
self.unstage_all_action = add_action(self, N_('Unstage All'),
cmds.run(cmds.UnstageAll))
self.unstage_all_action.setIcon(icons.remove())
self.unstage_selected_action = add_action(
self, N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.unstage_selected_action.setIcon(icons.remove())
self.show_diffstat_action = add_action(self, N_('Diffstat'),
cmds.run(cmds.Diffstat),
hotkeys.DIFFSTAT)
self.stage_modified_action = add_action(
self, N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), hotkeys.STAGE_MODIFIED)
self.stage_modified_action.setIcon(icons.add())
self.stage_untracked_action = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked),
hotkeys.STAGE_UNTRACKED)
self.stage_untracked_action.setIcon(icons.add())
self.apply_patches_action = add_action(self, N_('Apply Patches...'),
patch.apply_patches)
self.export_patches_action = add_action(self, N_('Export Patches...'),
guicmds.export_patches,
hotkeys.EXPORT)
self.new_repository_action = add_action(self, N_('New Repository...'),
guicmds.open_new_repo)
self.new_repository_action.setIcon(icons.new())
self.preferences_action = add_action(self, N_('Preferences'),
self.preferences,
QtGui.QKeySequence.Preferences)
self.edit_remotes_action = add_action(
self, N_('Edit Remotes...'),
lambda: editremotes.remote_editor().exec_())
self.rescan_action = add_action(self, cmds.Refresh.name(),
cmds.run(cmds.Refresh),
*hotkeys.REFRESH_HOTKEYS)
self.rescan_action.setIcon(icons.sync())
self.find_files_action = add_action(self, N_('Find Files'),
finder.finder, hotkeys.FINDER,
hotkeys.FINDER_SECONDARY)
self.find_files_action.setIcon(icons.zoom_in())
self.browse_recently_modified_action = add_action(
self, N_('Recently Modified Files...'), recent.browse_recent_files,
hotkeys.EDIT_SECONDARY)
self.cherry_pick_action = add_action(self, N_('Cherry-Pick...'),
guicmds.cherry_pick,
hotkeys.CHERRY_PICK)
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,
hotkeys.QUIT)
self.grep_action = add_action(self, N_('Grep'), grep.grep,
hotkeys.GREP)
self.merge_local_action = add_action(self, N_('Merge...'),
merge.local_merge, hotkeys.MERGE)
self.merge_abort_action = add_action(self, N_('Abort Merge...'),
merge.abort_merge)
self.fetch_action = add_action(self, N_('Fetch...'), remote.fetch,
hotkeys.FETCH)
self.push_action = add_action(self, N_('Push...'), remote.push,
hotkeys.PUSH)
self.pull_action = add_action(self, N_('Pull...'), remote.pull,
hotkeys.PULL)
self.open_repo_action = add_action(self, N_('Open...'),
guicmds.open_repo)
self.open_repo_action.setIcon(icons.folder())
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(icons.folder())
self.stash_action = add_action(self, N_('Stash...'), stash.stash,
hotkeys.STASH)
self.clone_repo_action = add_action(self, N_('Clone...'),
self.clone_repo)
self.clone_repo_action.setIcon(icons.repo())
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'),
about.show_shortcuts,
hotkeys.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.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'),
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.compare_branches)
self.create_tag_action = add_action(self, N_('Create Tag...'),
createtag.create_tag)
self.create_branch_action = add_action(self, N_('Create...'),
createbranch.create_new_branch,
hotkeys.BRANCH)
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.rename_branch_action = add_action(self, N_('Rename Branch...'),
guicmds.rename_branch)
self.checkout_branch_action = add_action(self, N_('Checkout...'),
guicmds.checkout_branch,
hotkeys.CHECKOUT)
self.branch_review_action = add_action(self, N_('Review...'),
guicmds.review_branch)
self.browse_action = add_action(self, N_('File Browser...'),
browse.worktree_browser)
self.browse_action.setIcon(icons.cola())
self.dag_action = add_action(self, N_('DAG...'), self.git_dag)
self.dag_action.setIcon(icons.cola())
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)
# For "Start Rebase" only, reverse the first argument to setEnabled()
# so that we can operate on it as a group.
# We can do this because can_rebase == not is_rebasing
set_disabled = lambda x: self.rebase_start_action.setEnabled(not x)
self.rebase_start_action_proxy = utils.Proxy(self.rebase_start_action,
setEnabled=set_disabled)
self.rebase_group = utils.Group(self.rebase_start_action_proxy,
self.rebase_edit_todo_action,
self.rebase_continue_action,
self.rebase_skip_action,
self.rebase_abort_action)
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.file_menu.addAction(self.new_repository_action)
self.open_recent_menu = self.file_menu.addMenu(N_('Open Recent'))
self.open_recent_menu.setIcon(icons.folder())
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.addSeparator()
self.file_menu.addAction(self.rescan_action)
self.file_menu.addAction(self.find_files_action)
self.file_menu.addAction(self.edit_remotes_action)
self.file_menu.addAction(self.browse_recently_modified_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())
# Staging Area Menu
self.commit_menu = create_menu(N_('Staging Area'), self.menubar)
self.commit_menu.setTitle(N_('Staging Area'))
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.addAction(self.rename_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(right, self.recentdockwidget)
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.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self.diffeditor, SIGNAL('diff_options_updated()'),
self.statuswidget.refresh)
self.connect(self.diffeditor, SIGNAL('move_down()'),
self.statuswidget.move_down)
self.connect(self.diffeditor, SIGNAL('move_up()'),
self.statuswidget.move_up)
self.connect(self.commitmsgeditor, SIGNAL('move_down()'),
self.statuswidget.move_down)
self.connect(self.commitmsgeditor, SIGNAL('move_up()'),
self.statuswidget.move_up)
self.connect(self, SIGNAL('update()'), self._update_callback,
Qt.QueuedConnection)
self.connect(self, SIGNAL('install_cfg_actions(PyQt_PyObject)'),
self._install_config_actions, Qt.QueuedConnection)
# Install .git-config-defined actions
self.init_config_actions()
# Restore saved settings
if not self.restore_state(settings=settings):
self.resize(987, 610)
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, 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, 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=icons.configure())
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, 'Apply', self.apply_selection, hotkeys.STAGE_DIFF)
self.action_revert_selection = qtutils.add_action(
self, 'Revert', self.revert_selection, hotkeys.REVERT)
self.action_revert_selection.setIcon(icons.undo())
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):
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, ctx, parent=None, settings=None):
standard.MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setMinimumSize(420, 420)
# change when widgets are added/removed
self.widget_version = 2
self.model = model
self.ctx = ctx
self.settings = settings
self.commits = {}
self.commit_list = []
self.thread = ReaderThread(ctx, self)
self.revtext = completion.GitLogLineEdit()
self.maxresults = standard.SpinBox()
self.zoom_out = qtutils.create_action_button(
tooltip=N_('Zoom Out'),
icon=qtutils.theme_icon('zoom-out.png'))
self.zoom_in = qtutils.create_action_button(
tooltip=N_('Zoom In'),
icon=qtutils.theme_icon('zoom-in.png'))
self.zoom_to_fit = qtutils.create_action_button(
tooltip=N_('Zoom to Fit'),
icon=qtutils.theme_icon('zoom-fit-best.png'))
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = 'refs_updated'
self.notifier.add_observer(refs_updated, self.display)
self.notifier.add_observer(filelist.HISTORIES_SELECTED,
self.histories_selected)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = diff.DiffWidget(notifier, self)
self.filewidget = filelist.FileWidget(notifier, self)
self.graphview = GraphView(notifier, self)
self.controls_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.revtext, self.maxresults)
self.controls_widget = QtGui.QWidget()
self.controls_widget.setLayout(self.controls_layout)
self.log_dock = qtutils.create_dock(N_('Log'), self, stretch=False)
self.log_dock.setWidget(self.treewidget)
log_dock_titlebar = self.log_dock.titleBarWidget()
log_dock_titlebar.add_corner_widget(self.controls_widget)
self.file_dock = qtutils.create_dock(N_('Files'), self)
self.file_dock.setWidget(self.filewidget)
self.diff_dock = qtutils.create_dock(N_('Diff'), self)
self.diff_dock.setWidget(self.diffwidget)
self.graph_controls_layout = qtutils.hbox(
defs.no_margin, defs.button_spacing,
self.zoom_out, self.zoom_in, self.zoom_to_fit)
self.graph_controls_widget = QtGui.QWidget()
self.graph_controls_widget.setLayout(self.graph_controls_layout)
self.graphview_dock = qtutils.create_dock(N_('Graph'), self)
self.graphview_dock.setWidget(self.graphview)
graph_titlebar = self.graphview_dock.titleBarWidget()
graph_titlebar.add_corner_widget(self.graph_controls_widget)
self.lock_layout_action = qtutils.add_action_bool(self,
N_('Lock Layout'), self.set_lock_layout, False)
self.refresh_action = qtutils.add_action(self,
N_('Refresh'), self.refresh, 'Ctrl+R')
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# View Menu
self.view_menu = qtutils.create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.refresh_action)
self.view_menu.addAction(self.log_dock.toggleViewAction())
self.view_menu.addAction(self.graphview_dock.toggleViewAction())
self.view_menu.addAction(self.diff_dock.toggleViewAction())
self.view_menu.addAction(self.file_dock.toggleViewAction())
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
self.setMenuBar(self.menubar)
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
self.addDockWidget(left, self.log_dock)
self.addDockWidget(left, self.diff_dock)
self.addDockWidget(right, self.graphview_dock)
self.addDockWidget(right, self.file_dock)
# Update fields affected by model
self.revtext.setText(ctx.ref)
self.maxresults.setValue(ctx.count)
self.update_window_title()
# Also re-loads dag.* from the saved state
if not self.restore_state(settings=settings):
self.resize_to_desktop()
qtutils.connect_button(self.zoom_out, self.graphview.zoom_out)
qtutils.connect_button(self.zoom_in, self.graphview.zoom_in)
qtutils.connect_button(self.zoom_to_fit,
self.graphview.zoom_to_fit)
self.thread.connect(self.thread, self.thread.commits_ready,
self.add_commits)
self.thread.connect(self.thread, self.thread.done, self.thread_done)
self.connect(self.treewidget,
SIGNAL('diff_commits(PyQt_PyObject,PyQt_PyObject)'),
self.diff_commits)
self.connect(self.graphview,
SIGNAL('diff_commits(PyQt_PyObject,PyQt_PyObject)'),
self.diff_commits)
self.connect(self.maxresults, SIGNAL('editingFinished()'),
self.display)
self.connect(self.revtext, SIGNAL('textChanged(QString)'),
self.text_changed)
self.connect(self.revtext, SIGNAL('activated()'), self.display)
self.connect(self.revtext, SIGNAL('return()'), self.display)
self.connect(self.revtext, SIGNAL('down()'), self.focus_tree)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_observer(self.model.message_updated,
self.emit_model_updated)
self.connect(self, SIGNAL('model_updated()'), self.model_updated,
Qt.QueuedConnection)
qtutils.add_action(self, 'Focus Input', self.focus_input, 'Ctrl+L')
qtutils.add_close_action(self)
def __init__(self, model, parent=None, settings=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.model = model
self.settings = settings
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)
# make the position label fixed size to avoid layout issues
fm = self.position_label.fontMetrics()
width = fm.width('999:999')
height = self.position_label.sizeHint().height()
self.position_label.setFixedSize(width, height)
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)
# 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.remote_editor().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,
'Shift+Ctrl+C')
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,
'Ctrl+F')
self.push_action = add_action(self, N_('Push...'), remote.push,
'Ctrl+P')
self.pull_action = add_action(self, N_('Pull...'), remote.pull,
'Shift+Ctrl+P')
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_('File Browser...'),
worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self, N_('DAG...'), self.git_dag)
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)
self.addAction(status_tree.delete_untracked_files_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_action)
self.addAction(status_tree.down_action)
self.addAction(status_tree.process_selection_action)
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.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())
# Staging Area Menu
self.commit_menu = create_menu(N_('Staging Area'), self.menubar)
self.commit_menu.setTitle(N_('Staging Area'))
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.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self.diffeditor, SIGNAL('diff_options_updated()'),
self.statuswidget.refresh)
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 self.restore_state(settings=settings):
self.resize(987, 610)
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.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),
hotkeys.SIGNOFF)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self, N_('Commit@@verb'),
self.commit, hotkeys.COMMIT)
self.commit_action.setToolTip(N_('Commit staged changes'))
self.clear_action = qtutils.add_action(self, N_('Clear...'),
self.clear)
self.launch_editor = actions.launch_editor(self)
self.launch_difftool = actions.launch_difftool(self)
self.stage_or_unstage = actions.stage_or_unstage(self)
self.move_up = actions.move_up(self)
self.move_down = actions.move_down(self)
# 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.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.launch_editor)
self.summary.extra_actions.append(self.launch_difftool)
self.summary.extra_actions.append(self.stage_or_unstage)
self.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.move_up)
self.summary.extra_actions.append(self.move_down)
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)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.launch_editor)
self.description.extra_actions.append(self.launch_difftool)
self.description.extra_actions.append(self.stage_or_unstage)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.move_up)
self.description.extra_actions.append(self.move_down)
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=icons.download())
self.commit_group = Group(self.commit_action, self.commit_button)
self.actions_menu = qtutils.create_menu(N_('Actions'), self)
self.actions_button = qtutils.create_toolbutton(
icon=icons.configure(), 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(hotkeys.AMEND)
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, *hotkeys.ACCEPT)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down, hotkeys.DOWN)
self.selection_model = selection_model = selection.selection_model()
selection_model.add_observer(selection_model.message_selection_changed,
self._update)
self.model.add_observer(self.model.message_commit_message_changed,
self._set_commit_message)
self.connect(self, SIGNAL('set_commit_message(PyQt_PyObject)'),
self.set_commit_message, Qt.QueuedConnection)
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.connect(self, SIGNAL('update()'), self._update_callback,
Qt.QueuedConnection)
self.setFont(qtutils.diff_font())
self.summary.hint.enable(True)
self.description.hint.enable(True)
self.commit_group.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, dag, parent=None, settings=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setMinimumSize(420, 420)
# change when widgets are added/removed
self.widget_version = 2
self.model = model
self.dag = dag
self.settings = settings
self.commits = {}
self.commit_list = []
self.thread = ReaderThread(dag, self)
self.revtext = completion.GitLogLineEdit()
self.maxresults = standard.SpinBox()
self.zoom_out = qtutils.create_action_button(
tooltip=N_('Zoom Out'), icon=qtutils.theme_icon('zoom-out.png'))
self.zoom_in = qtutils.create_action_button(
tooltip=N_('Zoom In'), icon=qtutils.theme_icon('zoom-in.png'))
self.zoom_to_fit = qtutils.create_action_button(
tooltip=N_('Zoom to Fit'),
icon=qtutils.theme_icon('zoom-fit-best.png'))
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = 'refs_updated'
self.notifier.add_observer(refs_updated, self.display)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = DiffWidget(notifier, self)
self.filewidget = FileWidget(notifier, self)
self.graphview = GraphView(notifier, self)
self.controls_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.revtext, self.maxresults)
self.controls_widget = QtGui.QWidget()
self.controls_widget.setLayout(self.controls_layout)
self.log_dock = qtutils.create_dock(N_('Log'), self, stretch=False)
self.log_dock.setWidget(self.treewidget)
log_dock_titlebar = self.log_dock.titleBarWidget()
log_dock_titlebar.add_corner_widget(self.controls_widget)
self.file_dock = qtutils.create_dock(N_('Files'), self)
self.file_dock.setWidget(self.filewidget)
self.diff_dock = qtutils.create_dock(N_('Diff'), self)
self.diff_dock.setWidget(self.diffwidget)
self.graph_controls_layout = qtutils.hbox(defs.no_margin,
defs.button_spacing,
self.zoom_out, self.zoom_in,
self.zoom_to_fit)
self.graph_controls_widget = QtGui.QWidget()
self.graph_controls_widget.setLayout(self.graph_controls_layout)
self.graphview_dock = qtutils.create_dock(N_('Graph'), self)
self.graphview_dock.setWidget(self.graphview)
graph_titlebar = self.graphview_dock.titleBarWidget()
graph_titlebar.add_corner_widget(self.graph_controls_widget)
self.lock_layout_action = qtutils.add_action_bool(
self, N_('Lock Layout'), self.set_lock_layout, False)
self.refresh_action = qtutils.add_action(self, N_('Refresh'),
self.refresh, 'Ctrl+R')
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# View Menu
self.view_menu = qtutils.create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.refresh_action)
self.view_menu.addAction(self.log_dock.toggleViewAction())
self.view_menu.addAction(self.graphview_dock.toggleViewAction())
self.view_menu.addAction(self.diff_dock.toggleViewAction())
self.view_menu.addAction(self.file_dock.toggleViewAction())
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
self.setMenuBar(self.menubar)
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
self.addDockWidget(left, self.log_dock)
self.addDockWidget(left, self.diff_dock)
self.addDockWidget(right, self.graphview_dock)
self.addDockWidget(right, self.file_dock)
# Update fields affected by model
self.revtext.setText(dag.ref)
self.maxresults.setValue(dag.count)
self.update_window_title()
# Also re-loads dag.* from the saved state
if not self.restore_state(settings=settings):
self.resize_to_desktop()
qtutils.connect_button(self.zoom_out, self.graphview.zoom_out)
qtutils.connect_button(self.zoom_in, self.graphview.zoom_in)
qtutils.connect_button(self.zoom_to_fit, self.graphview.zoom_to_fit)
self.thread.connect(self.thread, self.thread.commits_ready,
self.add_commits)
self.thread.connect(self.thread, self.thread.done, self.thread_done)
self.connect(self.treewidget, SIGNAL('diff_commits'),
self.diff_commits)
self.connect(self.graphview, SIGNAL('diff_commits'), self.diff_commits)
self.connect(self.maxresults, SIGNAL('editingFinished()'),
self.display)
self.connect(self.revtext, SIGNAL('changed()'), self.display)
self.connect(self.revtext, SIGNAL('textChanged(QString)'),
self.text_changed)
self.connect(self.revtext, SIGNAL('returnPressed()'), self.display)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_observer(self.model.message_updated,
self.emit_model_updated)
self.connect(self, SIGNAL('model_updated'), self.model_updated)
qtutils.add_action(self, 'Focus search field',
lambda: self.revtext.setFocus(), 'Ctrl+L')
qtutils.add_close_action(self)
def contextMenuEvent(self, event):
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.show_history_action)
menu.addAction(self.launch_difftool_action)
menu.exec_(self.mapToGlobal(event.pos()))