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 = core.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)
self.top_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.add_button, self.remove_button,
qtutils.STRETCH, self.usage)
self.bottom_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.apply_button, qtutils.STRETCH,
self.close_button)
self.main_layout = qtutils.vbox(defs.margin, defs.spacing,
self.top_layout, self.tree,
self.bottom_layout)
self.setLayout(self.main_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 self.restore_state():
self.resize(666, 420)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = qtutils.add_action(self, cmds.SignOff.name(),
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self,
N_('Commit@@verb'),
self.commit,
cmds.Commit.SHORTCUT)
self.commit_action.setToolTip(N_('Commit staged changes'))
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.setMinimumHeight(defs.tool_button_height)
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = N_('Commit staged changes\n'
'Shortcut: Ctrl+Enter')
self.commit_button = qtutils.create_toolbutton(
text=N_('Commit@@verb'), tooltip=commit_button_tooltip,
icon=qtutils.save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = qtutils.create_toolbutton(
icon=qtutils.options_icon(), tooltip=N_('Actions...'))
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
qtutils.hide_button_menu_indicator(self.actions_button)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
N_('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.amend_action.setShortcut(cmds.AmendMode.SHORTCUT)
self.amend_action.setShortcutContext(Qt.ApplicationShortcut)
# Bypass hooks
self.bypass_commit_hooks_action = self.actions_menu.addAction(
N_('Bypass Commit Hooks'))
self.bypass_commit_hooks_action.setCheckable(True)
self.bypass_commit_hooks_action.setChecked(False)
# Sign commits
cfg = gitcfg.current()
self.sign_action = self.actions_menu.addAction(
N_('Create Signed Commit'))
self.sign_action.setCheckable(True)
self.sign_action.setChecked(cfg.get('cola.signcommits', False))
# Spell checker
self.check_spelling_action = self.actions_menu.addAction(
N_('Check Spelling'))
self.check_spelling_action.setCheckable(True)
self.check_spelling_action.setChecked(False)
# Line wrapping
self.autowrap_action = self.actions_menu.addAction(
N_('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(prefs.linebreak())
# Commit message
self.actions_menu.addSeparator()
self.load_commitmsg_menu = self.actions_menu.addMenu(
N_('Load Previous Commit Message'))
self.connect(self.load_commitmsg_menu, SIGNAL('aboutToShow()'),
self.build_commitmsg_menu)
self.fixup_commit_menu = self.actions_menu.addMenu(
N_('Fixup Previous Commit'))
self.connect(self.fixup_commit_menu, SIGNAL('aboutToShow()'),
self.build_fixup_menu)
self.toplayout = qtutils.hbox(defs.no_margin, defs.spacing,
self.actions_button, self.summary,
self.commit_button)
self.toplayout.setContentsMargins(defs.margin, defs.no_margin,
defs.no_margin, defs.no_margin)
self.mainlayout = qtutils.vbox(defs.no_margin, defs.spacing,
self.toplayout, self.description)
self.setLayout(self.mainlayout)
qtutils.connect_button(self.commit_button, self.commit)
# Broadcast the amend mode
qtutils.connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
qtutils.connect_action_bool(self.check_spelling_action,
self.toggle_check_spelling)
# Handle the one-off autowrapping
qtutils.connect_action_bool(self.autowrap_action, self.set_linebreak)
qtutils.add_action(self.summary, N_('Move Down'),
self.focus_description,
Qt.Key_Return, Qt.Key_Enter)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down,
Qt.Key_Down)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_summary_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('leave()'),
self.focus_summary)
self.setFont(qtutils.diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(prefs.tabwidth())
self.set_textwidth(prefs.textwidth())
self.set_linebreak(prefs.linebreak())
# Loading message
commit_msg = ''
commit_msg_path = commit_message_path()
if commit_msg_path:
commit_msg = core.read(commit_msg_path)
self.set_commit_message(commit_msg)
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, ref, shortref=None, parent=None):
QtGui.QDialog.__init__(self, parent)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
# input
self.ref = ref
if shortref is None:
shortref = ref
# outputs
self.fmt = None
filename = '%s-%s' % (os.path.basename(core.getcwd()), shortref)
self.prefix = filename + '/'
self.filename = filename
# widgets
self.setWindowTitle(N_('Save Archive'))
self.filetext = QtGui.QLineEdit()
self.filetext.setText(self.filename)
self.browse = qtutils.create_toolbutton(icon=icons.file_zip())
self.format_strings = (
git.archive('--list')[STDOUT].rstrip().splitlines())
self.format_combo = QtGui.QComboBox()
self.format_combo.setEditable(False)
self.format_combo.addItems(self.format_strings)
self.close_button = qtutils.close_button()
self.save_button = qtutils.create_button(text=N_('Save'),
icon=icons.save(),
default=True)
self.prefix_label = QtGui.QLabel()
self.prefix_label.setText(N_('Prefix'))
self.prefix_text = QtGui.QLineEdit()
self.prefix_text.setText(self.prefix)
self.prefix_group = ExpandableGroupBox()
self.prefix_group.setTitle(N_('Advanced'))
# layouts
self.filelayt = qtutils.hbox(defs.no_margin, defs.spacing,
self.browse, self.filetext,
self.format_combo)
self.prefixlayt = qtutils.hbox(defs.margin, defs.spacing,
self.prefix_label, self.prefix_text)
self.prefix_group.setLayout(self.prefixlayt)
self.prefix_group.set_expanded(False)
self.btnlayt = qtutils.hbox(defs.no_margin, defs.spacing,
qtutils.STRETCH, self.close_button,
self.save_button)
self.mainlayt = qtutils.vbox(defs.margin, defs.no_spacing,
self.filelayt, self.prefix_group,
qtutils.STRETCH, self.btnlayt)
self.setLayout(self.mainlayt)
self.resize(defs.scale(520), defs.scale(10))
# initial setup; done before connecting to avoid
# signal/slot side-effects
if 'tar.gz' in self.format_strings:
idx = self.format_strings.index('tar.gz')
elif 'zip' in self.format_strings:
idx = self.format_strings.index('zip')
else:
idx = 0
self.format_combo.setCurrentIndex(idx)
self.update_filetext_for_format(idx)
# connections
self.connect(self.filetext, SIGNAL('textChanged(QString)'),
self.filetext_changed)
self.connect(self.prefix_text, SIGNAL('textChanged(QString)'),
self.prefix_text_changed)
self.connect(self.format_combo, SIGNAL('currentIndexChanged(int)'),
self.update_filetext_for_format)
self.connect(self.prefix_group, SIGNAL('expanded(bool)'),
self.prefix_group_expanded)
self.connect(self, SIGNAL('accepted()'), self.archive_saved)
qtutils.connect_button(self.browse, self.choose_filename)
qtutils.connect_button(self.close_button, self.reject)
qtutils.connect_button(self.save_button, self.save_archive)
def __init__(self, parent):
standard.Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(N_('Search'))
self.mode_combo = QtGui.QComboBox()
self.browse_button = create_toolbutton(icon=dir_icon(),
tooltip=N_('Browse...'))
self.query = QtGui.QLineEdit()
self.start_date = QtGui.QDateEdit()
self.start_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.start_date.setCalendarPopup(True)
self.start_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.end_date = QtGui.QDateEdit()
self.end_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.end_date.setCalendarPopup(True)
self.end_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.search_button = QtGui.QPushButton()
self.search_button.setText(N_('Search'))
self.search_button.setDefault(True)
self.max_count = QtGui.QSpinBox()
self.max_count.setMinimum(5)
self.max_count.setMaximum(9995)
self.max_count.setSingleStep(5)
self.max_count.setValue(500)
self.commit_list = QtGui.QListWidget()
self.commit_list.setMinimumSize(QtCore.QSize(1, 1))
self.commit_list.setAlternatingRowColors(True)
self.commit_list.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
self.commit_text = DiffTextEdit(self, whitespace=False)
self.button_export = QtGui.QPushButton()
self.button_export.setText(N_('Export Patches'))
self.button_cherrypick = QtGui.QPushButton()
self.button_cherrypick.setText(N_('Cherry Pick'))
self.button_close = QtGui.QPushButton()
self.button_close.setText(N_('Close'))
self.top_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.query, self.start_date,
self.end_date, self.browse_button,
self.search_button, qtutils.STRETCH,
self.mode_combo, self.max_count)
self.splitter = qtutils.splitter(Qt.Vertical,
self.commit_list, self.commit_text)
self.bottom_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.button_export,
self.button_cherrypick,
qtutils.STRETCH, self.button_close)
self.main_layout = qtutils.vbox(defs.margin, defs.spacing,
self.top_layout, self.splitter,
self.bottom_layout)
self.setLayout(self.main_layout)
if self.parent():
self.resize(self.parent().width(), self.parent().height())
else:
self.resize(720, 500)
def __init__(self, parent):
standard.Dialog.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
self.setWindowTitle(N_('Search'))
self.mode_combo = QtGui.QComboBox()
self.browse_button = create_toolbutton(icon=icons.folder(),
tooltip=N_('Browse...'))
self.query = QtGui.QLineEdit()
self.start_date = QtGui.QDateEdit()
self.start_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.start_date.setCalendarPopup(True)
self.start_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.end_date = QtGui.QDateEdit()
self.end_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.end_date.setCalendarPopup(True)
self.end_date.setDisplayFormat(N_('yyyy-MM-dd'))
icon = icons.search()
self.search_button = qtutils.create_button(text=N_('Search'),
icon=icon,
default=True)
self.max_count = QtGui.QSpinBox()
self.max_count.setMinimum(5)
self.max_count.setMaximum(9995)
self.max_count.setSingleStep(5)
self.max_count.setValue(500)
self.commit_list = QtGui.QListWidget()
self.commit_list.setMinimumSize(QtCore.QSize(1, 1))
self.commit_list.setAlternatingRowColors(True)
selection_mode = QtGui.QAbstractItemView.SingleSelection
self.commit_list.setSelectionMode(selection_mode)
self.commit_text = DiffTextEdit(self, whitespace=False)
self.button_export = qtutils.create_button(text=N_('Export Patches'),
icon=icons.diff())
self.button_cherrypick = qtutils.create_button(text=N_('Cherry Pick'),
icon=icons.save())
self.button_close = qtutils.close_button()
self.top_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.query, self.start_date,
self.end_date, self.browse_button,
self.search_button, qtutils.STRETCH,
self.mode_combo, self.max_count)
self.splitter = qtutils.splitter(Qt.Vertical, self.commit_list,
self.commit_text)
self.bottom_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.button_export,
self.button_cherrypick,
qtutils.STRETCH, self.button_close)
self.main_layout = qtutils.vbox(defs.margin, defs.spacing,
self.top_layout, self.splitter,
self.bottom_layout)
self.setLayout(self.main_layout)
if self.parent():
self.resize(self.parent().width(), self.parent().height())
else:
self.resize(720, 500)
def __init__(self, ref, shortref=None, parent=None):
QtGui.QDialog.__init__(self, parent)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
# input
self.ref = ref
if shortref is None:
shortref = ref
# outputs
self.fmt = None
filename = '%s-%s' % (os.path.basename(core.getcwd()), shortref)
self.prefix = filename + '/'
self.filename = filename
# widgets
self.setWindowTitle(N_('Save Archive'))
self.filetext = QtGui.QLineEdit()
self.filetext.setText(self.filename)
self.browse = qtutils.create_toolbutton(icon=icons.file_zip())
self.format_strings = (
git.archive('--list')[STDOUT].rstrip().splitlines())
self.format_combo = QtGui.QComboBox()
self.format_combo.setEditable(False)
self.format_combo.addItems(self.format_strings)
self.close_button = qtutils.close_button()
self.save_button = qtutils.create_button(text=N_('Save'),
icon=icons.save(),
default=True)
self.prefix_label = QtGui.QLabel()
self.prefix_label.setText(N_('Prefix'))
self.prefix_text = QtGui.QLineEdit()
self.prefix_text.setText(self.prefix)
self.prefix_group = ExpandableGroupBox()
self.prefix_group.setTitle(N_('Advanced'))
# layouts
self.filelayt = qtutils.hbox(defs.no_margin, defs.spacing, self.browse,
self.filetext, self.format_combo)
self.prefixlayt = qtutils.hbox(defs.margin, defs.spacing,
self.prefix_label, self.prefix_text)
self.prefix_group.setLayout(self.prefixlayt)
self.prefix_group.set_expanded(False)
self.btnlayt = qtutils.hbox(defs.no_margin, defs.spacing,
qtutils.STRETCH, self.close_button,
self.save_button)
self.mainlayt = qtutils.vbox(defs.margin, defs.no_spacing,
self.filelayt, self.prefix_group,
qtutils.STRETCH, self.btnlayt)
self.setLayout(self.mainlayt)
self.resize(defs.scale(520), defs.scale(10))
# initial setup; done before connecting to avoid
# signal/slot side-effects
if 'tar.gz' in self.format_strings:
idx = self.format_strings.index('tar.gz')
elif 'zip' in self.format_strings:
idx = self.format_strings.index('zip')
else:
idx = 0
self.format_combo.setCurrentIndex(idx)
self.update_filetext_for_format(idx)
# connections
self.connect(self.filetext, SIGNAL('textChanged(QString)'),
self.filetext_changed)
self.connect(self.prefix_text, SIGNAL('textChanged(QString)'),
self.prefix_text_changed)
self.connect(self.format_combo, SIGNAL('currentIndexChanged(int)'),
self.update_filetext_for_format)
self.connect(self.prefix_group, SIGNAL('expanded(bool)'),
self.prefix_group_expanded)
self.connect(self, SIGNAL('accepted()'), self.archive_saved)
qtutils.connect_button(self.browse, self.choose_filename)
qtutils.connect_button(self.close_button, self.reject)
qtutils.connect_button(self.save_button, self.save_archive)
def __init__(self, model, parent=None):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# The widget version is used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.browser_dockable = (cfg.get('cola.browserdockable')
or cfg.get('cola.classicdockable'))
if self.browser_dockable:
self.browserdockwidget = create_dock(N_('Browser'), self)
self.browserwidget = worktree_browser_widget(self)
self.browserdockwidget.setWidget(self.browserwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Actions'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(
self, N_('Ignore all whitespace'), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_('Options'),
icon=options_icon(),
tooltip=N_('Diff Options'))
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self, N_('Unstage All'),
cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon('remove.svg'))
self.menu_unstage_selected = add_action(self,
N_('Unstage From Commit'),
cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon('remove.svg'))
self.menu_show_diffstat = add_action(self, N_('Diffstat'),
cmds.run(cmds.Diffstat), 'Alt+D')
self.menu_stage_modified = add_action(
self, N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.menu_stage_modified.setIcon(qtutils.icon('add.svg'))
self.menu_stage_untracked = add_action(self, N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked),
'Alt+U')
self.menu_stage_untracked.setIcon(qtutils.icon('add.svg'))
self.menu_export_patches = add_action(self, N_('Export Patches...'),
guicmds.export_patches, 'Alt+E')
self.new_repository = add_action(self, N_('New Repository...'),
guicmds.open_new_repo)
self.new_repository.setIcon(qtutils.new_icon())
self.menu_preferences = add_action(self, N_('Preferences'),
self.preferences,
QtGui.QKeySequence.Preferences,
'Ctrl+O')
self.menu_edit_remotes = add_action(self, N_('Edit Remotes...'),
lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self, cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self,
N_('Recently Modified Files...'),
browse_recent, 'Shift+Ctrl+E')
self.menu_cherry_pick = add_action(self, N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.menu_load_commitmsg = add_action(self,
N_('Load Commit Message...'),
guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self, N_('Save As Tarball/Zip...'),
self.save_archive)
self.menu_quit = add_action(self, N_('Quit'), self.close, 'Ctrl+Q')
self.menu_manage_bookmarks = add_action(self, N_('Bookmarks...'),
manage_bookmarks)
self.menu_grep = add_action(self, N_('Grep'), guicmds.grep, 'Ctrl+G')
self.menu_merge_local = add_action(self, N_('Merge...'),
merge.local_merge)
self.menu_merge_abort = add_action(self, N_('Abort Merge...'),
merge.abort_merge)
self.menu_fetch = add_action(self, N_('Fetch...'), remote.fetch)
self.menu_push = add_action(self, N_('Push...'), remote.push)
self.menu_pull = add_action(self, N_('Pull...'), remote.pull)
self.menu_open_repo = add_action(self, N_('Open...'),
guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self, N_('Stash...'), stash,
'Alt+Shift+S')
self.menu_clone_repo = add_action(self, N_('Clone...'),
guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(self, N_('Documentation'),
resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.menu_help_shortcuts = add_action(self, N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(
self, N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.menu_visualize_all = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self, N_('Search...'), search)
self.menu_browse_branch = add_action(self,
N_('Browse Current Branch...'),
guicmds.browse_current)
self.menu_browse_other_branch = add_action(
self, N_('Browse Other Branch...'), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(
self, N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitMessageFromTemplate))
self.menu_help_about = add_action(self, N_('About'),
launch_about_dialog)
self.menu_diff_expression = add_action(self, N_('Expression...'),
guicmds.diff_expression)
self.menu_branch_compare = add_action(self, N_('Branches...'),
compare_branches)
self.menu_create_tag = add_action(self, N_('Create Tag...'),
create_tag)
self.menu_create_branch = add_action(self, N_('Create...'),
create_new_branch, 'Ctrl+B')
self.menu_delete_branch = add_action(self, N_('Delete...'),
guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(
self, N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self, N_('Checkout...'),
guicmds.checkout_branch,
'Alt+B')
self.menu_branch_review = add_action(self, N_('Review...'),
guicmds.review_branch)
self.menu_browse = add_action(self, N_('Browser...'), worktree_browser)
self.menu_browse.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self, N_('DAG...'),
lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
self.rebase_start_action = add_action(
self, N_('Start Interactive Rebase...'), self.rebase_start)
self.rebase_edit_todo_action = add_action(self, N_('Edit...'),
self.rebase_edit_todo)
self.rebase_continue_action = add_action(self, N_('Continue'),
self.rebase_continue)
self.rebase_skip_action = add_action(self, N_('Skip Current Patch'),
self.rebase_skip)
self.rebase_abort_action = add_action(self, N_('Abort'),
self.rebase_abort)
# Relayed actions
if not self.browser_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.lock_layout_action = add_action_bool(self, N_('Lock Layout'),
self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.file_menu.addAction(self.new_repository)
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_('Open Recent'))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addAction(self.menu_quit)
self.menubar.addAction(self.file_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
self.menubar.addAction(self.actions_menu.menuAction())
# Index Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
self.menubar.addAction(self.commit_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
self.menubar.addAction(self.diff_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
self.menubar.addAction(self.branch_menu.menuAction())
# Rebase menu
self.rebase_menu = create_menu(N_('Rebase'), self.actions_menu)
self.rebase_menu.addAction(self.rebase_start_action)
self.rebase_menu.addAction(self.rebase_edit_todo_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_continue_action)
self.rebase_menu.addAction(self.rebase_skip_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_abort_action)
self.menubar.addAction(self.rebase_menu.menuAction())
# View Menu
self.view_menu = create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.menu_browse)
self.view_menu.addAction(self.menu_dag)
self.view_menu.addSeparator()
if self.browser_dockable:
self.view_menu.addAction(self.browserdockwidget.toggleViewAction())
self.setup_dockwidget_view_menu()
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.browser_dockable:
self.addDockWidget(left, self.browserdockwidget)
self.tabifyDockWidget(self.browserdockwidget,
self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update)
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.menu_open_recent, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, parent):
standard.Dialog.__init__(self, parent)
self.setAttribute(QtCore.Qt.WA_MacMetalStyle)
self.setWindowTitle(N_("Search"))
self.mode_combo = QtGui.QComboBox()
self.browse_button = create_toolbutton(icon=dir_icon(), tooltip=N_("Browse..."))
self.query = QtGui.QLineEdit()
self.start_date = QtGui.QDateEdit()
self.start_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.start_date.setCalendarPopup(True)
self.start_date.setDisplayFormat(N_("yyyy-MM-dd"))
self.end_date = QtGui.QDateEdit()
self.end_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.end_date.setCalendarPopup(True)
self.end_date.setDisplayFormat(N_("yyyy-MM-dd"))
self.search_button = QtGui.QPushButton()
self.search_button.setText(N_("Search"))
self.search_button.setDefault(True)
self.max_count = QtGui.QSpinBox()
self.max_count.setMinimum(5)
self.max_count.setMaximum(9995)
self.max_count.setSingleStep(5)
self.max_count.setValue(500)
self.commit_list = QtGui.QListWidget()
self.commit_list.setMinimumSize(QtCore.QSize(1, 1))
self.commit_list.setAlternatingRowColors(True)
self.commit_list.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
self.commit_text = DiffTextEdit(self, whitespace=False)
self.button_export = QtGui.QPushButton()
self.button_export.setText(N_("Export Patches"))
self.button_cherrypick = QtGui.QPushButton()
self.button_cherrypick.setText(N_("Cherry Pick"))
self.button_close = QtGui.QPushButton()
self.button_close.setText(N_("Close"))
self.top_layout = QtGui.QHBoxLayout()
self.top_layout.setMargin(defs.no_margin)
self.top_layout.setSpacing(defs.button_spacing)
self.top_layout.addWidget(self.query)
self.top_layout.addWidget(self.start_date)
self.top_layout.addWidget(self.end_date)
self.top_layout.addWidget(self.browse_button)
self.top_layout.addWidget(self.search_button)
self.top_layout.addStretch()
self.top_layout.addWidget(self.mode_combo)
self.top_layout.addWidget(self.max_count)
self.splitter = QtGui.QSplitter()
self.splitter.setHandleWidth(defs.handle_width)
self.splitter.setOrientation(QtCore.Qt.Vertical)
self.splitter.setChildrenCollapsible(True)
self.splitter.addWidget(self.commit_list)
self.splitter.addWidget(self.commit_text)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(defs.no_margin)
self.bottom_layout.setSpacing(defs.spacing)
self.bottom_layout.addWidget(self.button_export)
self.bottom_layout.addWidget(self.button_cherrypick)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.button_close)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.top_layout)
self.main_layout.addWidget(self.splitter)
self.main_layout.addLayout(self.bottom_layout)
self.setLayout(self.main_layout)
if self.parent():
self.resize(self.parent().width(), self.parent().height())
else:
self.resize(720, 500)
def __init__(self, model, parent=None):
MainWindow.__init__(self, parent)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# The widget version is used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ''
self.setAcceptDrops(True)
self.setAttribute(Qt.WA_MacMetalStyle)
cfg = gitcfg.instance()
self.browser_dockable = (cfg.get('cola.browserdockable') or
cfg.get('cola.classicdockable'))
if self.browser_dockable:
self.browserdockwidget = create_dock(N_('Browser'), self)
self.browserwidget = worktree_browser_widget(self)
self.browserdockwidget.setWidget(self.browserwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_('Actions'), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_('Status'), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_('Commit'), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_('Console'), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_('Diff'), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(self,
N_('Ignore changes in whitespace at EOL'),
self._update_diff_opts)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(self,
N_('Ignore changes in amount of whitespace'),
self._update_diff_opts)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self,
N_('Ignore all whitespace'),
self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(self,
N_('Show whole surrounding functions of changes'),
self._update_diff_opts)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_('Options'),
icon=options_icon(),
tooltip=N_('Diff Options'))
self.diffopts_menu = create_menu(N_('Diff Options'),
self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.menu_unstage_all = add_action(self,
N_('Unstage All'), cmds.run(cmds.UnstageAll))
self.menu_unstage_all.setIcon(qtutils.icon('remove.svg'))
self.menu_unstage_selected = add_action(self,
N_('Unstage From Commit'), cmds.run(cmds.UnstageSelected))
self.menu_unstage_selected.setIcon(qtutils.icon('remove.svg'))
self.menu_show_diffstat = add_action(self,
N_('Diffstat'), cmds.run(cmds.Diffstat), 'Alt+D')
self.menu_stage_modified = add_action(self,
N_('Stage Changed Files To Commit'),
cmds.run(cmds.StageModified), 'Alt+A')
self.menu_stage_modified.setIcon(qtutils.icon('add.svg'))
self.menu_stage_untracked = add_action(self,
N_('Stage All Untracked'),
cmds.run(cmds.StageUntracked), 'Alt+U')
self.menu_stage_untracked.setIcon(qtutils.icon('add.svg'))
self.menu_export_patches = add_action(self,
N_('Export Patches...'), guicmds.export_patches, 'Alt+E')
self.new_repository = add_action(self,
N_('New Repository...'), guicmds.open_new_repo)
self.new_repository.setIcon(qtutils.new_icon())
self.menu_preferences = add_action(self,
N_('Preferences'), self.preferences,
QtGui.QKeySequence.Preferences, 'Ctrl+O')
self.menu_edit_remotes = add_action(self,
N_('Edit Remotes...'), lambda: editremotes.edit().exec_())
self.menu_rescan = add_action(self,
cmds.Refresh.name(),
cmds.run(cmds.Refresh),
cmds.Refresh.SHORTCUT)
self.menu_rescan.setIcon(qtutils.reload_icon())
self.menu_browse_recent = add_action(self,
N_('Recently Modified Files...'),
browse_recent, 'Shift+Ctrl+E')
self.menu_cherry_pick = add_action(self,
N_('Cherry-Pick...'),
guicmds.cherry_pick, 'Ctrl+P')
self.menu_load_commitmsg = add_action(self,
N_('Load Commit Message...'), guicmds.load_commitmsg)
self.menu_save_tarball = add_action(self,
N_('Save As Tarball/Zip...'), self.save_archive)
self.menu_quit = add_action(self,
N_('Quit'), self.close, 'Ctrl+Q')
self.menu_manage_bookmarks = add_action(self,
N_('Bookmarks...'), manage_bookmarks)
self.menu_grep = add_action(self,
N_('Grep'), guicmds.grep, 'Ctrl+G')
self.menu_merge_local = add_action(self,
N_('Merge...'), merge.local_merge)
self.menu_merge_abort = add_action(self,
N_('Abort Merge...'), merge.abort_merge)
self.menu_fetch = add_action(self,
N_('Fetch...'), remote.fetch)
self.menu_push = add_action(self,
N_('Push...'), remote.push)
self.menu_pull = add_action(self,
N_('Pull...'), remote.pull)
self.menu_open_repo = add_action(self,
N_('Open...'), guicmds.open_repo)
self.menu_open_repo.setIcon(qtutils.open_icon())
self.menu_stash = add_action(self,
N_('Stash...'), stash, 'Alt+Shift+S')
self.menu_clone_repo = add_action(self,
N_('Clone...'), guicmds.clone_repo)
self.menu_clone_repo.setIcon(qtutils.git_icon())
self.menu_help_docs = add_action(self,
N_('Documentation'), resources.show_html_docs,
QtGui.QKeySequence.HelpContents)
self.menu_help_shortcuts = add_action(self,
N_('Keyboard Shortcuts'),
show_shortcuts,
QtCore.Qt.Key_Question)
self.menu_visualize_current = add_action(self,
N_('Visualize Current Branch...'),
cmds.run(cmds.VisualizeCurrent))
self.menu_visualize_all = add_action(self,
N_('Visualize All Branches...'),
cmds.run(cmds.VisualizeAll))
self.menu_search_commits = add_action(self,
N_('Search...'), search)
self.menu_browse_branch = add_action(self,
N_('Browse Current Branch...'), guicmds.browse_current)
self.menu_browse_other_branch = add_action(self,
N_('Browse Other Branch...'), guicmds.browse_other)
self.menu_load_commitmsg_template = add_action(self,
N_('Get Commit Message Template'),
cmds.run(cmds.LoadCommitMessageFromTemplate))
self.menu_help_about = add_action(self,
N_('About'), launch_about_dialog)
self.menu_diff_expression = add_action(self,
N_('Expression...'), guicmds.diff_expression)
self.menu_branch_compare = add_action(self,
N_('Branches...'), compare_branches)
self.menu_create_tag = add_action(self,
N_('Create Tag...'), create_tag)
self.menu_create_branch = add_action(self,
N_('Create...'), create_new_branch, 'Ctrl+B')
self.menu_delete_branch = add_action(self,
N_('Delete...'), guicmds.delete_branch)
self.menu_delete_remote_branch = add_action(self,
N_('Delete Remote Branch...'), guicmds.delete_remote_branch)
self.menu_checkout_branch = add_action(self,
N_('Checkout...'), guicmds.checkout_branch, 'Alt+B')
self.menu_branch_review = add_action(self,
N_('Review...'), guicmds.review_branch)
self.menu_browse = add_action(self,
N_('Browser...'), worktree_browser)
self.menu_browse.setIcon(qtutils.git_icon())
self.menu_dag = add_action(self,
N_('DAG...'), lambda: git_dag(self.model).show())
self.menu_dag.setIcon(qtutils.git_icon())
self.rebase_start_action = add_action(self,
N_('Start Interactive Rebase...'), self.rebase_start)
self.rebase_edit_todo_action = add_action(self,
N_('Edit...'), self.rebase_edit_todo)
self.rebase_continue_action = add_action(self,
N_('Continue'), self.rebase_continue)
self.rebase_skip_action = add_action(self,
N_('Skip Current Patch'), self.rebase_skip)
self.rebase_abort_action = add_action(self,
N_('Abort'), self.rebase_abort)
# Relayed actions
if not self.browser_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.lock_layout_action = add_action_bool(self,
N_('Lock Layout'), self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_('File'), self.menubar)
self.file_menu.addAction(self.new_repository)
self.file_menu.addAction(self.menu_open_repo)
self.menu_open_recent = self.file_menu.addMenu(N_('Open Recent'))
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_clone_repo)
self.file_menu.addAction(self.menu_manage_bookmarks)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_edit_remotes)
self.file_menu.addAction(self.menu_rescan)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_browse_recent)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_load_commitmsg)
self.file_menu.addAction(self.menu_load_commitmsg_template)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_save_tarball)
self.file_menu.addAction(self.menu_export_patches)
self.file_menu.addSeparator()
self.file_menu.addAction(self.menu_preferences)
self.file_menu.addAction(self.menu_quit)
self.menubar.addAction(self.file_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_('Actions'), self.menubar)
self.actions_menu.addAction(self.menu_fetch)
self.actions_menu.addAction(self.menu_push)
self.actions_menu.addAction(self.menu_pull)
self.actions_menu.addAction(self.menu_stash)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_create_tag)
self.actions_menu.addAction(self.menu_cherry_pick)
self.actions_menu.addAction(self.menu_merge_local)
self.actions_menu.addAction(self.menu_merge_abort)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.menu_grep)
self.actions_menu.addAction(self.menu_search_commits)
self.menubar.addAction(self.actions_menu.menuAction())
# Index Menu
self.commit_menu = create_menu(N_('Index'), self.menubar)
self.commit_menu.setTitle(N_('Index'))
self.commit_menu.addAction(self.menu_stage_modified)
self.commit_menu.addAction(self.menu_stage_untracked)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.menu_unstage_all)
self.commit_menu.addAction(self.menu_unstage_selected)
self.menubar.addAction(self.commit_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_('Diff'), self.menubar)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.menu_show_diffstat)
self.menubar.addAction(self.diff_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_('Branch'), self.menubar)
self.branch_menu.addAction(self.menu_branch_review)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_create_branch)
self.branch_menu.addAction(self.menu_checkout_branch)
self.branch_menu.addAction(self.menu_delete_branch)
self.branch_menu.addAction(self.menu_delete_remote_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_browse_branch)
self.branch_menu.addAction(self.menu_browse_other_branch)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.menu_visualize_current)
self.branch_menu.addAction(self.menu_visualize_all)
self.menubar.addAction(self.branch_menu.menuAction())
# Rebase menu
self.rebase_menu = create_menu(N_('Rebase'), self.actions_menu)
self.rebase_menu.addAction(self.rebase_start_action)
self.rebase_menu.addAction(self.rebase_edit_todo_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_continue_action)
self.rebase_menu.addAction(self.rebase_skip_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_abort_action)
self.menubar.addAction(self.rebase_menu.menuAction())
# View Menu
self.view_menu = create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.menu_browse)
self.view_menu.addAction(self.menu_dag)
self.view_menu.addSeparator()
if self.browser_dockable:
self.view_menu.addAction(self.browserdockwidget.toggleViewAction())
self.setup_dockwidget_view_menu()
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_('Help'), self.menubar)
self.help_menu.addAction(self.menu_help_docs)
self.help_menu.addAction(self.menu_help_shortcuts)
self.help_menu.addAction(self.menu_help_about)
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.browser_dockable:
self.addDockWidget(left, self.browserdockwidget)
self.tabifyDockWidget(self.browserdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update_view)
prefs_model.add_observer(prefs_model.message_config_updated,
self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.menu_open_recent, SIGNAL('aboutToShow()'),
self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL('cursorPosition(int,int)'),
self.show_cursor_position)
self.connect(self, SIGNAL('update'), self._update_callback)
self.connect(self, SIGNAL('install_config_actions'),
self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + '\n' +
N_('git cola version %s') % version.version())
def __init__(self, parent=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 self.restore_state():
self.resize(666, 420)
def __init__(self, parent=None):
QtGui.QDialog.__init__(self, parent)
self.setWindowTitle(N_('Edit Remotes'))
if parent is not None:
self.setWindowModality(Qt.WindowModal)
width = max(640, parent.width())
height = max(480, parent.height())
self.resize(width, height)
else:
self.resize(720, 300)
self.default_hint = N_(''
'Add and remove remote repositories using the \n'
'Add(+) and Delete(-) buttons on the left-hand side.\n'
'\n'
'Remotes can be renamed by selecting one from the list\n'
'and pressing "enter", or by double-clicking.')
self.remote_list = []
self.remotes = QtGui.QListWidget()
self.remotes.setToolTip(N_(
'Remote git repositories - double-click to rename'))
self.info = text.HintedTextView(self.default_hint, self)
font = self.info.font()
metrics = QtGui.QFontMetrics(font)
width = metrics.width('_' * 42)
height = metrics.height() * 13
self.info.setMinimumWidth(width)
self.info.setMinimumHeight(height)
self.info_thread = RemoteInfoThread(self)
icon = icons.add()
tooltip = N_('Add new remote git repository')
self.add_btn = qtutils.create_toolbutton(icon=icon, tooltip=tooltip)
self.refresh_btn = qtutils.create_toolbutton(icon=icons.sync(),
tooltip=N_('Refresh'))
self.delete_btn = qtutils.create_toolbutton(icon=icons.remove(),
tooltip=N_('Delete remote'))
self.close_btn = qtutils.close_button()
self._top_layout = qtutils.splitter(Qt.Horizontal,
self.remotes, self.info)
width = self._top_layout.width()
self._top_layout.setSizes([width//4, width*3//4])
self._button_layout = qtutils.hbox(defs.margin, defs.spacing,
self.add_btn, self.delete_btn,
self.refresh_btn, qtutils.STRETCH,
self.close_btn)
self._layout = qtutils.vbox(defs.margin, defs.spacing,
self._top_layout, self._button_layout)
self.setLayout(self._layout)
self.refresh()
qtutils.connect_button(self.add_btn, self.add)
qtutils.connect_button(self.delete_btn, self.delete)
qtutils.connect_button(self.refresh_btn, self.refresh)
qtutils.connect_button(self.close_btn, self.close)
self.connect(self.info_thread, SIGNAL('info(PyQt_PyObject)'),
self.info.set_value, Qt.QueuedConnection)
self.connect(self.remotes,
SIGNAL('itemChanged(QListWidgetItem*)'),
self.remote_renamed)
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.selection_changed)
def toolbutton(self, text, tooltip, icon):
return qtutils.create_toolbutton(text=text, tooltip=tooltip, icon=icon)
def __init__(self, model, parent=None):
Dialog.__init__(self, parent=parent)
self.model = model
self.stashes = []
self.revids = []
self.names = []
self.setWindowTitle(N_('Stash'))
self.setAttribute(QtCore.Qt.WA_MacMetalStyle)
if parent is not None:
self.setWindowModality(QtCore.Qt.WindowModal)
self.resize(parent.width(), 420)
else:
self.resize(700, 420)
self.stash_list = QtGui.QListWidget(self)
self.stash_text = DiffTextEdit(self)
self.button_apply = qtutils.create_toolbutton(
text=N_('Apply'),
tooltip=N_('Apply the selected stash'),
icon=icons.ok())
self.button_save = qtutils.create_toolbutton(
text=N_('Save'),
tooltip=N_('Save modified state to new stash'),
icon=icons.save())
self.button_drop = qtutils.create_toolbutton(
text=N_('Drop'),
tooltip=N_('Drop the selected stash'),
icon=icons.discard())
self.button_close = qtutils.close_button()
self.keep_index = qtutils.checkbox(text=N_('Keep Index'), checked=True)
# Arrange layouts
self.splitter = qtutils.splitter(Qt.Horizontal, self.stash_list,
self.stash_text)
self.btn_layt = qtutils.hbox(defs.no_margin, defs.spacing,
self.button_save, self.button_apply,
self.button_drop, self.keep_index,
qtutils.STRETCH, self.button_close)
self.main_layt = qtutils.vbox(defs.margin, defs.spacing, self.splitter,
self.btn_layt)
self.setLayout(self.main_layt)
self.splitter.setSizes([self.width() // 3, self.width() * 2 // 3])
self.update_from_model()
self.update_actions()
self.setTabOrder(self.button_save, self.button_apply)
self.setTabOrder(self.button_apply, self.button_drop)
self.setTabOrder(self.button_drop, self.keep_index)
self.setTabOrder(self.keep_index, self.button_close)
self.connect(self.stash_list, SIGNAL('itemSelectionChanged()'),
self.item_selected)
qtutils.connect_button(self.button_apply, self.stash_apply)
qtutils.connect_button(self.button_save, self.stash_save)
qtutils.connect_button(self.button_drop, self.stash_drop)
qtutils.connect_button(self.button_close, self.close)
def __init__(self, model, parent=None):
MainWindow.__init__(self, parent)
self.setAttribute(Qt.WA_MacMetalStyle)
# Default size; this is thrown out when save/restore is used
self.resize(987, 610)
self.model = model
self.prefs_model = prefs_model = prefs.PreferencesModel()
# The widget version is used by import/export_state().
# Change this whenever dockwidgets are removed.
self.widget_version = 2
# Keeps track of merge messages we've seen
self.merge_message_hash = ""
cfg = gitcfg.instance()
self.browser_dockable = cfg.get("cola.browserdockable") or cfg.get("cola.classicdockable")
if self.browser_dockable:
self.browserdockwidget = create_dock(N_("Browser"), self)
self.browserwidget = worktree_browser_widget(self)
self.browserdockwidget.setWidget(self.browserwidget)
# "Actions" widget
self.actionsdockwidget = create_dock(N_("Actions"), self)
self.actionsdockwidgetcontents = action.ActionButtons(self)
self.actionsdockwidget.setWidget(self.actionsdockwidgetcontents)
self.actionsdockwidget.toggleViewAction().setChecked(False)
self.actionsdockwidget.hide()
# "Repository Status" widget
self.statuswidget = StatusWidget(self)
self.statusdockwidget = create_dock(N_("Status"), self)
self.statusdockwidget.setWidget(self.statuswidget)
# "Commit Message Editor" widget
self.position_label = QtGui.QLabel()
font = qtutils.default_monospace_font()
font.setPointSize(int(font.pointSize() * 0.8))
self.position_label.setFont(font)
self.commitdockwidget = create_dock(N_("Commit"), self)
titlebar = self.commitdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.position_label)
self.commitmsgeditor = CommitMessageEditor(model, self)
self.commitdockwidget.setWidget(self.commitmsgeditor)
# "Console" widget
self.logwidget = LogWidget()
self.logdockwidget = create_dock(N_("Console"), self)
self.logdockwidget.setWidget(self.logwidget)
self.logdockwidget.toggleViewAction().setChecked(False)
self.logdockwidget.hide()
# "Diff Viewer" widget
self.diffdockwidget = create_dock(N_("Diff"), self)
self.diffeditor = DiffEditor(self.diffdockwidget)
self.diffdockwidget.setWidget(self.diffeditor)
# "Diff Options" tool menu
self.diff_ignore_space_at_eol_action = add_action(
self, N_("Ignore changes in whitespace at EOL"), self._update_diff_opts
)
self.diff_ignore_space_at_eol_action.setCheckable(True)
self.diff_ignore_space_change_action = add_action(
self, N_("Ignore changes in amount of whitespace"), self._update_diff_opts
)
self.diff_ignore_space_change_action.setCheckable(True)
self.diff_ignore_all_space_action = add_action(self, N_("Ignore all whitespace"), self._update_diff_opts)
self.diff_ignore_all_space_action.setCheckable(True)
self.diff_function_context_action = add_action(
self, N_("Show whole surrounding functions of changes"), self._update_diff_opts
)
self.diff_function_context_action.setCheckable(True)
self.diffopts_button = create_toolbutton(text=N_("Options"), icon=options_icon(), tooltip=N_("Diff Options"))
self.diffopts_menu = create_menu(N_("Diff Options"), self.diffopts_button)
self.diffopts_menu.addAction(self.diff_ignore_space_at_eol_action)
self.diffopts_menu.addAction(self.diff_ignore_space_change_action)
self.diffopts_menu.addAction(self.diff_ignore_all_space_action)
self.diffopts_menu.addAction(self.diff_function_context_action)
self.diffopts_button.setMenu(self.diffopts_menu)
self.diffopts_button.setPopupMode(QtGui.QToolButton.InstantPopup)
titlebar = self.diffdockwidget.titleBarWidget()
titlebar.add_corner_widget(self.diffopts_button)
# All Actions
self.unstage_all_action = add_action(self, N_("Unstage All"), cmds.run(cmds.UnstageAll))
self.unstage_all_action.setIcon(qtutils.icon("remove.svg"))
self.unstage_selected_action = add_action(self, N_("Unstage From Commit"), cmds.run(cmds.UnstageSelected))
self.unstage_selected_action.setIcon(qtutils.icon("remove.svg"))
self.show_diffstat_action = add_action(self, N_("Diffstat"), cmds.run(cmds.Diffstat), "Alt+D")
self.stage_modified_action = add_action(
self, N_("Stage Changed Files To Commit"), cmds.run(cmds.StageModified), "Alt+A"
)
self.stage_modified_action.setIcon(qtutils.icon("add.svg"))
self.stage_untracked_action = add_action(
self, N_("Stage All Untracked"), cmds.run(cmds.StageUntracked), "Alt+U"
)
self.stage_untracked_action.setIcon(qtutils.icon("add.svg"))
self.apply_patches_action = add_action(self, N_("Apply Patches..."), apply_patches)
self.export_patches_action = add_action(self, N_("Export Patches..."), guicmds.export_patches, "Alt+E")
self.new_repository_action = add_action(self, N_("New Repository..."), guicmds.open_new_repo)
self.new_repository_action.setIcon(qtutils.new_icon())
self.preferences_action = add_action(
self, N_("Preferences"), self.preferences, QtGui.QKeySequence.Preferences, "Ctrl+O"
)
self.edit_remotes_action = add_action(self, N_("Edit Remotes..."), lambda: editremotes.edit().exec_())
self.rescan_action = add_action(self, cmds.Refresh.name(), cmds.run(cmds.Refresh), cmds.Refresh.SHORTCUT)
self.rescan_action.setIcon(qtutils.reload_icon())
self.browse_recently_modified_action = add_action(
self, N_("Recently Modified Files..."), browse_recent, "Shift+Ctrl+E"
)
self.cherry_pick_action = add_action(self, N_("Cherry-Pick..."), guicmds.cherry_pick, "Ctrl+P")
self.load_commitmsg_action = add_action(self, N_("Load Commit Message..."), guicmds.load_commitmsg)
self.save_tarball_action = add_action(self, N_("Save As Tarball/Zip..."), self.save_archive)
self.quit_action = add_action(self, N_("Quit"), self.close, "Ctrl+Q")
self.manage_bookmarks_action = add_action(self, N_("Bookmarks..."), manage_bookmarks)
self.grep_action = add_action(self, N_("Grep"), grep, "Ctrl+G")
self.merge_local_action = add_action(self, N_("Merge..."), merge.local_merge)
self.merge_abort_action = add_action(self, N_("Abort Merge..."), merge.abort_merge)
self.fetch_action = add_action(self, N_("Fetch..."), remote.fetch)
self.push_action = add_action(self, N_("Push..."), remote.push)
self.pull_action = add_action(self, N_("Pull..."), remote.pull)
self.open_repo_action = add_action(self, N_("Open..."), guicmds.open_repo)
self.open_repo_action.setIcon(qtutils.open_icon())
self.stash_action = add_action(self, N_("Stash..."), stash, "Alt+Shift+S")
self.clone_repo_action = add_action(self, N_("Clone..."), guicmds.clone_repo)
self.clone_repo_action.setIcon(qtutils.git_icon())
self.help_docs_action = add_action(
self, N_("Documentation"), resources.show_html_docs, QtGui.QKeySequence.HelpContents
)
self.help_shortcuts_action = add_action(self, N_("Keyboard Shortcuts"), show_shortcuts, QtCore.Qt.Key_Question)
self.visualize_current_action = add_action(
self, N_("Visualize Current Branch..."), cmds.run(cmds.VisualizeCurrent)
)
self.visualize_all_action = add_action(self, N_("Visualize All Branches..."), cmds.run(cmds.VisualizeAll))
self.search_commits_action = add_action(self, N_("Search..."), search)
self.browse_branch_action = add_action(self, N_("Browse Current Branch..."), guicmds.browse_current)
self.browse_other_branch_action = add_action(self, N_("Browse Other Branch..."), guicmds.browse_other)
self.load_commitmsg_template_action = add_action(
self, N_("Get Commit Message Template"), cmds.run(cmds.LoadCommitMessageFromTemplate)
)
self.help_about_action = add_action(self, N_("About"), launch_about_dialog)
self.diff_expression_action = add_action(self, N_("Expression..."), guicmds.diff_expression)
self.branch_compare_action = add_action(self, N_("Branches..."), compare_branches)
self.create_tag_action = add_action(self, N_("Create Tag..."), create_tag)
self.create_branch_action = add_action(self, N_("Create..."), create_new_branch, "Ctrl+B")
self.delete_branch_action = add_action(self, N_("Delete..."), guicmds.delete_branch)
self.delete_remote_branch_action = add_action(self, N_("Delete Remote Branch..."), guicmds.delete_remote_branch)
self.checkout_branch_action = add_action(self, N_("Checkout..."), guicmds.checkout_branch, "Alt+B")
self.branch_review_action = add_action(self, N_("Review..."), guicmds.review_branch)
self.browse_action = add_action(self, N_("Browser..."), worktree_browser)
self.browse_action.setIcon(qtutils.git_icon())
self.dag_action = add_action(self, N_("DAG..."), lambda: git_dag(self.model).show())
self.dag_action.setIcon(qtutils.git_icon())
self.rebase_start_action = add_action(self, N_("Start Interactive Rebase..."), self.rebase_start)
self.rebase_edit_todo_action = add_action(self, N_("Edit..."), self.rebase_edit_todo)
self.rebase_continue_action = add_action(self, N_("Continue"), self.rebase_continue)
self.rebase_skip_action = add_action(self, N_("Skip Current Patch"), self.rebase_skip)
self.rebase_abort_action = add_action(self, N_("Abort"), self.rebase_abort)
# Relayed actions
status_tree = self.statusdockwidget.widget().tree
self.addAction(status_tree.revert_unstaged_edits_action)
if not self.browser_dockable:
# These shortcuts conflict with those from the
# 'Browser' widget so don't register them when
# the browser is a dockable tool.
self.addAction(status_tree.up)
self.addAction(status_tree.down)
self.addAction(status_tree.process_selection)
self.lock_layout_action = add_action_bool(self, N_("Lock Layout"), self.set_lock_layout, False)
# Create the application menu
self.menubar = QtGui.QMenuBar(self)
# File Menu
self.file_menu = create_menu(N_("File"), self.menubar)
self.file_menu.addAction(self.open_repo_action)
self.open_recent_action = self.file_menu.addMenu(N_("Open Recent"))
self.open_recent_action.setIcon(qtutils.open_icon())
self.file_menu.addAction(self.clone_repo_action)
self.file_menu.addAction(self.new_repository_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.rescan_action)
self.file_menu.addAction(self.edit_remotes_action)
self.file_menu.addAction(self.browse_recently_modified_action)
self.file_menu.addAction(self.manage_bookmarks_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.load_commitmsg_action)
self.file_menu.addAction(self.load_commitmsg_template_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.apply_patches_action)
self.file_menu.addAction(self.export_patches_action)
self.file_menu.addAction(self.save_tarball_action)
self.file_menu.addSeparator()
self.file_menu.addAction(self.preferences_action)
self.file_menu.addAction(self.quit_action)
self.menubar.addAction(self.file_menu.menuAction())
# Actions menu
self.actions_menu = create_menu(N_("Actions"), self.menubar)
self.actions_menu.addAction(self.fetch_action)
self.actions_menu.addAction(self.push_action)
self.actions_menu.addAction(self.pull_action)
self.actions_menu.addAction(self.stash_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.create_tag_action)
self.actions_menu.addAction(self.cherry_pick_action)
self.actions_menu.addAction(self.merge_local_action)
self.actions_menu.addAction(self.merge_abort_action)
self.actions_menu.addSeparator()
self.actions_menu.addAction(self.grep_action)
self.actions_menu.addAction(self.search_commits_action)
self.menubar.addAction(self.actions_menu.menuAction())
# Index Menu
self.commit_menu = create_menu(N_("Index"), self.menubar)
self.commit_menu.setTitle(N_("Index"))
self.commit_menu.addAction(self.stage_modified_action)
self.commit_menu.addAction(self.stage_untracked_action)
self.commit_menu.addSeparator()
self.commit_menu.addAction(self.unstage_all_action)
self.commit_menu.addAction(self.unstage_selected_action)
self.menubar.addAction(self.commit_menu.menuAction())
# Diff Menu
self.diff_menu = create_menu(N_("Diff"), self.menubar)
self.diff_menu.addAction(self.diff_expression_action)
self.diff_menu.addAction(self.branch_compare_action)
self.diff_menu.addSeparator()
self.diff_menu.addAction(self.show_diffstat_action)
self.menubar.addAction(self.diff_menu.menuAction())
# Branch Menu
self.branch_menu = create_menu(N_("Branch"), self.menubar)
self.branch_menu.addAction(self.branch_review_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.create_branch_action)
self.branch_menu.addAction(self.checkout_branch_action)
self.branch_menu.addAction(self.delete_branch_action)
self.branch_menu.addAction(self.delete_remote_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.browse_branch_action)
self.branch_menu.addAction(self.browse_other_branch_action)
self.branch_menu.addSeparator()
self.branch_menu.addAction(self.visualize_current_action)
self.branch_menu.addAction(self.visualize_all_action)
self.menubar.addAction(self.branch_menu.menuAction())
# Rebase menu
self.rebase_menu = create_menu(N_("Rebase"), self.actions_menu)
self.rebase_menu.addAction(self.rebase_start_action)
self.rebase_menu.addAction(self.rebase_edit_todo_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_continue_action)
self.rebase_menu.addAction(self.rebase_skip_action)
self.rebase_menu.addSeparator()
self.rebase_menu.addAction(self.rebase_abort_action)
self.menubar.addAction(self.rebase_menu.menuAction())
# View Menu
self.view_menu = create_menu(N_("View"), self.menubar)
self.view_menu.addAction(self.browse_action)
self.view_menu.addAction(self.dag_action)
self.view_menu.addSeparator()
if self.browser_dockable:
self.view_menu.addAction(self.browserdockwidget.toggleViewAction())
self.setup_dockwidget_view_menu()
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
# Help Menu
self.help_menu = create_menu(N_("Help"), self.menubar)
self.help_menu.addAction(self.help_docs_action)
self.help_menu.addAction(self.help_shortcuts_action)
self.help_menu.addAction(self.help_about_action)
self.menubar.addAction(self.help_menu.menuAction())
# Set main menu
self.setMenuBar(self.menubar)
# Arrange dock widgets
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
bottom = Qt.BottomDockWidgetArea
self.addDockWidget(left, self.commitdockwidget)
if self.browser_dockable:
self.addDockWidget(left, self.browserdockwidget)
self.tabifyDockWidget(self.browserdockwidget, self.commitdockwidget)
self.addDockWidget(left, self.diffdockwidget)
self.addDockWidget(bottom, self.actionsdockwidget)
self.addDockWidget(bottom, self.logdockwidget)
self.tabifyDockWidget(self.actionsdockwidget, self.logdockwidget)
self.addDockWidget(right, self.statusdockwidget)
# Listen for model notifications
model.add_observer(model.message_updated, self._update)
model.add_observer(model.message_mode_changed, lambda x: self._update())
prefs_model.add_observer(prefs_model.message_config_updated, self._config_updated)
# Set a default value
self.show_cursor_position(1, 0)
self.connect(self.open_recent_action, SIGNAL("aboutToShow()"), self.build_recent_menu)
self.connect(self.commitmsgeditor, SIGNAL("cursorPosition(int,int)"), self.show_cursor_position)
self.connect(self, SIGNAL("update"), self._update_callback)
self.connect(self, SIGNAL("install_config_actions"), self._install_config_actions)
# Install .git-config-defined actions
self._config_task = None
self.install_config_actions()
# Restore saved settings
if not qtutils.apply_state(self):
self.set_initial_size()
self.statusdockwidget.widget().setFocus()
# Route command output here
Interaction.log_status = self.logwidget.log_status
Interaction.log = self.logwidget.log
Interaction.log(version.git_version_str() + "\n" + N_("git cola version %s") % version.version())
def toolbutton(self, text, tooltip, icon):
return qtutils.create_toolbutton(text=text, tooltip=tooltip, icon=icon)
def __init__(self, parent):
standard.Dialog.__init__(self, parent)
self.setAttribute(QtCore.Qt.WA_MacMetalStyle)
self.setWindowTitle(N_('Search'))
self.mode_combo = QtGui.QComboBox()
self.browse_button = create_toolbutton(icon=dir_icon(),
tooltip=N_('Browse...'))
self.query = QtGui.QLineEdit()
self.start_date = QtGui.QDateEdit()
self.start_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.start_date.setCalendarPopup(True)
self.start_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.end_date = QtGui.QDateEdit()
self.end_date.setCurrentSection(QtGui.QDateTimeEdit.YearSection)
self.end_date.setCalendarPopup(True)
self.end_date.setDisplayFormat(N_('yyyy-MM-dd'))
self.search_button = QtGui.QPushButton()
self.search_button.setText(N_('Search'))
self.search_button.setDefault(True)
self.max_count = QtGui.QSpinBox()
self.max_count.setMinimum(5)
self.max_count.setMaximum(9995)
self.max_count.setSingleStep(5)
self.max_count.setValue(500)
self.commit_list = QtGui.QListWidget()
self.commit_list.setMinimumSize(QtCore.QSize(1, 1))
self.commit_list.setAlternatingRowColors(True)
self.commit_list.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
self.commit_text = DiffTextEdit(self, whitespace=False)
self.button_export = QtGui.QPushButton()
self.button_export.setText(N_('Export Patches'))
self.button_cherrypick = QtGui.QPushButton()
self.button_cherrypick.setText(N_('Cherry Pick'))
self.button_close = QtGui.QPushButton()
self.button_close.setText(N_('Close'))
self.top_layout = QtGui.QHBoxLayout()
self.top_layout.setMargin(0)
self.top_layout.setSpacing(defs.button_spacing)
self.top_layout.addWidget(self.query)
self.top_layout.addWidget(self.start_date)
self.top_layout.addWidget(self.end_date)
self.top_layout.addWidget(self.browse_button)
self.top_layout.addWidget(self.search_button)
self.top_layout.addStretch()
self.top_layout.addWidget(self.mode_combo)
self.top_layout.addWidget(self.max_count)
self.splitter = QtGui.QSplitter()
self.splitter.setHandleWidth(defs.handle_width)
self.splitter.setOrientation(QtCore.Qt.Vertical)
self.splitter.setChildrenCollapsible(True)
self.splitter.addWidget(self.commit_list)
self.splitter.addWidget(self.commit_text)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setMargin(0)
self.bottom_layout.setSpacing(defs.spacing)
self.bottom_layout.addWidget(self.button_export)
self.bottom_layout.addWidget(self.button_cherrypick)
self.bottom_layout.addStretch()
self.bottom_layout.addWidget(self.button_close)
self.main_layout = QtGui.QVBoxLayout()
self.main_layout.setMargin(defs.margin)
self.main_layout.setSpacing(defs.spacing)
self.main_layout.addLayout(self.top_layout)
self.main_layout.addWidget(self.splitter)
self.main_layout.addLayout(self.bottom_layout)
self.setLayout(self.main_layout)
if self.parent():
self.resize(self.parent().width(), self.parent().height())
else:
self.resize(720, 500)
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 = core.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=icons.add(),
tooltip=N_('Add patches (+)'))
self.remove_button = qtutils.create_toolbutton(
text=N_('Remove'), icon=icons.remove(),
tooltip=N_('Remove selected (Delete)'))
self.apply_button = qtutils.create_button(
text=N_('Apply'), icon=icons.ok())
self.close_button = qtutils.close_button()
self.add_action = qtutils.add_action(self,
N_('Add'), self.add_files, hotkeys.ADD_ITEM)
self.remove_action = qtutils.add_action(self,
N_('Remove'), self.tree.remove_selected,
hotkeys.DELETE, hotkeys.BACKSPACE, hotkeys.REMOVE_ITEM)
self.top_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.add_button, self.remove_button,
qtutils.STRETCH, self.usage)
self.bottom_layout = qtutils.hbox(defs.no_margin, defs.button_spacing,
self.apply_button, qtutils.STRETCH,
self.close_button)
self.main_layout = qtutils.vbox(defs.margin, defs.spacing,
self.top_layout, self.tree,
self.bottom_layout)
self.setLayout(self.main_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 self.restore_state():
self.resize(666, 420)
def __init__(self, model, parent):
QtGui.QWidget.__init__(self, parent)
self.model = model
self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
self._textwidth = None
self._tabwidth = None
# Actions
self.signoff_action = qtutils.add_action(self, cmds.SignOff.name(),
cmds.run(cmds.SignOff),
cmds.SignOff.SHORTCUT)
self.signoff_action.setToolTip(N_('Sign off on this commit'))
self.commit_action = qtutils.add_action(self,
N_('Commit@@verb'),
self.commit,
cmds.Commit.SHORTCUT)
self.commit_action.setToolTip(N_('Commit staged changes'))
self.clear_action = qtutils.add_action(self, N_('Clear...'), self.clear)
# Widgets
self.summary = CommitSummaryLineEdit()
self.summary.setMinimumHeight(defs.tool_button_height)
self.summary.extra_actions.append(self.clear_action)
self.summary.extra_actions.append(None)
self.summary.extra_actions.append(self.signoff_action)
self.summary.extra_actions.append(self.commit_action)
self.description = CommitMessageTextEdit()
self.description.extra_actions.append(self.clear_action)
self.description.extra_actions.append(None)
self.description.extra_actions.append(self.signoff_action)
self.description.extra_actions.append(self.commit_action)
commit_button_tooltip = N_('Commit staged changes\n'
'Shortcut: Ctrl+Enter')
self.commit_button = qtutils.create_toolbutton(
text=N_('Commit@@verb'), tooltip=commit_button_tooltip,
icon=qtutils.save_icon())
self.actions_menu = QtGui.QMenu()
self.actions_button = qtutils.create_toolbutton(
icon=qtutils.options_icon(), tooltip=N_('Actions...'))
self.actions_button.setMenu(self.actions_menu)
self.actions_button.setPopupMode(QtGui.QToolButton.InstantPopup)
qtutils.hide_button_menu_indicator(self.actions_button)
self.actions_menu.addAction(self.signoff_action)
self.actions_menu.addAction(self.commit_action)
self.actions_menu.addSeparator()
# Amend checkbox
self.amend_action = self.actions_menu.addAction(
N_('Amend Last Commit'))
self.amend_action.setCheckable(True)
self.amend_action.setShortcut(cmds.AmendMode.SHORTCUT)
self.amend_action.setShortcutContext(Qt.ApplicationShortcut)
# Bypass hooks
self.bypass_commit_hooks_action = self.actions_menu.addAction(
N_('Bypass Commit Hooks'))
self.bypass_commit_hooks_action.setCheckable(True)
self.bypass_commit_hooks_action.setChecked(False)
# Sign commits
cfg = gitcfg.current()
self.sign_action = self.actions_menu.addAction(
N_('Create Signed Commit'))
self.sign_action.setCheckable(True)
self.sign_action.setChecked(cfg.get('cola.signcommits', False))
# Spell checker
self.check_spelling_action = self.actions_menu.addAction(
N_('Check Spelling'))
self.check_spelling_action.setCheckable(True)
self.check_spelling_action.setChecked(False)
# Line wrapping
self.autowrap_action = self.actions_menu.addAction(
N_('Auto-Wrap Lines'))
self.autowrap_action.setCheckable(True)
self.autowrap_action.setChecked(prefs.linebreak())
# Commit message
self.actions_menu.addSeparator()
self.load_commitmsg_menu = self.actions_menu.addMenu(
N_('Load Previous Commit Message'))
self.connect(self.load_commitmsg_menu, SIGNAL('aboutToShow()'),
self.build_commitmsg_menu)
self.fixup_commit_menu = self.actions_menu.addMenu(
N_('Fixup Previous Commit'))
self.connect(self.fixup_commit_menu, SIGNAL('aboutToShow()'),
self.build_fixup_menu)
self.toplayout = qtutils.hbox(defs.no_margin, defs.spacing,
self.actions_button, self.summary,
self.commit_button)
self.toplayout.setContentsMargins(defs.margin, defs.no_margin,
defs.no_margin, defs.no_margin)
self.mainlayout = qtutils.vbox(defs.no_margin, defs.spacing,
self.toplayout, self.description)
self.setLayout(self.mainlayout)
qtutils.connect_button(self.commit_button, self.commit)
# Broadcast the amend mode
qtutils.connect_action_bool(self.amend_action, cmds.run(cmds.AmendMode))
qtutils.connect_action_bool(self.check_spelling_action,
self.toggle_check_spelling)
# Handle the one-off autowrapping
qtutils.connect_action_bool(self.autowrap_action, self.set_linebreak)
qtutils.add_action(self.summary, N_('Move Down'),
self.focus_description,
Qt.Key_Return, Qt.Key_Enter)
qtutils.add_action(self.summary, N_('Move Down'),
self.summary_cursor_down,
Qt.Key_Down)
self.model.add_observer(self.model.message_commit_message_changed,
self.set_commit_message)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
self.connect(self.description, SIGNAL('cursorPosition(int,int)'),
# description starts at line 2
lambda row, col: self.emit_position(row + 2, col))
# Keep model informed of changes
self.connect(self.summary, SIGNAL('textChanged(QString)'),
self.commit_summary_changed)
self.connect(self.description, SIGNAL('textChanged()'),
self.commit_message_changed)
self.connect(self.description, SIGNAL('leave()'),
self.focus_summary)
self.setFont(qtutils.diff_font())
self.summary.enable_hint(True)
self.description.enable_hint(True)
self.commit_button.setEnabled(False)
self.commit_action.setEnabled(False)
self.setFocusProxy(self.summary)
self.set_tabwidth(prefs.tabwidth())
self.set_textwidth(prefs.textwidth())
self.set_linebreak(prefs.linebreak())
# Loading message
commit_msg = ''
commit_msg_path = commit_message_path()
if commit_msg_path:
commit_msg = core.read(commit_msg_path)
self.set_commit_message(commit_msg)
# Allow tab to jump from the summary to the description
self.setTabOrder(self.summary, self.description)
def __init__(self, parent=None):
QtGui.QDialog.__init__(self, parent)
self.setWindowTitle(N_('Edit Remotes'))
if parent is not None:
self.setWindowModality(Qt.WindowModal)
width = max(640, parent.width())
height = max(480, parent.height())
self.resize(width, height)
else:
self.resize(720, 300)
self.default_hint = N_(
''
'Add and remove remote repositories using the \n'
'Add(+) and Delete(-) buttons on the left-hand side.\n'
'\n'
'Remotes can be renamed by selecting one from the list\n'
'and pressing "enter", or by double-clicking.')
self.remote_list = []
self.remotes = QtGui.QListWidget()
self.remotes.setToolTip(
N_('Remote git repositories - double-click to rename'))
self.info = text.HintedTextView(self.default_hint, self)
font = self.info.font()
metrics = QtGui.QFontMetrics(font)
width = metrics.width('_' * 42)
height = metrics.height() * 13
self.info.setMinimumWidth(width)
self.info.setMinimumHeight(height)
self.info_thread = RemoteInfoThread(self)
icon = icons.add()
tooltip = N_('Add new remote git repository')
self.add_btn = qtutils.create_toolbutton(icon=icon, tooltip=tooltip)
self.refresh_btn = qtutils.create_toolbutton(icon=icons.sync(),
tooltip=N_('Refresh'))
self.delete_btn = qtutils.create_toolbutton(
icon=icons.remove(), tooltip=N_('Delete remote'))
self.close_btn = qtutils.close_button()
self._top_layout = qtutils.splitter(Qt.Horizontal, self.remotes,
self.info)
width = self._top_layout.width()
self._top_layout.setSizes([width // 4, width * 3 // 4])
self._button_layout = qtutils.hbox(defs.margin, defs.spacing,
self.add_btn, self.delete_btn,
self.refresh_btn, qtutils.STRETCH,
self.close_btn)
self._layout = qtutils.vbox(defs.margin, defs.spacing,
self._top_layout, self._button_layout)
self.setLayout(self._layout)
self.refresh()
qtutils.connect_button(self.add_btn, self.add)
qtutils.connect_button(self.delete_btn, self.delete)
qtutils.connect_button(self.refresh_btn, self.refresh)
qtutils.connect_button(self.close_btn, self.close)
self.connect(self.info_thread, SIGNAL('info(PyQt_PyObject)'),
self.info.set_value, Qt.QueuedConnection)
self.connect(self.remotes, SIGNAL('itemChanged(QListWidgetItem*)'),
self.remote_renamed)
self.connect(self.remotes, SIGNAL('itemSelectionChanged()'),
self.selection_changed)
def __init__(self, model, parent=None):
Dialog.__init__(self, parent=parent)
self.model = model
self.stashes = []
self.revids = []
self.names = []
self.setWindowTitle(N_('Stash'))
self.setAttribute(QtCore.Qt.WA_MacMetalStyle)
if parent is not None:
self.setWindowModality(QtCore.Qt.WindowModal)
self.resize(parent.width(), 420)
else:
self.resize(700, 420)
self.stash_list = QtGui.QListWidget(self)
self.stash_text = DiffTextEdit(self)
self.button_apply = qtutils.create_toolbutton(
text=N_('Apply'),
tooltip=N_('Apply the selected stash'),
icon=icons.ok())
self.button_save = qtutils.create_toolbutton(
text=N_('Save'),
tooltip=N_('Save modified state to new stash'),
icon=icons.save())
self.button_drop = qtutils.create_toolbutton(
text=N_('Drop'),
tooltip=N_('Drop the selected stash'),
icon=icons.discard())
self.button_close = qtutils.close_button()
self.keep_index = qtutils.checkbox(text=N_('Keep Index'), checked=True)
# Arrange layouts
self.splitter = qtutils.splitter(Qt.Horizontal,
self.stash_list, self.stash_text)
self.btn_layt = qtutils.hbox(defs.no_margin, defs.spacing,
self.button_save, self.button_apply,
self.button_drop, self.keep_index,
qtutils.STRETCH, self.button_close)
self.main_layt = qtutils.vbox(defs.margin, defs.spacing,
self.splitter, self.btn_layt)
self.setLayout(self.main_layt)
self.splitter.setSizes([self.width()//3, self.width()*2//3])
self.update_from_model()
self.update_actions()
self.setTabOrder(self.button_save, self.button_apply)
self.setTabOrder(self.button_apply, self.button_drop)
self.setTabOrder(self.button_drop, self.keep_index)
self.setTabOrder(self.keep_index, self.button_close)
self.connect(self.stash_list, SIGNAL('itemSelectionChanged()'),
self.item_selected)
qtutils.connect_button(self.button_apply, self.stash_apply)
qtutils.connect_button(self.button_save, self.stash_save)
qtutils.connect_button(self.button_drop, self.stash_drop)
qtutils.connect_button(self.button_close, self.close)
