def __init__(self, parent):
Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowModality(Qt.WindowModal)
self.input_label = QtGui.QLabel('git grep')
self.input_label.setFont(diff_font())
hint = N_('command-line arguments')
self.input_txt = HintedLineEdit(hint, self)
self.input_txt.enable_hint(True)
hint = N_('grep result...')
self.result_txt = GrepTextView(hint, self)
self.result_txt.enable_hint(True)
self.edit_button = QtGui.QPushButton(N_('Edit'))
self.edit_button.setIcon(qtutils.open_file_icon())
self.edit_button.setEnabled(False)
self.edit_button.setShortcut(cmds.Edit.SHORTCUT)
self.refresh_button = QtGui.QPushButton(N_('Refresh'))
self.refresh_button.setIcon(qtutils.reload_icon())
self.refresh_button.setShortcut(QtGui.QKeySequence.Refresh)
self.shell_checkbox = QtGui.QCheckBox(N_('Shell arguments'))
self.shell_checkbox.setToolTip(
N_('Parse arguments using a shell.\n'
'Queries with spaces will require "double quotes".'))
self.shell_checkbox.setChecked(False)
self.close_button = QtGui.QPushButton(N_('Close'))
self.input_layout = QtGui.QHBoxLayout()
self.input_layout.setMargin(0)
self.input_layout.setSpacing(defs.button_spacing)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(0)
self.bottom_layout.setSpacing(defs.button_spacing)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.input_layout.addWidget(self.input_label)
self.input_layout.addWidget(self.input_txt)
self.bottom_layout.addWidget(self.edit_button)
self.bottom_layout.addWidget(self.refresh_button)
self.bottom_layout.addWidget(self.shell_checkbox)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.close_button)
self.mainlayout.addLayout(self.input_layout)
self.mainlayout.addWidget(self.result_txt)
self.mainlayout.addLayout(self.bottom_layout)
self.setLayout(self.mainlayout)
self.grep_thread = GrepThread(self)
self.connect(self.grep_thread, SIGNAL('result'), self.process_result)
self.connect(self.input_txt, SIGNAL('textChanged(QString)'),
self.input_txt_changed)
self.connect(self.result_txt, SIGNAL('leave()'),
lambda: self.input_txt.setFocus())
qtutils.add_action(self.input_txt, 'FocusResults',
lambda: self.result_txt.setFocus(), Qt.Key_Down,
Qt.Key_Enter, Qt.Key_Return)
qtutils.connect_button(self.edit_button, self.edit)
qtutils.connect_button(self.refresh_button, self.search)
qtutils.connect_button(self.close_button, self.close)
qtutils.add_close_action(self)
if not qtutils.apply_state(self):
self.resize(666, 420)
def __init__(self, parent):
Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowModality(Qt.WindowModal)
self.input_label = QtGui.QLabel('git grep')
self.input_label.setFont(diff_font())
hint = 'command-line arguments'
self.input_txt = GrepLineEdit(hint, self)
self.input_txt.enable_hint(True)
hint = 'grep result...'
self.result_txt = GrepTextView(hint, self)
self.result_txt.enable_hint(True)
self.edit_button = QtGui.QPushButton(self.tr('Edit'))
self.edit_button.setIcon(qtutils.open_file_icon())
self.edit_button.setEnabled(False)
self.edit_button.setShortcut(cmds.Edit.SHORTCUT)
self.refresh_button = QtGui.QPushButton(self.tr('Refresh'))
self.refresh_button.setIcon(qtutils.reload_icon())
self.refresh_button.setShortcut(QtGui.QKeySequence.Refresh)
self.shell_checkbox = QtGui.QCheckBox(self.tr('Shell arguments'))
self.shell_checkbox.setToolTip(
'Parse arguments using a shell.\n'
'Queries with spaces will require "double quotes".')
self.shell_checkbox.setChecked(False)
self.close_button = QtGui.QPushButton(self.tr('Close'))
self.input_layout = QtGui.QHBoxLayout()
self.input_layout.setMargin(0)
self.input_layout.setSpacing(defs.button_spacing)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(0)
self.bottom_layout.setSpacing(defs.button_spacing)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.input_layout.addWidget(self.input_label)
self.input_layout.addWidget(self.input_txt)
self.bottom_layout.addWidget(self.edit_button)
self.bottom_layout.addWidget(self.refresh_button)
self.bottom_layout.addWidget(self.shell_checkbox)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.close_button)
self.mainlayout.addLayout(self.input_layout)
self.mainlayout.addWidget(self.result_txt)
self.mainlayout.addLayout(self.bottom_layout)
self.setLayout(self.mainlayout)
self.grep_thread = GrepThread(self)
self.connect(self.grep_thread, SIGNAL('result'),
self.process_result)
self.connect(self.input_txt, SIGNAL('textChanged(QString)'),
self.input_txt_changed)
self.connect(self.input_txt, SIGNAL('returnPressed()'),
lambda: self.result_txt.setFocus())
qtutils.connect_button(self.edit_button, self.edit)
qtutils.connect_button(self.refresh_button, self.search)
qtutils.connect_button(self.close_button, self.close)
qtutils.add_close_action(self)
if not qtutils.apply_state(self):
self.resize(666, 420)
def __init__(self, model, action, parent):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.tasks = []
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowModality(Qt.WindowModal)
self.setWindowTitle(N_(action))
self.progress = QtGui.QProgressDialog(self)
self.progress.setFont(qtutils.diff_font())
self.progress.setRange(0, 0)
self.progress.setCancelButton(None)
self.progress.setWindowTitle(action)
self.progress.setWindowModality(Qt.WindowModal)
self.progress.setLabelText(N_('Updating') + '.. ')
self.progress_thread = ProgressAnimationThread(N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
self.ffwd_only_checkbox = QtGui.QCheckBox()
self.ffwd_only_checkbox.setText(N_('Fast Forward Only '))
self.ffwd_only_checkbox.setChecked(True)
self.tags_checkbox = QtGui.QCheckBox()
self.tags_checkbox.setText(N_('Include tags '))
self.rebase_checkbox = QtGui.QCheckBox()
self.rebase_checkbox.setText(N_('Rebase '))
self.action_button = QtGui.QPushButton()
self.action_button.setText(N_(action))
self.action_button.setIcon(qtutils.ok_icon())
self.close_button = QtGui.QPushButton()
self.close_button.setText(N_('Close'))
self.close_button.setIcon(qtutils.close_icon())
self.local_branch_layout = QtGui.QHBoxLayout()
self.local_branch_layout.addWidget(self.local_label)
self.local_branch_layout.addWidget(self.local_branch)
self.remote_branch_layout = QtGui.QHBoxLayout()
self.remote_branch_layout.addWidget(self.remote_label)
self.remote_branch_layout.addWidget(self.remote_name)
self.remote_branches_layout = QtGui.QHBoxLayout()
self.remote_branches_layout.addWidget(self.remote_branch_label)
self.remote_branches_layout.addWidget(self.remote_branch)
self.options_layout = QtGui.QHBoxLayout()
self.options_layout.setSpacing(defs.button_spacing)
self.options_layout.addStretch()
self.options_layout.addWidget(self.ffwd_only_checkbox)
self.options_layout.addWidget(self.tags_checkbox)
self.options_layout.addWidget(self.rebase_checkbox)
self.options_layout.addWidget(self.action_button)
self.options_layout.addWidget(self.close_button)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.remote_branch_layout)
self.main_layout.addWidget(self.remotes)
if action == PUSH:
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
else: # fetch and pull
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.options_layout)
self.setLayout(self.main_layout)
remotes = self.model.remotes
if 'origin' in remotes:
idx = remotes.index('origin')
if self.select_remote(idx):
self.remote_name.setText('origin')
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'),
self.close, QtGui.QKeySequence.Close, 'Esc')
self.connect(self, SIGNAL('action_completed'), self.action_completed)
self.connect(self.progress_thread, SIGNAL('str'), self.update_progress)
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not qtutils.apply_state(self):
self.resize(666, 420)
self.remote_name.setFocus()
def __init__(self, model, parent=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# The widget version is used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
cfg = gitcfg.instance()
self.browser_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.browser_dockable:
self.browserdockwidget = create_dock(N_('Browser'), self)
self.browserwidget = worktree_browser_widget(self)
self.browserdockwidget.setWidget(self.browserwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Actions'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Switch Repository" widget
self.bookmarksdockwidget = create_dock(N_('Bookmarks'), self)
self.bookmarkswidget = BookmarksWidget(parent=self.bookmarksdockwidget)
self.bookmarksdockwidget.setWidget(self.bookmarkswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_action_button(
N_('Diff Options'), options_icon())
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.unstage_all_action = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.unstage_all_action.setIcon(qtutils.icon('remove.svg'))
self.unstage_selected_action = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.unstage_selected_action.setIcon(qtutils.icon('remove.svg'))
self.show_diffstat_action = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), 'Alt+D')
self.stage_modified_action = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.stage_modified_action.setIcon(qtutils.icon('add.svg'))
self.stage_untracked_action = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), 'Alt+U')
self.stage_untracked_action.setIcon(qtutils.icon('add.svg'))
self.apply_patches_action = add_action(self,
N_('Apply Patches...'), apply_patches)
self.export_patches_action = add_action(self,
N_('Export Patches...'), guicmds.export_patches, 'Alt+E')
self.new_repository_action = add_action(self,
N_('New Repository...'), guicmds.open_new_repo)
self.new_repository_action.setIcon(qtutils.new_icon())
self.preferences_action = add_action(self,
N_('Preferences'), self.preferences,
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.edit_remotes_action = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.edit().exec_())
self.rescan_action = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.rescan_action.setIcon(qtutils.reload_icon())
self.browse_recently_modified_action = add_action(self,
N_('Recently Modified Files...'),
browse_recent_files, 'Shift+Ctrl+E')
self.cherry_pick_action = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.load_commitmsg_action = add_action(self,
N_('Load Commit Message...'), guicmds.load_commitmsg)
self.save_tarball_action = add_action(self,
N_('Save As Tarball/Zip...'), self.save_archive)
self.quit_action = add_action(self,
N_('Quit'), self.close, 'Ctrl+Q')
self.manage_bookmarks_action = add_action(self,
N_('Bookmarks...'), self.manage_bookmarks)
self.grep_action = add_action(self,
N_('Grep'), grep, 'Ctrl+G')
self.merge_local_action = add_action(self,
N_('Merge...'), merge.local_merge)
self.merge_abort_action = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.fetch_action = add_action(self,
N_('Fetch...'), remote.fetch)
self.push_action = add_action(self,
N_('Push...'), remote.push)
self.pull_action = add_action(self,
N_('Pull...'), remote.pull)
self.open_repo_action = add_action(self,
N_('Open...'), guicmds.open_repo)
self.open_repo_action.setIcon(qtutils.open_icon())
self.open_repo_new_action = add_action(self,
N_('Open in New Window...'), guicmds.open_repo_in_new_window)
self.open_repo_new_action.setIcon(qtutils.open_icon())
self.stash_action = add_action(self,
N_('Stash...'), stash, 'Alt+Shift+S')
self.clone_repo_action = add_action(self,
N_('Clone...'), guicmds.clone_repo)
self.clone_repo_action.setIcon(qtutils.git_icon())
self.help_docs_action = add_action(self,
N_('Documentation'), resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.help_shortcuts_action = add_action(self,
N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.visualize_current_action = add_action(self,
N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.visualize_all_action = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.search_commits_action = add_action(self,
N_('Search...'), search)
self.browse_branch_action = add_action(self,
N_('Browse Current Branch...'), guicmds.browse_current)
self.browse_other_branch_action = add_action(self,
N_('Browse Other Branch...'), guicmds.browse_other)
self.load_commitmsg_template_action = add_action(self,
N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitMessageFromTemplate))
self.help_about_action = add_action(self,
N_('About'), launch_about_dialog)
self.diff_expression_action = add_action(self,
N_('Expression...'), guicmds.diff_expression)
self.branch_compare_action = add_action(self,
N_('Branches...'), compare_branches)
self.create_tag_action = add_action(self,
N_('Create Tag...'), create_tag)
self.create_branch_action = add_action(self,
N_('Create...'), create_new_branch, 'Ctrl+B')
self.delete_branch_action = add_action(self,
N_('Delete...'), guicmds.delete_branch)
self.delete_remote_branch_action = add_action(self,
N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.checkout_branch_action = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, 'Alt+B')
self.branch_review_action = add_action(self,
N_('Review...'), guicmds.review_branch)
self.browse_action = add_action(self,
N_('Browser...'), worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self,
N_('DAG...'), lambda: git_dag(self.model).show())
self.dag_action.setIcon(qtutils.git_icon())
self.rebase_start_action = add_action(self,
N_('Start Interactive Rebase...'), self.rebase_start)
self.rebase_edit_todo_action = add_action(self,
N_('Edit...'), self.rebase_edit_todo)
self.rebase_continue_action = add_action(self,
N_('Continue'), self.rebase_continue)
self.rebase_skip_action = add_action(self,
N_('Skip Current Patch'), self.rebase_skip)
self.rebase_abort_action = add_action(self,
N_('Abort'), self.rebase_abort)
# Relayed actions
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.revert_unstaged_edits_action)
if not self.browser_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.lock_layout_action = add_action_bool(self,
N_('Lock Layout'), self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.open_recent_menu = self.file_menu.addMenu(N_('Open Recent'))
self.open_recent_menu.setIcon(qtutils.open_icon())
self.open_recent_new_menu = self.file_menu.addMenu(N_('Open Recent in New Window'))
self.open_recent_new_menu.setIcon(qtutils.open_icon())
self.file_menu.addAction(self.open_repo_action)
self.file_menu.addAction(self.open_repo_new_action)
self.file_menu.addAction(self.clone_repo_action)
self.file_menu.addAction(self.new_repository_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.rescan_action)
self.file_menu.addAction(self.edit_remotes_action)
self.file_menu.addAction(self.browse_recently_modified_action)
self.file_menu.addAction(self.manage_bookmarks_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.load_commitmsg_action)
self.file_menu.addAction(self.load_commitmsg_template_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.apply_patches_action)
self.file_menu.addAction(self.export_patches_action)
self.file_menu.addAction(self.save_tarball_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.preferences_action)
self.file_menu.addAction(self.quit_action)
self.menubar.addAction(self.file_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.fetch_action)
self.actions_menu.addAction(self.push_action)
self.actions_menu.addAction(self.pull_action)
self.actions_menu.addAction(self.stash_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.create_tag_action)
self.actions_menu.addAction(self.cherry_pick_action)
self.actions_menu.addAction(self.merge_local_action)
self.actions_menu.addAction(self.merge_abort_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.grep_action)
self.actions_menu.addAction(self.search_commits_action)
self.menubar.addAction(self.actions_menu.menuAction())
# Index Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.stage_modified_action)
self.commit_menu.addAction(self.stage_untracked_action)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.unstage_all_action)
self.commit_menu.addAction(self.unstage_selected_action)
self.menubar.addAction(self.commit_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.diff_expression_action)
self.diff_menu.addAction(self.branch_compare_action)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.show_diffstat_action)
self.menubar.addAction(self.diff_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.branch_review_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.create_branch_action)
self.branch_menu.addAction(self.checkout_branch_action)
self.branch_menu.addAction(self.delete_branch_action)
self.branch_menu.addAction(self.delete_remote_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.browse_branch_action)
self.branch_menu.addAction(self.browse_other_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.visualize_current_action)
self.branch_menu.addAction(self.visualize_all_action)
self.menubar.addAction(self.branch_menu.menuAction())
# Rebase menu
self.rebase_menu = create_menu(N_('Rebase'), self.actions_menu)
self.rebase_menu.addAction(self.rebase_start_action)
self.rebase_menu.addAction(self.rebase_edit_todo_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_continue_action)
self.rebase_menu.addAction(self.rebase_skip_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_abort_action)
self.menubar.addAction(self.rebase_menu.menuAction())
# View Menu
self.view_menu = create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.browse_action)
self.view_menu.addAction(self.dag_action)
self.view_menu.addSeparator()
if self.browser_dockable:
self.view_menu.addAction(self.browserdockwidget.toggleViewAction())
self.setup_dockwidget_view_menu()
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.help_docs_action)
self.help_menu.addAction(self.help_shortcuts_action)
self.help_menu.addAction(self.help_about_action)
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.browser_dockable:
self.addDockWidget(left, self.browserdockwidget)
self.tabifyDockWidget(self.browserdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(right, self.statusdockwidget)
self.addDockWidget(right, self.bookmarksdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update)
model.add_observer(model.message_mode_changed, lambda x: self._update())
prefs_model.add_observer(prefs_model.message_config_updated,
self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.open_recent_menu, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.open_recent_new_menu, SIGNAL('aboutToShow()'),
self.build_recent_new_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, model, dag, parent=None, args=None):
standard.Dialog.__init__(self, parent=parent)
if utils.is_darwin():
self.setAttribute(QtCore.Qt.WA_MacMetalStyle)
# change when widgets are added/removed
self.widget_version = 1
self.model = model
self.dag = dag
self.setObjectName('dag')
self.setMinimumSize(1, 1)
self.revlabel = QtGui.QLabel()
self.revlabel.setText('git log -')
self.revtext = GitLogLineEdit(parent=self)
self.maxresults = QtGui.QSpinBox()
self.maxresults.setMinimum(-1)
self.maxresults.setMaximum(2**31 - 1)
self.displaybutton = QtGui.QPushButton()
self.displaybutton.setText('Display')
self.zoom_in = QtGui.QPushButton()
self.zoom_in.setIcon(qtutils.theme_icon('zoom-in.png'))
self.zoom_in.setFlat(True)
self.zoom_out = QtGui.QPushButton()
self.zoom_out.setIcon(qtutils.theme_icon('zoom-out.png'))
self.zoom_out.setFlat(True)
self._buttons_layt = QtGui.QHBoxLayout()
self._buttons_layt.setMargin(2)
self._buttons_layt.setSpacing(4)
self._buttons_layt.addWidget(self.revlabel)
self._buttons_layt.addWidget(self.maxresults)
self._buttons_layt.addWidget(self.revtext)
self._buttons_layt.addWidget(self.displaybutton)
self._buttons_layt.addStretch()
self._buttons_layt.addWidget(self.zoom_out)
self._buttons_layt.addWidget(self.zoom_in)
self._commits = {}
self._notifier = notifier = observable.Observable()
self._notifier.refs_updated = refs_updated = 'refs_updated'
self._notifier.add_message_observer(refs_updated, self._display)
self._graphview = GraphView(notifier)
self._treewidget = CommitTreeWidget(notifier)
self._diffwidget = DiffWidget(notifier)
for signal in (archive,):
qtutils.relay_signal(self, self._graphview, SIGNAL(signal))
qtutils.relay_signal(self, self._treewidget, SIGNAL(signal))
self._mainsplitter = QtGui.QSplitter()
self._mainsplitter.setOrientation(QtCore.Qt.Horizontal)
self._mainsplitter.setChildrenCollapsible(True)
self._leftsplitter = QtGui.QSplitter()
self._leftsplitter.setOrientation(QtCore.Qt.Vertical)
self._leftsplitter.setChildrenCollapsible(True)
self._leftsplitter.setStretchFactor(0, 1)
self._leftsplitter.setStretchFactor(1, 1)
self._leftsplitter.insertWidget(0, self._treewidget)
self._leftsplitter.insertWidget(1, self._diffwidget)
self._mainsplitter.insertWidget(0, self._leftsplitter)
self._mainsplitter.insertWidget(1, self._graphview)
self._mainsplitter.setStretchFactor(0, 1)
self._mainsplitter.setStretchFactor(1, 1)
self._layt = layt = QtGui.QVBoxLayout()
layt.setMargin(0)
layt.setSpacing(0)
layt.addLayout(self._buttons_layt)
layt.addWidget(self._mainsplitter)
self.setLayout(layt)
# Also re-loads dag.* from the saved state
if not qtutils.apply_state(self):
self.resize_to_desktop()
# Update fields affected by model
self.revtext.setText(dag.ref)
self.maxresults.setValue(dag.count)
self.update_window_title()
self.thread = ReaderThread(self, dag)
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._mainsplitter, SIGNAL('splitterMoved(int,int)'),
self._splitter_moved)
self.connect(self.zoom_in, SIGNAL('pressed()'),
self._graphview.zoom_in)
self.connect(self.zoom_out, SIGNAL('pressed()'),
self._graphview.zoom_out)
self.connect(self.maxresults, SIGNAL('valueChanged(int)'),
lambda(x): self.dag.set_count(x))
self.connect(self.displaybutton, SIGNAL('pressed()'),
self._display)
self.connect(self.revtext, SIGNAL('ref_changed'),
self._display)
self.connect(self.revtext, SIGNAL('textChanged(QString)'),
self._text_changed)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_message_observer(self.model.message_updated,
self._model_updated)
self.connect(self, SIGNAL('model_updated'),
self.model_updated)
qtutils.add_close_action(self)
def __init__(self, model, parent):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = PreferencesModel()
# Internal field used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 1
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
# Dockwidget options
qtcompat.set_common_dock_options(self)
cfg = gitcfg.instance()
self.classic_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.classic_dockable:
self.classicdockwidget = create_dock('Browser', self)
self.classicwidget = classic_widget(self)
self.classicdockwidget.setWidget(self.classicwidget)
# "Actions" widget
self.actionsdockwidget = create_dock('Action', self)
self.actionsdockwidgetcontents = qt.QFlowLayoutWidget(self)
layout = self.actionsdockwidgetcontents.layout()
self.stage_button = create_button(text='Stage', layout=layout)
self.unstage_button = create_button(text='Unstage', layout=layout)
self.rescan_button = create_button(text='Rescan', layout=layout)
self.fetch_button = create_button(text='Fetch...', layout=layout)
self.push_button = create_button(text='Push...', layout=layout)
self.pull_button = create_button(text='Pull...', layout=layout)
self.stash_button = create_button(text='Stash...', layout=layout)
layout.addStretch()
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
# "Repository Status" widget
self.statusdockwidget = create_dock('Status', self)
self.statusdockwidget.setWidget(StatusWidget(self))
# "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('Commit', self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
relay_signal(self, self.commitmsgeditor, SIGNAL(signals.amend_mode))
relay_signal(self, self.commitmsgeditor, SIGNAL(signals.signoff))
relay_signal(self, self.commitmsgeditor,
SIGNAL(signals.load_previous_message))
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock('Console', self)
self.logdockwidget.setWidget(self.logwidget)
cola.notifier().connect(signals.log_cmd, self.logwidget.log)
# "Diff Viewer" widget
self.diffdockwidget = create_dock('Diff', self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# All Actions
self.menu_unstage_all = add_action(self,
'Unstage All', emit(self, signals.unstage_all))
self.menu_unstage_all.setIcon(qtutils.icon('remove.svg'))
self.menu_unstage_selected = add_action(self,
'Unstage From Commit', emit(self, signals.unstage_selected))
self.menu_unstage_selected.setIcon(qtutils.icon('remove.svg'))
self.menu_show_diffstat = add_action(self,
'Diffstat', emit(self, signals.diffstat), 'Alt+D')
self.menu_stage_modified = add_action(self,
'Stage Changed Files To Commit',
emit(self, signals.stage_modified), 'Alt+A')
self.menu_stage_modified.setIcon(qtutils.icon('add.svg'))
self.menu_stage_untracked = add_action(self,
'Stage All Untracked', emit(self, signals.stage_untracked), 'Alt+U')
self.menu_stage_untracked.setIcon(qtutils.icon('add.svg'))
self.menu_export_patches = add_action(self,
'Export Patches...', guicmds.export_patches, 'Alt+E')
self.menu_preferences = add_action(self,
'Preferences', lambda: preferences(model=prefs_model),
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.menu_edit_remotes = add_action(self,
'Edit Remotes...', lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self,
'Rescan', emit(self, signals.rescan_and_refresh), 'Ctrl+R')
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self,
'Recently Modified Files...', browse_recent, 'Shift+Ctrl+E')
self.menu_cherry_pick = add_action(self,
'Cherry-Pick...', guicmds.cherry_pick, 'Ctrl+P')
self.menu_load_commitmsg = add_action(self,
'Load Commit Message...', guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self,
'Save As Tarball/Zip...', self.save_archive)
self.menu_quit = add_action(self,
'Quit', self.close, 'Ctrl+Q')
self.menu_manage_bookmarks = add_action(self,
'Bookmarks...', manage_bookmarks)
self.menu_grep = add_action(self,
'Grep', guicmds.grep)
self.menu_merge_local = add_action(self,
'Merge...', merge.local_merge)
self.menu_merge_abort = add_action(self,
'Abort Merge...', merge.abort_merge)
self.menu_fetch = add_action(self,
'Fetch...', remote.fetch)
self.menu_push = add_action(self,
'Push...', remote.push)
self.menu_pull = add_action(self,
'Pull...', remote.pull)
self.menu_open_repo = add_action(self,
'Open...', guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self,
'Stash...', stash.stash, 'Alt+Shift+S')
self.menu_clone_repo = add_action(self,
'Clone...', guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(self,
'Documentation', resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.menu_help_shortcuts = add_action(self,
'Keyboard Shortcuts',
show_shortcuts,
QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(self,
'Visualize Current Branch...',
emit(self, signals.visualize_current))
self.menu_visualize_all = add_action(self,
'Visualize All Branches...',
emit(self, signals.visualize_all))
self.menu_search_commits = add_action(self,
'Search...', search)
self.menu_browse_branch = add_action(self,
'Browse Current Branch...', guicmds.browse_current)
self.menu_browse_other_branch = add_action(self,
'Browse Other Branch...', guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(self,
'Get Commit Message Template',
emit(self, signals.load_commit_template))
self.menu_help_about = add_action(self,
'About', launch_about_dialog)
self.menu_branch_diff = add_action(self,
'SHA-1...', guicmds.diff_revision)
self.menu_diff_expression = add_action(self,
'Expression...', guicmds.diff_expression)
self.menu_branch_compare = add_action(self,
'Branches...', compare_branches)
self.menu_create_tag = add_action(self,
'Create Tag...', create_tag)
self.menu_create_branch = add_action(self,
'Create...', create_new_branch, 'Ctrl+B')
self.menu_delete_branch = add_action(self,
'Delete...', guicmds.branch_delete)
self.menu_checkout_branch = add_action(self,
'Checkout...', guicmds.checkout_branch, 'Alt+B')
self.menu_rebase_branch = add_action(self,
'Rebase...', guicmds.rebase)
self.menu_branch_review = add_action(self,
'Review...', guicmds.review_branch)
self.menu_classic = add_action(self,
'Browser...', cola_classic)
self.menu_classic.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self,
'DAG...', lambda: git_dag(self.model))
self.menu_dag.setIcon(qtutils.git_icon())
# Relayed actions
if not self.classic_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.addAction(status_tree.launch_difftool)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu('&File', self.menubar)
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(tr('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_quit)
# Add to menubar
self.menubar.addAction(self.file_menu.menuAction())
# Commit Menu
self.commit_menu = create_menu('Co&mmit', self.menubar)
self.commit_menu.setTitle(tr('Commit@@verb'))
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.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_search_commits)
# Add to menubar
self.menubar.addAction(self.commit_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu('B&ranch', self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_rebase_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
# Add to menubar
self.menubar.addAction(self.branch_menu.menuAction())
# Actions menu
self.actions_menu = create_menu('Act&ions', self.menubar)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_export_patches)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addAction(self.menu_grep)
# Add to menubar
self.menubar.addAction(self.actions_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu('&Diff', self.menubar)
self.diff_menu.addAction(self.menu_branch_diff)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
# Add to menubar
self.menubar.addAction(self.diff_menu.menuAction())
# Tools Menu
self.tools_menu = create_menu('&Tools', self.menubar)
self.tools_menu.addAction(self.menu_classic)
self.tools_menu.addAction(self.menu_dag)
self.tools_menu.addSeparator()
if self.classic_dockable:
self.tools_menu.addAction(self.classicdockwidget.toggleViewAction())
self.setup_dockwidget_tools_menu()
self.menubar.addAction(self.tools_menu.menuAction())
# Help Menu
self.help_menu = create_menu('&Help', self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
# Add to menubar
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
top = Qt.TopDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(top, self.commitdockwidget)
if self.classic_dockable:
self.addDockWidget(top, self.classicdockwidget)
self.addDockWidget(top, self.statusdockwidget)
self.addDockWidget(top, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
if self.classic_dockable:
self.tabifyDockWidget(self.classicdockwidget, self.commitdockwidget)
self.tabifyDockWidget(self.logdockwidget, self.diffdockwidget)
# 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)
# Add button callbacks
connect_button(self.rescan_button,
emit(self, signals.rescan_and_refresh))
connect_button(self.fetch_button, remote.fetch)
connect_button(self.push_button, remote.push)
connect_button(self.pull_button, remote.pull)
connect_button(self.stash_button, stash.stash)
connect_button(self.stage_button, self.stage)
connect_button(self.unstage_button, self.unstage)
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
qtutils.apply_state(self)
self.statusdockwidget.widget().setFocus()
log(0, version.git_version_str() + '\ncola version ' + version.version())
def __init__(self, model, parent):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# Internal field used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ""
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.classic_dockable = cfg.get("cola.browserdockable") or cfg.get("cola.classicdockable")
if self.classic_dockable:
self.classicdockwidget = create_dock(N_("Browser"), self)
self.classicwidget = classic_widget(self)
self.classicdockwidget.setWidget(self.classicwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_("Action"), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_("Status"), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_("Commit"), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_("Console"), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_("Diff"), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_("Ignore changes in whitespace at EOL"), self._update_diff_opts
)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_("Ignore changes in amount of whitespace"), self._update_diff_opts
)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self, N_("Ignore all whitespace"), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_("Show whole surrounding functions of changes"), self._update_diff_opts
)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_("Options"), icon=options_icon(), tooltip=N_("Diff Options"))
self.diffopts_menu = create_menu(N_("Diff Options"), self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self, N_("Unstage All"), cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon("remove.svg"))
self.menu_unstage_selected = add_action(self, N_("Unstage From Commit"), cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon("remove.svg"))
self.menu_show_diffstat = add_action(self, N_("Diffstat"), cmds.run(cmds.Diffstat), "Alt+D")
self.menu_stage_modified = add_action(
self, N_("Stage Changed Files To Commit"), cmds.run(cmds.StageModified), "Alt+A"
)
self.menu_stage_modified.setIcon(qtutils.icon("add.svg"))
self.menu_stage_untracked = add_action(self, N_("Stage All Untracked"), cmds.run(cmds.StageUntracked), "Alt+U")
self.menu_stage_untracked.setIcon(qtutils.icon("add.svg"))
self.menu_export_patches = add_action(self, N_("Export Patches..."), guicmds.export_patches, "Alt+E")
self.new_repository = add_action(self, N_("New Repository..."), guicmds.open_new_repo)
self.new_repository.setIcon(qtutils.new_icon())
self.menu_preferences = add_action(
self, N_("Preferences"), self.preferences, QtGui.QKeySequence.Preferences, "Ctrl+O"
)
self.menu_edit_remotes = add_action(self, N_("Edit Remotes..."), lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self, cmds.Refresh.name(), cmds.run(cmds.Refresh), cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self, N_("Recently Modified Files..."), browse_recent, "Shift+Ctrl+E")
self.menu_cherry_pick = add_action(self, N_("Cherry-Pick..."), guicmds.cherry_pick, "Ctrl+P")
self.menu_load_commitmsg = add_action(self, N_("Load Commit Message..."), guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self, N_("Save As Tarball/Zip..."), self.save_archive)
self.menu_quit = add_action(self, N_("Quit"), self.close, "Ctrl+Q")
self.menu_manage_bookmarks = add_action(self, N_("Bookmarks..."), manage_bookmarks)
self.menu_grep = add_action(self, N_("Grep"), guicmds.grep, "Ctrl+G")
self.menu_merge_local = add_action(self, N_("Merge..."), merge.local_merge)
self.menu_merge_abort = add_action(self, N_("Abort Merge..."), merge.abort_merge)
self.menu_fetch = add_action(self, N_("Fetch..."), remote.fetch)
self.menu_push = add_action(self, N_("Push..."), remote.push)
self.menu_pull = add_action(self, N_("Pull..."), remote.pull)
self.menu_open_repo = add_action(self, N_("Open..."), guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self, N_("Stash..."), stash.stash, "Alt+Shift+S")
self.menu_clone_repo = add_action(self, N_("Clone..."), guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(
self, N_("Documentation"), resources.show_html_docs, QtGui.QKeySequence.HelpContents
)
self.menu_help_shortcuts = add_action(self, N_("Keyboard Shortcuts"), show_shortcuts, QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(
self, N_("Visualize Current Branch..."), cmds.run(cmds.VisualizeCurrent)
)
self.menu_visualize_all = add_action(self, N_("Visualize All Branches..."), cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self, N_("Search..."), search)
self.menu_browse_branch = add_action(self, N_("Browse Current Branch..."), guicmds.browse_current)
self.menu_browse_other_branch = add_action(self, N_("Browse Other Branch..."), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(
self, N_("Get Commit Message Template"), cmds.run(cmds.LoadCommitTemplate)
)
self.menu_help_about = add_action(self, N_("About"), launch_about_dialog)
self.menu_diff_expression = add_action(self, N_("Expression..."), guicmds.diff_expression)
self.menu_branch_compare = add_action(self, N_("Branches..."), compare_branches)
self.menu_create_tag = add_action(self, N_("Create Tag..."), create_tag)
self.menu_create_branch = add_action(self, N_("Create..."), create_new_branch, "Ctrl+B")
self.menu_delete_branch = add_action(self, N_("Delete..."), guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(self, N_("Delete Remote Branch..."), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self, N_("Checkout..."), guicmds.checkout_branch, "Alt+B")
self.menu_rebase_branch = add_action(self, N_("Rebase..."), guicmds.rebase)
self.menu_branch_review = add_action(self, N_("Review..."), guicmds.review_branch)
self.menu_classic = add_action(self, N_("Browser..."), cola_classic)
self.menu_classic.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self, N_("DAG..."), lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
# Relayed actions
if not self.classic_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_("File"), self.menubar)
self.file_menu.addAction(self.new_repository)
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_("Open Recent"))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addAction(self.menu_quit)
# Add to menubar
self.menubar.addAction(self.file_menu.menuAction())
# Commit Menu
self.commit_menu = create_menu(N_("Index"), self.menubar)
self.commit_menu.setTitle(N_("Index"))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
# Add to menubar
self.menubar.addAction(self.commit_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_("Branch"), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_rebase_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
# Add to menubar
self.menubar.addAction(self.branch_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_("Actions"), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
# Add to menubar
self.menubar.addAction(self.actions_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_("Diff"), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
# Add to menubar
self.menubar.addAction(self.diff_menu.menuAction())
# Tools Menu
self.tools_menu = create_menu(N_("Tools"), self.menubar)
self.tools_menu.addAction(self.menu_classic)
self.tools_menu.addAction(self.menu_dag)
self.tools_menu.addSeparator()
if self.classic_dockable:
self.tools_menu.addAction(self.classicdockwidget.toggleViewAction())
self.setup_dockwidget_tools_menu()
self.menubar.addAction(self.tools_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_("Help"), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
# Add to menubar
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.classic_dockable:
self.addDockWidget(left, self.classicdockwidget)
self.tabifyDockWidget(self.classicdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update_view)
prefs_model.add_observer(prefs_model.message_config_updated, self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.menu_open_recent, SIGNAL("aboutToShow()"), self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL("cursorPosition(int,int)"), self.show_cursor_position)
self.connect(self, SIGNAL("update"), self._update_callback)
self.connect(self, SIGNAL("install_config_actions"), self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + "\n" + N_("git cola version %s") % version.version())
def __init__(self, model, action, parent):
"""Customizes the dialog based on the remote action
"""
standard.Dialog.__init__(self, parent=parent)
self.model = model
self.action = action
self.tasks = []
self.filtered_remote_branches = []
self.selected_remotes = []
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowModality(Qt.WindowModal)
self.setWindowTitle(N_(action))
self.progress = QtGui.QProgressDialog(self)
self.progress.setFont(qtutils.diff_font())
self.progress.setRange(0, 0)
self.progress.setCancelButton(None)
self.progress.setWindowTitle(action)
self.progress.setWindowModality(Qt.WindowModal)
self.progress.setLabelText(N_('Updating') + '.. ')
self.progress_thread = ProgressAnimationThread(N_('Updating'), self)
self.local_label = QtGui.QLabel()
self.local_label.setText(N_('Local Branch'))
self.local_branch = QtGui.QLineEdit()
self.local_branches = QtGui.QListWidget()
self.local_branches.addItems(self.model.local_branches)
self.remote_label = QtGui.QLabel()
self.remote_label.setText(N_('Remote'))
self.remote_name = QtGui.QLineEdit()
self.remotes = QtGui.QListWidget()
if action == PUSH:
self.remotes.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection)
self.remotes.addItems(self.model.remotes)
self.remote_branch_label = QtGui.QLabel()
self.remote_branch_label.setText(N_('Remote Branch'))
self.remote_branch = QtGui.QLineEdit()
self.remote_branches = QtGui.QListWidget()
self.remote_branches.addItems(self.model.remote_branches)
self.ffwd_only_checkbox = QtGui.QCheckBox()
self.ffwd_only_checkbox.setText(N_('Fast Forward Only '))
self.ffwd_only_checkbox.setChecked(True)
self.tags_checkbox = QtGui.QCheckBox()
self.tags_checkbox.setText(N_('Include tags '))
self.rebase_checkbox = QtGui.QCheckBox()
self.rebase_checkbox.setText(N_('Rebase '))
self.action_button = QtGui.QPushButton()
self.action_button.setText(N_(action))
self.action_button.setIcon(qtutils.ok_icon())
self.close_button = QtGui.QPushButton()
self.close_button.setText(N_('Close'))
self.close_button.setIcon(qtutils.close_icon())
self.local_branch_layout = QtGui.QHBoxLayout()
self.local_branch_layout.addWidget(self.local_label)
self.local_branch_layout.addWidget(self.local_branch)
self.remote_branch_layout = QtGui.QHBoxLayout()
self.remote_branch_layout.addWidget(self.remote_label)
self.remote_branch_layout.addWidget(self.remote_name)
self.remote_branches_layout = QtGui.QHBoxLayout()
self.remote_branches_layout.addWidget(self.remote_branch_label)
self.remote_branches_layout.addWidget(self.remote_branch)
self.options_layout = QtGui.QHBoxLayout()
self.options_layout.setSpacing(defs.button_spacing)
self.options_layout.addStretch()
self.options_layout.addWidget(self.ffwd_only_checkbox)
self.options_layout.addWidget(self.tags_checkbox)
self.options_layout.addWidget(self.rebase_checkbox)
self.options_layout.addWidget(self.action_button)
self.options_layout.addWidget(self.close_button)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.remote_branch_layout)
self.main_layout.addWidget(self.remotes)
if action == PUSH:
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
else: # fetch and pull
self.main_layout.addLayout(self.remote_branches_layout)
self.main_layout.addWidget(self.remote_branches)
self.main_layout.addLayout(self.local_branch_layout)
self.main_layout.addWidget(self.local_branches)
self.main_layout.addLayout(self.options_layout)
self.setLayout(self.main_layout)
remotes = self.model.remotes
if 'origin' in remotes:
idx = remotes.index('origin')
if self.select_remote(idx):
self.remote_name.setText('origin')
else:
if self.select_first_remote():
self.remote_name.setText(remotes[0])
# Trim the remote list to just the default remote
self.update_remotes()
self.set_field_defaults()
# Setup signals and slots
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.update_remotes)
self.connect(self.local_branches, SIGNAL('itemSelectionChanged()'),
self.update_local_branches)
self.connect(self.remote_branches, SIGNAL('itemSelectionChanged()'),
self.update_remote_branches)
connect_button(self.action_button, self.action_callback)
connect_button(self.close_button, self.close)
qtutils.add_action(self, N_('Close'), self.close,
QtGui.QKeySequence.Close, 'Esc')
self.connect(self, SIGNAL('action_completed'), self.action_completed)
self.connect(self.progress_thread, SIGNAL('str'), self.update_progress)
if action == PULL:
self.tags_checkbox.hide()
self.ffwd_only_checkbox.hide()
self.local_label.hide()
self.local_branch.hide()
self.local_branches.hide()
self.remote_branch.setFocus()
else:
self.rebase_checkbox.hide()
if not qtutils.apply_state(self):
self.resize(666, 420)
self.remote_name.setFocus()
def __init__(self, parent=None):
Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(N_('Search'))
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.input_label = QtGui.QLabel('git grep')
self.input_label.setFont(diff_font())
self.input_txt = HintedLineEdit(N_('command-line arguments'), self)
self.input_txt.enable_hint(True)
self.regexp_combo = combo = QtGui.QComboBox()
combo.setToolTip(N_('Choose the "git grep" regular expression mode'))
items = [N_('Basic Regexp'), N_('Extended Regexp'), N_('Fixed String')]
combo.addItems(items)
combo.setCurrentIndex(0)
combo.setEditable(False)
combo.setItemData(0,
N_('Search using a POSIX basic regular expression'),
Qt.ToolTipRole)
combo.setItemData(1,
N_('Search using a POSIX extended regular expression'),
Qt.ToolTipRole)
combo.setItemData(2,
N_('Search for a fixed string'),
Qt.ToolTipRole)
combo.setItemData(0, '--basic-regexp', Qt.UserRole)
combo.setItemData(1, '--extended-regexp', Qt.UserRole)
combo.setItemData(2, '--fixed-strings', Qt.UserRole)
self.result_txt = GrepTextView(N_('grep result...'), self)
self.result_txt.enable_hint(True)
self.edit_button = QtGui.QPushButton(N_('Edit'))
self.edit_button.setIcon(qtutils.open_file_icon())
self.edit_button.setEnabled(False)
self.edit_button.setShortcut(cmds.Edit.SHORTCUT)
self.refresh_button = QtGui.QPushButton(N_('Refresh'))
self.refresh_button.setIcon(qtutils.reload_icon())
self.refresh_button.setShortcut(QtGui.QKeySequence.Refresh)
self.shell_checkbox = QtGui.QCheckBox(N_('Shell arguments'))
self.shell_checkbox.setToolTip(
N_('Parse arguments using a shell.\n'
'Queries with spaces will require "double quotes".'))
self.shell_checkbox.setChecked(False)
self.close_button = QtGui.QPushButton(N_('Close'))
self.input_layout = QtGui.QHBoxLayout()
self.input_layout.setMargin(0)
self.input_layout.setSpacing(defs.button_spacing)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(0)
self.bottom_layout.setSpacing(defs.button_spacing)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.input_layout.addWidget(self.input_label)
self.input_layout.addWidget(self.input_txt)
self.input_layout.addWidget(self.regexp_combo)
self.bottom_layout.addWidget(self.edit_button)
self.bottom_layout.addWidget(self.refresh_button)
self.bottom_layout.addWidget(self.shell_checkbox)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.close_button)
self.mainlayout.addLayout(self.input_layout)
self.mainlayout.addWidget(self.result_txt)
self.mainlayout.addLayout(self.bottom_layout)
self.setLayout(self.mainlayout)
self.grep_thread = GrepThread(self)
self.connect(self.grep_thread, SIGNAL('result'),
self.process_result)
self.connect(self.input_txt, SIGNAL('textChanged(QString)'),
lambda s: self.search())
self.connect(self.regexp_combo, SIGNAL('currentIndexChanged(int)'),
lambda x: self.search())
self.connect(self.result_txt, SIGNAL('leave()'),
lambda: self.input_txt.setFocus())
qtutils.add_action(self.input_txt, 'FocusResults',
lambda: self.result_txt.setFocus(),
Qt.Key_Down, Qt.Key_Enter, Qt.Key_Return)
qtutils.add_action(self, 'FocusSearch',
lambda: self.input_txt.setFocus(),
'Ctrl+l')
qtutils.connect_button(self.edit_button, self.edit)
qtutils.connect_button(self.refresh_button, self.search)
qtutils.connect_toggle(self.shell_checkbox, lambda x: self.search())
qtutils.connect_button(self.close_button, self.close)
qtutils.add_close_action(self)
if not qtutils.apply_state(self):
self.resize(666, 420)
def __init__(self, model, dag, parent=None, args=None):
super(DAGView, self).__init__(parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setMinimumSize(1, 1)
# 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.revtext = completion.GitLogLineEdit(parent=self)
self.maxresults = QtGui.QSpinBox()
self.maxresults.setMinimum(1)
self.maxresults.setMaximum(99999)
self.maxresults.setPrefix("git log -")
self.maxresults.setSuffix("")
self.displaybutton = QtGui.QPushButton()
self.displaybutton.setText("Display")
self.zoom_in = QtGui.QPushButton()
self.zoom_in.setIcon(qtutils.theme_icon("zoom-in.png"))
self.zoom_in.setFlat(True)
self.zoom_out = QtGui.QPushButton()
self.zoom_out.setIcon(qtutils.theme_icon("zoom-out.png"))
self.zoom_out.setFlat(True)
self.top_layout = QtGui.QHBoxLayout()
self.top_layout.setMargin(defs.margin)
self.top_layout.setSpacing(defs.button_spacing)
self.top_layout.addWidget(self.maxresults)
self.top_layout.addWidget(self.revtext)
self.top_layout.addWidget(self.displaybutton)
self.top_layout.addStretch()
self.top_layout.addWidget(self.zoom_out)
self.top_layout.addWidget(self.zoom_in)
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = "refs_updated"
self.notifier.add_observer(refs_updated, self.display)
self.graphview = GraphView(notifier, self)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = DiffWidget(notifier, self)
for signal in (archive,):
qtutils.relay_signal(self, self.graphview, SIGNAL(signal))
qtutils.relay_signal(self, self.treewidget, SIGNAL(signal))
self.splitter = QtGui.QSplitter()
self.splitter.setOrientation(Qt.Horizontal)
self.splitter.setChildrenCollapsible(True)
self.splitter.setHandleWidth(defs.handle_width)
self.left_splitter = QtGui.QSplitter()
self.left_splitter.setOrientation(Qt.Vertical)
self.left_splitter.setChildrenCollapsible(True)
self.left_splitter.setHandleWidth(defs.handle_width)
self.left_splitter.setStretchFactor(0, 1)
self.left_splitter.setStretchFactor(1, 1)
self.left_splitter.insertWidget(0, self.treewidget)
self.left_splitter.insertWidget(1, self.diffwidget)
self.splitter.insertWidget(0, self.left_splitter)
self.splitter.insertWidget(1, self.graphview)
self.splitter.setStretchFactor(0, 1)
self.splitter.setStretchFactor(1, 1)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(0)
self.main_layout.setSpacing(0)
self.main_layout.addLayout(self.top_layout)
self.main_layout.addWidget(self.splitter)
self.setLayout(self.main_layout)
# Also re-loads dag.* from the saved state
if not qtutils.apply_state(self):
self.resize_to_desktop()
# Update fields affected by model
self.revtext.setText(dag.ref)
self.maxresults.setValue(dag.count)
self.update_window_title()
self.thread = ReaderThread(dag, self)
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.splitter, SIGNAL("splitterMoved(int,int)"), self.splitter_moved)
self.connect(self.zoom_in, SIGNAL("pressed()"), self.graphview.zoom_in)
self.connect(self.zoom_out, SIGNAL("pressed()"), self.graphview.zoom_out)
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.displaybutton, SIGNAL("pressed()"), self.display)
self.connect(self.revtext, SIGNAL("ref_changed"), self.display)
self.connect(self.revtext, SIGNAL("textChanged(QString)"), self.text_changed)
# 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_close_action(self)
def __init__(self, model, parent):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# Internal field used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.classic_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.classic_dockable:
self.classicdockwidget = create_dock(N_('Browser'), self)
self.classicwidget = classic_widget(self)
self.classicdockwidget.setWidget(self.classicwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Action'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_('Options'),
icon=options_icon(),
tooltip=N_('Diff Options'))
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon('remove.svg'))
self.menu_unstage_selected = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon('remove.svg'))
self.menu_show_diffstat = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), 'Alt+D')
self.menu_stage_modified = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.menu_stage_modified.setIcon(qtutils.icon('add.svg'))
self.menu_stage_untracked = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), 'Alt+U')
self.menu_stage_untracked.setIcon(qtutils.icon('add.svg'))
self.menu_export_patches = add_action(self,
N_('Export Patches...'), guicmds.export_patches, 'Alt+E')
self.menu_preferences = add_action(self,
N_('Preferences'), self.preferences,
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.menu_edit_remotes = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self,
N_('Recently Modified Files...'),
browse_recent, 'Shift+Ctrl+E')
self.menu_cherry_pick = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.menu_load_commitmsg = add_action(self,
N_('Load Commit Message...'), guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self,
N_('Save As Tarball/Zip...'), self.save_archive)
self.menu_quit = add_action(self,
N_('Quit'), self.close, 'Ctrl+Q')
self.menu_manage_bookmarks = add_action(self,
N_('Bookmarks...'), manage_bookmarks)
self.menu_grep = add_action(self,
N_('Grep'), guicmds.grep, 'Ctrl+G')
self.menu_merge_local = add_action(self,
N_('Merge...'), merge.local_merge)
self.menu_merge_abort = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.menu_fetch = add_action(self,
N_('Fetch...'), remote.fetch)
self.menu_push = add_action(self,
N_('Push...'), remote.push)
self.menu_pull = add_action(self,
N_('Pull...'), remote.pull)
self.menu_open_repo = add_action(self,
N_('Open...'), guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self,
N_('Stash...'), stash.stash, 'Alt+Shift+S')
self.menu_clone_repo = add_action(self,
N_('Clone...'), guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(self,
N_('Documentation'), resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.menu_help_shortcuts = add_action(self,
N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(self,
N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.menu_visualize_all = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self,
N_('Search...'), search)
self.menu_browse_branch = add_action(self,
N_('Browse Current Branch...'), guicmds.browse_current)
self.menu_browse_other_branch = add_action(self,
N_('Browse Other Branch...'), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(self,
N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitTemplate))
self.menu_help_about = add_action(self,
N_('About'), launch_about_dialog)
self.menu_diff_expression = add_action(self,
N_('Expression...'), guicmds.diff_expression)
self.menu_branch_compare = add_action(self,
N_('Branches...'), compare_branches)
self.menu_create_tag = add_action(self,
N_('Create Tag...'), create_tag)
self.menu_create_branch = add_action(self,
N_('Create...'), create_new_branch, 'Ctrl+B')
self.menu_delete_branch = add_action(self,
N_('Delete...'), guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(self,
N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, 'Alt+B')
self.menu_rebase_branch = add_action(self,
N_('Rebase...'), guicmds.rebase)
self.menu_branch_review = add_action(self,
N_('Review...'), guicmds.review_branch)
self.menu_classic = add_action(self,
N_('Browser...'), cola_classic)
self.menu_classic.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self,
N_('DAG...'), lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
# Relayed actions
if not self.classic_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_('Open Recent'))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addAction(self.menu_quit)
# Add to menubar
self.menubar.addAction(self.file_menu.menuAction())
# Commit Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
# Add to menubar
self.menubar.addAction(self.commit_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_rebase_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
# Add to menubar
self.menubar.addAction(self.branch_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
# Add to menubar
self.menubar.addAction(self.actions_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
# Add to menubar
self.menubar.addAction(self.diff_menu.menuAction())
# Tools Menu
self.tools_menu = create_menu(N_('Tools'), self.menubar)
self.tools_menu.addAction(self.menu_classic)
self.tools_menu.addAction(self.menu_dag)
self.tools_menu.addSeparator()
if self.classic_dockable:
self.tools_menu.addAction(self.classicdockwidget.toggleViewAction())
self.setup_dockwidget_tools_menu()
self.menubar.addAction(self.tools_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
# Add to menubar
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.classic_dockable:
self.addDockWidget(left, self.classicdockwidget)
self.tabifyDockWidget(self.classicdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update_view)
prefs_model.add_observer(prefs_model.message_config_updated,
self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.menu_open_recent, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, model, dag, parent=None, args=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.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.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.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(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 qtutils.apply_state(self):
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, parent=None):
super(ApplyPatches, self).__init__(parent=parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(N_('Apply Patches'))
self.setAcceptDrops(True)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.curdir = os.getcwd()
self.inner_drag = False
self.usage = QtGui.QLabel()
self.usage.setText(N_("""
<p>
Drag and drop or use the <strong>Add</strong> button to add
patches to the list
</p>
"""))
self.tree = PatchTreeWidget(parent=self)
self.tree.setHeaderHidden(True)
self.add_button = qtutils.create_toolbutton(
text=N_('Add'), icon=qtutils.add_icon(),
tooltip=N_('Add patches (+)'))
self.remove_button = qtutils.create_toolbutton(
text=N_('Remove'), icon=qtutils.remove_icon(),
tooltip=N_('Remove selected (Delete)'))
self.apply_button = qtutils.create_button(
text=N_('Apply'), icon=qtutils.apply_icon())
self.close_button = qtutils.create_button(
text=N_('Close'), icon=qtutils.close_icon())
self.add_action = qtutils.add_action(self,
N_('Add'), self.add_files,
Qt.Key_Plus)
self.remove_action = qtutils.add_action(self,
N_('Remove'), self.tree.remove_selected,
QtGui.QKeySequence.Delete, Qt.Key_Backspace,
Qt.Key_Minus)
layout = QtGui.QVBoxLayout()
layout.setMargin(defs.margin)
layout.setSpacing(defs.spacing)
top = QtGui.QHBoxLayout()
top.setMargin(defs.no_margin)
top.setSpacing(defs.button_spacing)
top.addWidget(self.add_button)
top.addWidget(self.remove_button)
top.addStretch()
top.addWidget(self.usage)
bottom = QtGui.QHBoxLayout()
bottom.setMargin(defs.no_margin)
bottom.setSpacing(defs.button_spacing)
bottom.addWidget(self.apply_button)
bottom.addStretch()
bottom.addWidget(self.close_button)
layout.addLayout(top)
layout.addWidget(self.tree)
layout.addLayout(bottom)
self.setLayout(layout)
qtutils.connect_button(self.add_button, self.add_files)
qtutils.connect_button(self.remove_button, self.tree.remove_selected)
qtutils.connect_button(self.apply_button, self.apply_patches)
qtutils.connect_button(self.close_button, self.close)
if not qtutils.apply_state(self):
self.resize(666, 420)
def __init__(self, parent):
Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowModality(Qt.WindowModal)
self.setWindowTitle(N_('Search'))
self.input_label = QtGui.QLabel('git grep')
self.input_label.setFont(diff_font())
self.input_txt = HintedLineEdit(N_('command-line arguments'), self)
self.input_txt.enable_hint(True)
self.regexp_combo = combo = QtGui.QComboBox()
combo.setToolTip(N_('Choose the "git grep" regular expression mode'))
items = [N_('Basic Regexp'), N_('Extended Regexp'), N_('Fixed String')]
combo.addItems(items)
combo.setCurrentIndex(0)
combo.setEditable(False)
combo.setItemData(0,
N_('Search using a POSIX basic regular expression'),
Qt.ToolTipRole)
combo.setItemData(
1, N_('Search using a POSIX extended regular expression'),
Qt.ToolTipRole)
combo.setItemData(2, N_('Search for a fixed string'), Qt.ToolTipRole)
combo.setItemData(0, '--basic-regexp', Qt.UserRole)
combo.setItemData(1, '--extended-regexp', Qt.UserRole)
combo.setItemData(2, '--fixed-strings', Qt.UserRole)
self.result_txt = GrepTextView(N_('grep result...'), self)
self.result_txt.enable_hint(True)
self.edit_button = QtGui.QPushButton(N_('Edit'))
self.edit_button.setIcon(qtutils.open_file_icon())
self.edit_button.setEnabled(False)
self.edit_button.setShortcut(cmds.Edit.SHORTCUT)
self.refresh_button = QtGui.QPushButton(N_('Refresh'))
self.refresh_button.setIcon(qtutils.reload_icon())
self.refresh_button.setShortcut(QtGui.QKeySequence.Refresh)
self.shell_checkbox = QtGui.QCheckBox(N_('Shell arguments'))
self.shell_checkbox.setToolTip(
N_('Parse arguments using a shell.\n'
'Queries with spaces will require "double quotes".'))
self.shell_checkbox.setChecked(False)
self.close_button = QtGui.QPushButton(N_('Close'))
self.input_layout = QtGui.QHBoxLayout()
self.input_layout.setMargin(0)
self.input_layout.setSpacing(defs.button_spacing)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(0)
self.bottom_layout.setSpacing(defs.button_spacing)
self.mainlayout = QtGui.QVBoxLayout()
self.mainlayout.setMargin(defs.margin)
self.mainlayout.setSpacing(defs.spacing)
self.input_layout.addWidget(self.input_label)
self.input_layout.addWidget(self.input_txt)
self.input_layout.addWidget(self.regexp_combo)
self.bottom_layout.addWidget(self.edit_button)
self.bottom_layout.addWidget(self.refresh_button)
self.bottom_layout.addWidget(self.shell_checkbox)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.close_button)
self.mainlayout.addLayout(self.input_layout)
self.mainlayout.addWidget(self.result_txt)
self.mainlayout.addLayout(self.bottom_layout)
self.setLayout(self.mainlayout)
self.grep_thread = GrepThread(self)
self.connect(self.grep_thread, SIGNAL('result'), self.process_result)
self.connect(self.input_txt, SIGNAL('textChanged(QString)'),
lambda s: self.search())
self.connect(self.regexp_combo, SIGNAL('currentIndexChanged(int)'),
lambda x: self.search())
self.connect(self.result_txt, SIGNAL('leave()'),
lambda: self.input_txt.setFocus())
qtutils.add_action(self.input_txt, 'FocusResults',
lambda: self.result_txt.setFocus(), Qt.Key_Down,
Qt.Key_Enter, Qt.Key_Return)
qtutils.add_action(self, 'FocusSearch',
lambda: self.input_txt.setFocus(), 'Ctrl+l')
qtutils.connect_button(self.edit_button, self.edit)
qtutils.connect_button(self.refresh_button, self.search)
qtutils.connect_toggle(self.shell_checkbox, lambda x: self.search())
qtutils.connect_button(self.close_button, self.close)
qtutils.add_close_action(self)
if not qtutils.apply_state(self):
self.resize(666, 420)
def __init__(self, model, dag, parent=None, args=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(
N_('Zoom Out'), qtutils.theme_icon('zoom-out.png'))
self.zoom_in = qtutils.create_action_button(
N_('Zoom In'), qtutils.theme_icon('zoom-in.png'))
self.zoom_to_fit = qtutils.create_action_button(
N_('Zoom to Fit'), 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.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.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.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(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 qtutils.apply_state(self):
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)
