[gitg/wip/guyou/path-filtering: 118/119] Merge commit 'v0.0.4' into path-filtering
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/guyou/path-filtering: 118/119] Merge commit 'v0.0.4' into path-filtering
- Date: Mon, 7 Jan 2019 11:45:53 +0000 (UTC)
commit f3026f2ab48171c02db2f8519f80761a82660298
Merge: 016dd27a 006eda48
Author: Guilhem Bonnefille <guilhem bonnefille gmail com>
Date: Sun Oct 11 21:23:37 2009 +0200
Merge commit 'v0.0.4' into path-filtering
AUTHORS | 2 +-
NEWS | 16 +
README | 11 +-
configure.ac | 2 +-
data/gitg.schemas.in | 27 +
data/gitgdiff.lang | 2 +-
gitg.doap | 24 +
gitg/Makefile.am | 16 +-
gitg/gitg-branch-actions.c | 1485 ++++++++++++++++++++++++++++++++++++++++
gitg/gitg-branch-actions.h | 47 ++
gitg/gitg-cell-renderer-path.c | 35 +
gitg/gitg-cell-renderer-path.h | 4 +
gitg/gitg-commit-menu.ui | 41 ++
gitg/gitg-commit-view.c | 72 +-
gitg/gitg-commit-view.h | 4 +-
gitg/gitg-commit.c | 169 ++++-
gitg/gitg-commit.h | 4 +-
gitg/gitg-config.c | 360 ++++++++++
gitg/gitg-config.h | 42 ++
gitg/gitg-diff-view.c | 9 +-
gitg/gitg-dnd.c | 538 +++++++++++++++
gitg/gitg-dnd.h | 17 +
gitg/gitg-label-renderer.c | 248 +++++--
gitg/gitg-label-renderer.h | 5 +
gitg/gitg-menus.xml | 93 +++
gitg/gitg-preferences-dialog.c | 75 +-
gitg/gitg-preferences.c | 59 +-
gitg/gitg-preferences.ui | 507 ++++++++++++++
gitg/gitg-preferences.xml | 264 -------
gitg/gitg-ref.c | 142 +++-
gitg/gitg-ref.h | 56 +-
gitg/gitg-repository-dialog.c | 774 +++++++++++++++++++++
gitg/gitg-repository-dialog.h | 40 ++
gitg/gitg-repository.c | 314 +++++++--
gitg/gitg-repository.h | 3 +
gitg/gitg-repository.ui | 313 +++++++++
gitg/gitg-revision-view.c | 33 +-
gitg/gitg-runner.c | 119 +++-
gitg/gitg-runner.h | 3 +
gitg/gitg-settings.h | 7 +-
gitg/gitg-spinner.c | 794 +++++++++++++++++++++
gitg/gitg-spinner.h | 99 +++
gitg/gitg-tag.ui | 158 +++++
gitg/gitg-ui.xml | 836 +---------------------
gitg/gitg-utils.c | 101 +++
gitg/gitg-utils.h | 3 +
gitg/gitg-window.c | 1192 ++++++++++++++++++++++++++++----
gitg/gitg-window.h | 2 +
gitg/gitg-window.ui | 905 ++++++++++++++++++++++++
gitg/gitg.c | 6 +-
po/LINGUAS | 3 +
po/Makefile.in.in | 4 +-
po/POTFILES.in | 10 +-
po/da.po | 807 ++++++++++++++++++++++
po/es.po | 794 +++++++++++++++++++++
po/fr.po | 701 +++++++++++++++----
po/gitg.pot | 638 ++++++++++++++---
po/gl.po | 701 +++++++++++++++----
po/nl.po | 713 +++++++++++++++----
po/pa.po | 798 +++++++++++++++++++++
po/sv.po | 707 +++++++++++++++----
61 files changed, 13979 insertions(+), 1975 deletions(-)
---
diff --cc gitg/gitg-ui.xml
index 03f45322,7bfc35f7..6e7ec28c
--- a/gitg/gitg-ui.xml
+++ b/gitg/gitg-ui.xml
@@@ -167,823 -169,8 +179,11 @@@
<popup name="popup_commit_unstage">
<menuitem action="UnstageChangesAction"/>
</popup>
+ <popup name="popup_file_tree">
+ <menuitem action="FilterOnPathAction"/>
+ </popup>
</ui>
</object>
- <object class="GtkAdjustment" id="adjustment_context">
- <property name="lower">1</property>
- <property name="upper">10</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- <property name="page_size">1</property>
- <property name="value">3</property>
- </object>
- <object class="GitgWindow" id="window">
- <property name="title" translatable="yes">gitg</property>
- <property name="default_width">800</property>
- <property name="default_height">800</property>
- <property name="visible">False</property>
- <signal name="set-focus" handler="on_window_set_focus"/>
- <signal name="window-state-event" handler="on_window_state_event"/>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <child>
- <object class="GtkMenuBar" id="menubar_main" constructor="uiman">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="notebook_main">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkVBox" id="vbox_history">
- <property name="visible">True</property>
- <child>
- <object class="GtkVPaned" id="vpaned_main">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">350</property>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox_top">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="label_branches">
- <property name="label" translatable="yes">Branch:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combo_box_branches">
- <child>
- <object class="GtkCellRendererText" id="branches_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_path">
- <property name="label" translatable="yes">Path:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_path">
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="tree_view_rv">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_clickable">True</property>
- <property name="rules_hint">True</property>
- <property name="search_column">1</property>
- <property name="fixed_height_mode">True</property>
- <child>
- <object class="GtkTreeViewColumn" id="rv_column_subject">
- <property name="title" translatable="yes">Subject</property>
- <property name="fixed-width">400</property>
- <property name="sizing">fixed</property>
- <property name="resizable">True</property>
- <property name="expand">True</property>
- <child>
- <object class="GitgCellRendererPath" id="rv_renderer_subject"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="rv_column2">
- <property name="title" translatable="yes">Author</property>
- <property name="fixed-width">200</property>
- <property name="sizing">fixed</property>
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText" id="rv_renderer_author"/>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="rv_column3">
- <property name="title" translatable="yes">Date</property>
- <property name="fixed-width">200</property>
- <property name="sizing">fixed</property>
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText" id="rv_renderer_date"/>
- <attributes>
- <attribute name="text">3</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="notebook">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GitgRevisionView" id="revision_view">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkTable" id="table_parents">
- <property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">3</property>
- <property name="row_spacing">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_subject">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_date">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_author">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_sha">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_parent_lbl">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Parent:</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_subject_lbl">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Subject:</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_date_lbl">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Date:</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_author_lbl">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Author:</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_sha_lbl">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">SHA:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHPaned" id="hpaned_revision_view">
- <property name="visible">True</property>
- <property name="position">200</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_revision_files">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="tree_view_revision_files">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child>
- <object class="GtkTreeViewColumn" id="revision_files_column_icon">
- <property name="title" translatable="no">Icon</property>
- <property name="resizable">False</property>
- <property name="fixed-width">20</property>
- <property name="sizing">fixed</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="revision_files_cell_renderer_icon"/>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="revision_files_column_name">
- <property name="title" translatable="no">Filename</property>
- <property name="resizable">False</property>
- <child>
- <object class="GtkCellRendererText"
id="revision_files_cell_renderer_name"/>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_details">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GitgDiffView" id="revision_diff">
- <property name="tab-width">4</property>
- <property name="editable">False</property>
- <property name="cursor-visible">False</property>
- <property name="diff-enabled">True</property>
- <property name="show-line-numbers">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Details</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GitgRevisionTreeView" id="revision_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="revision_tree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers-visible">False</property>
- <child>
- <object class="GtkTreeViewColumn" id="revision_tree_column">
- <property name="title" translatable="yes">Filename</property>
- <child>
- <object class="GtkCellRendererPixbuf" id="renderer_icon"/>
- <attributes>
- <attribute name="pixbuf">0</attribute>
- </attributes>
- </child>
- <child>
- <object class="GtkCellRendererText" id="renderer_date"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_tree_contents">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkSourceView" id="revision_tree_contents">
- <property name="editable">False</property>
- <property name="show-line-numbers">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tree</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_history">
- <property name="visible">True</property>
- <property name="label" translatable="yes">History</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GitgCommitView" id="hpaned_commit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
- <child>
- <object class="GtkVBox" id="vbox_staging">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="label_unstaged">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Unstaged</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tree_view_unstaged</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_unstaged">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="tree_view_unstaged">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child>
- <object class="GtkTreeViewColumn" id="unstaged_column_icon">
- <property name="title" translatable="no"></property>
- <property name="resizable">False</property>
- <property name="fixed-width">20</property>
- <property name="sizing">fixed</property>
- <child>
- <object class="GtkCellRendererPixbuf" id="unstaged_cell_renderer_icon"/>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="unstaged_column_name">
- <property name="title" translatable="yes">Unstaged</property>
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText" id="unstaged_cell_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_staged">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Staged</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tree_view_staged</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_staged">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="tree_view_staged">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child>
- <object class="GtkTreeViewColumn" id="staged_column_icon">
- <property name="title" translatable="no"></property>
- <property name="resizable">False</property>
- <property name="fixed-width">20</property>
- <property name="sizing">fixed</property>
- <child>
- <object class="GtkCellRendererPixbuf" id="staged_cell_renderer_icon"/>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="staged_column_name">
- <property name="title" translatable="no"></property>
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText" id="staged_cell_renderer_name"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkVPaned" id="vpaned_commit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">450</property>
- <child>
- <object class="GtkVBox" id="vbox_changes">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkHBox" id="hbox_changes">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="label_changes">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Changes</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">source_view_changes</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="hscale_context">
- <property name="value-pos">right</property>
- <property name="digits">0</property>
- <property name="adjustment">adjustment_context</property>
- <property name="width-request">200</property>
- <property name="sensitive">False</property>
- <property name="show-fill-level">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_context">
- <property name="label" translatable="yes">Context:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack-type">end</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_changes">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GitgDiffView" id="source_view_changes">
- <property name="tab-width">4</property>
- <property name="editable">False</property>
- <property name="cursor-visible">False</property>
- <property name="show-line-numbers">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox_comment">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="label_comment">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">Co_mmit message</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">text_view_comment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_comment">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTextView" id="text_view_comment">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="wrap_mode">word-char</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_commit">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkButton" id="button_commit">
- <property name="label" translatable="yes">Commit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_commit</property>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="pack-type">end</property>
- <property name="expand">false</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check_button_signed_off_by">
- <property name="visible">true</property>
- <property name="label" translatable="yes">Add signed-off-by</property>
- </object>
- <packing>
- <property name="pack-type">start</property>
- <property name="expand">false</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_commit">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Commit</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkStatusbar" id="statusbar">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
</interface>
<!-- vi:ts=2:et -->
diff --cc gitg/gitg-window.c
index da3d7437,5f63e66f..aee751cf
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@@ -57,10 -70,12 +70,13 @@@ struct _GitgWindowPrivat
GitgCommitView *commit_view;
GtkWidget *search_popup;
GtkComboBox *combo_branches;
+ GtkEntry *entry_path;
+ GtkUIManager *menus_ui_manager;
+
GtkWidget *vpaned_main;
- GtkWidget *hpaned_commit;
+ GtkWidget *hpaned_commit1;
+ GtkWidget *hpaned_commit2;
GtkWidget *vpaned_commit;
GtkActionGroup *edit_group;
@@@ -315,64 -368,42 +369,80 @@@ branches_separator_func(GtkTreeModel *m
}
static void
-on_branches_combo_changed(GtkComboBox *combo, GitgWindow *window)
+filter_repository(GitgWindow *window)
{
- if (gtk_combo_box_get_active(combo) < 2)
- return;
-
- gchar *name;
+ gchar **args;
+ const gchar *path;
+ int argc = 0;
+
+ args = g_new(gchar*, 4);
+
- if (gtk_combo_box_get_active(window->priv->combo_branches) >= 2)
- {
- gchar *name;
- GtkTreeIter iter;
- GtkTreeIter next;
++ gchar *name = NULL;
+ GtkTreeIter iter;
+ GtkTreeIter next;
++ GtkComboBox *combo = window->priv->combo_branches;
- gtk_combo_box_get_active_iter(window->priv->combo_branches, &iter);
- next = iter;
+ gtk_combo_box_get_active_iter(combo, &iter);
+ next = iter;
- if (!gtk_tree_model_iter_next(gtk_combo_box_get_model(window->priv->combo_branches), &next))
- name = g_strdup("--all");
- else
- gtk_tree_model_get(gtk_combo_box_get_model(window->priv->combo_branches), &iter, 0,
&name, -1);
+ if (!gtk_tree_model_iter_next(gtk_combo_box_get_model(combo), &next))
+ {
+ name = g_strdup("--all");
+ }
+ else
+ {
+ GitgRef *ref;
- args[argc++] = name;
+ gtk_tree_model_get(gtk_combo_box_get_model(combo),
+ &iter,
+ COLUMN_BRANCHES_REF, &ref,
+ -1);
+
+ if (ref == NULL)
+ {
+ return;
+ }
+
+ name = g_strdup(gitg_ref_get_name(ref));
+ gitg_ref_free(ref);
}
- gitg_repository_load(window->priv->repository, 1, (gchar const **)&name, NULL);
- g_free(name);
++ if (name)
++ args[argc++] = name;
++
+ path = gtk_entry_get_text(window->priv->entry_path);
+ if (path)
+ {
+ args[argc++] = g_strdup("--");
+ args[argc++] = g_strdup(path);
+ }
+
+ gitg_repository_load(window->priv->repository, argc, (gchar const **)args, NULL);
+ /*g_strfreev(args);*/
+}
+
+static void
+on_path_activate(GtkEntry *entry, GitgWindow *window)
+{
+ filter_repository(window);
+}
+
+static void
+on_path_activated(GitgRevisionTreeView *view, gchar *path, GitgWindow *window)
+{
+ /* Set the path in the widget */
+ if (path == NULL)
+ path = "";
+ gtk_entry_set_text(window->priv->entry_path, path);
+
+ /* Fire the filtering */
+ filter_repository(window);
+}
+
+static void
+on_branches_combo_changed(GtkComboBox *combo, GitgWindow *window)
+{
+ filter_repository(window);
}
static void
@@@ -442,24 -608,12 +647,14 @@@ gitg_window_parser_finished(GtkBuildabl
window->priv->statusbar = GTK_STATUSBAR(gtk_builder_get_object(builder, "statusbar"));
window->priv->revision_view = GITG_REVISION_VIEW(gtk_builder_get_object(builder, "revision_view"));
window->priv->revision_tree_view = GITG_REVISION_TREE_VIEW(gtk_builder_get_object(builder,
"revision_tree_view"));
- window->priv->commit_view = GITG_COMMIT_VIEW(gtk_builder_get_object(builder, "vpaned_commit"));
++
+ window->priv->commit_view = GITG_COMMIT_VIEW(gtk_builder_get_object(builder, "hpaned_commit"));
+ window->priv->entry_path = GTK_ENTRY(gtk_builder_get_object(builder, "entry_path"));
restore_state(window);
-
- window->priv->edit_group = GTK_ACTION_GROUP(gtk_builder_get_object(builder,
"action_group_menu_edit"));
-
- GtkTreeViewColumn *col = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder, "rv_column_subject"));
- window->priv->renderer_path = GITG_CELL_RENDERER_PATH(gtk_builder_get_object(builder,
"rv_renderer_subject"));
- gtk_tree_view_column_set_cell_data_func(col, GTK_CELL_RENDERER(window->priv->renderer_path),
(GtkTreeCellDataFunc)on_renderer_path, window, NULL);
+ init_tree_view (window, builder);
- GtkRecentFilter *filter = gtk_recent_filter_new();
- gtk_recent_filter_add_group(filter, "gitg");
-
- GtkRecentChooser *chooser = GTK_RECENT_CHOOSER(gtk_builder_get_object(builder, "RecentOpenAction"));
- gtk_recent_chooser_add_filter(chooser, filter);
-
// Intialize branches
build_branches_combo(window, builder);
diff --cc gitg/gitg-window.ui
index 00000000,125a3b60..87ad549d
mode 000000,100644..100644
--- a/gitg/gitg-window.ui
+++ b/gitg/gitg-window.ui
@@@ -1,0 -1,890 +1,905 @@@
+ <?xml version="1.0"?>
+ <interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gitg 0.2 -->
+ <!-- interface-requires sourceview2 0.0 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAdjustment" id="adjustment_context">
+ <property name="value">3</property>
+ <property name="lower">1</property>
+ <property name="upper">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ <property name="page_size">1</property>
+ </object>
+ <object class="GitgWindow" id="window">
+ <property name="title" translatable="yes">gitg</property>
+ <property name="default_width">800</property>
+ <property name="default_height">800</property>
+ <signal name="set_focus" handler="on_window_set_focus"/>
+ <signal name="window_state_event" handler="on_window_state_event"/>
+ <child>
+ <object class="GtkVBox" id="vbox_main">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkNotebook" id="notebook_main">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox_history">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVPaned" id="vpaned_main">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">350</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox_top">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label_branches">
+ <property name="label" translatable="yes">Branch:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combo_box_branches">
+ <child>
+ <object class="GtkCellRendererPixbuf" id="branches_renderer_icon"/>
+ <attributes>
+ <attribute name="stock-id">2</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText" id="branches_renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkLabel" id="label_path">
++ <property name="label" translatable="yes">Path:</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry" id="entry_path">
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="tree_view_rv">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ <property name="search_column">1</property>
+ <property name="fixed_height_mode">True</property>
+ <signal name="button_press_event"
handler="on_tree_view_rv_button_press_event"/>
+ <child>
+ <object class="GtkTreeViewColumn" id="rv_column_subject">
+ <property name="resizable">True</property>
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">400</property>
+ <property name="title">Subject</property>
+ <property name="expand">True</property>
+ <child>
+ <object class="GitgCellRendererPath" id="rv_renderer_subject"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="rv_column2">
+ <property name="resizable">True</property>
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">200</property>
+ <property name="title">Author</property>
+ <child>
+ <object class="GtkCellRendererText" id="rv_renderer_author"/>
+ <attributes>
+ <attribute name="text">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="rv_column3">
+ <property name="resizable">True</property>
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">200</property>
+ <property name="title">Date</property>
+ <child>
+ <object class="GtkCellRendererText" id="rv_renderer_date"/>
+ <attributes>
+ <attribute name="text">3</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <child>
+ <object class="GitgRevisionView" id="revision_view">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkTable" id="table_parents">
+ <property name="visible">True</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_subject">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_date">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_author">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_sha">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_parent_lbl">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Parent:</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_subject_lbl">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Subject:</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_date_lbl">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Date:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_author_lbl">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Author:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_sha_lbl">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">SHA:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHPaned" id="hpaned_revision_view">
+ <property name="visible">True</property>
+ <property name="position">200</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_revision_files">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="tree_view_revision_files">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="revision_files_column_icon">
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">20</property>
+ <property name="title">Icon</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="revision_files_cell_renderer_icon"/>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="revision_files_column_name">
+ <property name="title">Filename</property>
+ <child>
+ <object class="GtkCellRendererText"
id="revision_files_cell_renderer_name"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_details">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GitgDiffView" id="revision_diff">
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ <property name="show_line_numbers">True</property>
+ <property name="tab_width">4</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_details">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Details</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GitgRevisionTreeView" id="revision_tree_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">200</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_revision_tree">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="revision_tree">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="revision_tree_column">
+ <property name="title">Filename</property>
+ <child>
+ <object class="GtkCellRendererPixbuf" id="renderer_icon"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText" id="renderer_date"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_tree_contents">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkSourceView" id="revision_tree_contents">
+ <property name="editable">False</property>
+ <property name="show_line_numbers">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_tree">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Tree</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_history">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">History</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GitgCommitView" id="vpaned_commit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="position">450</property>
+ <property name="position_set">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox_changes">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkHBox" id="hbox_changes">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label_changes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Changes</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">source_view_changes</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_context">
+ <property name="label" translatable="yes">Context:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHScale" id="hscale_context">
+ <property name="width_request">200</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment_context</property>
+ <property name="digits">0</property>
+ <property name="value_pos">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_changes">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GitgDiffView" id="source_view_changes">
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="left_margin">2</property>
+ <property name="right_margin">2</property>
+ <property name="cursor_visible">False</property>
+ <property name="show_line_numbers">True</property>
+ <property name="tab_width">4</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHPaned" id="hpaned_commit1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox_unstaged">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label_unstaged">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Unstaged</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tree_view_unstaged</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_unstaged">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="tree_view_unstaged">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="unstaged_column_icon">
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">20</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="unstaged_cell_renderer_icon"/>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="unstaged_column_name">
+ <property name="resizable">True</property>
+ <property name="title">Unstaged</property>
+ <child>
+ <object class="GtkCellRendererText" id="unstaged_cell_renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHPaned" id="hpaned_commit2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox_comment">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label_comment">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">Co_mmit message</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">text_view_comment</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_comment">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkSourceView" id="text_view_comment">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="left_margin">2</property>
+ <property name="right_margin">2</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_commit">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="check_button_amend">
+ <property name="label" translatable="yes">Amend</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check_button_signed_off_by">
+ <property name="label" translatable="yes">Add
signed-off-by</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="yalign">1</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkButton" id="button_commit">
+ <property name="label" translatable="yes">Commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image_commit</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_staged">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label_staged">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Staged</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tree_view_staged</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_staged">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="tree_view_staged">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="staged_column_icon">
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">20</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="staged_cell_renderer_icon"/>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="staged_column_name">
+ <property name="resizable">True</property>
+ <child>
+ <object class="GtkCellRendererText"
id="staged_cell_renderer_name"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_commit">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Commit</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStatusbar" id="statusbar">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkImage" id="image_commit">
+ <property name="visible">True</property>
+ <property name="stock">gtk-apply</property>
+ </object>
+ </interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
