[anjuta] Git: Move to gtkbuilder
- From: James Liggett <jrliggett src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjuta] Git: Move to gtkbuilder
- Date: Mon, 18 May 2009 18:11:25 -0400 (EDT)
commit 1c109d88b6cc00b08f3cf5b5d43717f9819ef080
Author: James Liggett <jrliggett cox net>
Date: Mon May 18 15:07:04 2009 -0700
Git: Move to gtkbuilder
---
plugins/git/Makefile.am | 4 +-
plugins/git/anjuta-git.ui | 4439 +++++++++++++++++++++++++-
plugins/git/anjuta-git.xml | 108 +
plugins/git/git-add-dialog.c | 28 +-
plugins/git/git-add-remote-dialog.c | 35 +-
plugins/git/git-apply-mailbox-dialog.c | 27 +-
plugins/git/git-bisect-dialog.c | 43 +-
plugins/git/git-branch-combo-model.c | 6 +-
plugins/git/git-branch-combo-model.h | 4 +-
plugins/git/git-checkout-files-dialog.c | 28 +-
plugins/git/git-commit-dialog.c | 57 +-
plugins/git/git-create-branch-dialog.c | 51 +-
plugins/git/git-create-patch-series-dialog.c | 42 +-
plugins/git/git-create-tag-dialog.c | 67 +-
plugins/git/git-delete-branch-dialog.c | 27 +-
plugins/git/git-delete-remote-dialog.c | 34 +-
plugins/git/git-ignore-dialog.c | 28 +-
plugins/git/git-log-dialog.c | 170 +-
plugins/git/git-merge-dialog.c | 42 +-
plugins/git/git-pull-dialog.c | 60 +-
plugins/git/git-push-dialog.c | 37 +-
plugins/git/git-rebase-dialog.c | 34 +-
plugins/git/git-remove-dialog.c | 29 +-
plugins/git/git-reset-dialog.c | 51 +-
plugins/git/git-resolve-dialog.c | 32 +-
plugins/git/git-revert-dialog.c | 30 +-
plugins/git/git-switch-dialog.c | 24 +-
plugins/git/git-ui-utils.c | 6 +-
plugins/git/git-ui-utils.h | 4 +-
plugins/git/git-unstage-dialog.c | 31 +-
plugins/git/plugin.c | 2 +-
plugins/git/plugin.h | 2 +-
32 files changed, 5112 insertions(+), 470 deletions(-)
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 7d6b322..f58bbfc 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -2,11 +2,11 @@
# Plugin glade file
git_gladedir = $(anjuta_glade_dir)
-git_glade_DATA = anjuta-git.glade
+git_glade_DATA = anjuta-git.ui
# Plugin UI file
git_uidir = $(anjuta_ui_dir)
-git_ui_DATA = anjuta-git.ui
+git_ui_DATA = anjuta-git.xml
# Plugin Icon file
git_pixmapsdir = $(anjuta_image_dir)
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index cab203e..9da6dd3 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -1,108 +1,4331 @@
-<!--*- xml -*-->
-<ui>
- <menubar name="MenuMain">
- <placeholder name="PlaceHolderVersionControlMenus">
- <menu name="MenuGit" action="ActionMenuGit">
- <placeholder name="PlaceholderGitMenus">
- <menuitem name="Commit..." action="ActionGitCommit" />
- <menuitem name="Fetch" action="ActionGitFetch" />
- <placeholder name="PlaceholderRebaseMenu">
- <menu name="Rebase" action="ActionMenuGitRebase">
- <menuitem name="Start..." action="ActionGitRebaseStart" />
- <separator name="rebase_separator1" />
- <menuitem name="Continue" action="ActionGitRebaseContinue" />
- <menuitem name="Skip" action="ActionGitRebaseSkip" />
- <menuitem name="Abort" action="ActionGitRebaseAbort" />
- </menu>
- </placeholder>
- <menuitem name="Push..." action="ActionGitPush" />
- <menuitem name="Pull..." action="ActionGitPull" />
- <menuitem name="Diff uncommitted changes" action="ActionGitDiffUncommitted" />
- <separator />
- <menuitem name="Add..." action="ActionGitAdd" />
- <menuitem name="Remove..." action="ActionGitRemove" />
- <menuitem name="Ignore..." action="ActionGitIgnore" />
- <separator />
- <menuitem name="Check out files..." action="ActionGitCheckoutFiles" />
- <menuitem name="Unstage files..." action="ActionGitUnstageFiles" />
- <menuitem name="Resolve conflicts..." action="ActionGitResolve" />
- <separator />
- <placeholder name="PlaceholderPatchMenu">
- <menu name="Patches" action="ActionMenuGitPatches">
- <menuitem name="Create patch series..." action="ActionGitCreatePatchSeries" />
- <placeholder name="PlaceholderApplyMailboxMenu">
- <menu name="Apply from mailbox files" action="ActionMenuGitApplyMailboxFiles">
- <menuitem name="Apply" action="ActionGitApplyMailboxApply" />
- <separator />
- <menuitem name="Continue with resolved conflicts" action="ActionGitApplyMailboxContinue" />
- <menuitem name="Skip current patch" action="ActionGitApplyMailboxSkip" />
- <menuitem name="Abort" action="ActionGitApplyMailboxAbort" />
- </menu>
- </placeholder>
- </menu>
- </placeholder>
- <separator />
- <placeholder name="PlaceholderBranches">
- <menu name="BranchesMenu" action="ActionMenuGitBranches">
- <menuitem name="Create branch..." action="ActionGitCreateBranch" />
- <menuitem name="Delete branch..." action="ActionGitDeleteBranch" />
- <menuitem name="Switch to another branch..." action="ActionGitSwitch" />
- <menuitem name="Merge..." action="ActionGitMerge" />
- <placeholder name="PlaceholderRemoteMenu">
- <menu name="Remote branches" action="ActionMenuGitRemoteBranches">
- <menuitem name="Add..." action="ActionGitRemoteAdd" />
- <menuitem name="Delete..." action="ActionGitRemoteDelete" />
- </menu>
- </placeholder>
- </menu>
- </placeholder>
- <separator />
- <menuitem name="Create tag..." action="ActionGitCreateTag" />
- <separator />
- <menuitem name="Reset tree..." action="ActionGitReset" />
- <menuitem name="Revert commit..." action="ActionGitRevert" />
- <separator />
- <placeholder name="PlaceholderBisectMenu">
- <menu name="Bisect" action="ActionMenuGitBisect">
- <menuitem name="Start..." action="ActionGitBisectStart" />
- <menuitem name="Reset" action="ActionGitBisectReset" />
- <separator name="bisect_separator1" />
- <menuitem name="Good" action="ActionGitBisectGood" />
- <menuitem name="Bad" action="ActionGitBisectBad" />
- </menu>
- </placeholder>
- <separator />
- <menuitem name="View log..." action="ActionGitLog" />
- </placeholder>
- </menu>
- </placeholder>
- </menubar>
-
- <popup name="PopupLog">
- <menuitem name="Commit diff" action="ActionGitLogCommitDiff" />
- <menuitem name="View Selected Revision" action="ActionGitLogViewRevision" />
- <separator />
- <menuitem name="Create branch..." action="ActionGitLogCreateBranch" />
- <menuitem name="Create tag..." action="ActionGitLogCreateTag" />
- <separator name ="log_separator2" />
- <menuitem name="Reset tree..." action="ActionGitLogReset" />
- <menuitem name="Revert commit..." action="ActionGitLogRevert" />
- <separator />
- <placeholder name="PlaceholderLogBisectMenu">
- <menu name="Bisect" action="ActionMenuGitLogBisect">
- <menuitem name="Set good revision" action="ActionGitLogBisectGood" />
- <menuitem name="Set bad revision" action="ActionGitLogBisectBad" />
- </menu>
- </placeholder>
- </popup>
-
- <popup name="PopupFileManager">
- <placeholder name="PlaceholderPopupFileVCS">
- <menu name="MenuGitFM" action="ActionMenuGitFM">
- <menuitem name="View log..." action="ActionGitFMLog" />
- <menuitem name="Add..." action="ActionGitFMAdd" />
- <menuitem name="Remove..." action="ActionGitFMRemove" />
- </menu>
- </placeholder>
- </popup>
-</ui>
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <requires lib="anjuta" version="2366.5320"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="commit_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Commit Changes</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox16">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox28">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame32">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment30">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="commit_log_view">
+ <property name="width_request">600</property>
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label48">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Log Message:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="commit_amend_check">
+ <property name="label" translatable="yes">Amend the previous commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="resolve_check">
+ <property name="label" translatable="yes">This commit concludes a failed merge (use -i)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="commit_custom_author_info_check">
+ <property name="label" translatable="yes">Use custom author information:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="commit_author_info_alignment">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">E-mail:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name:</property>
+ </object>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="commit_author_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_padding">2</property>
+ <property name="y_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="commit_author_email_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">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>
+ <property name="x_padding">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame34">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment32">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaVcsStatusTreeView" id="commit_status_view">
+ <property name="width_request">600</property>
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select Files to Commit:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="commit_status_progress_bar">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activity_mode">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="commit_select_all_button">
+ <property name="label">gtk-select-all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="commit_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area16">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button19">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button20">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button19</action-widget>
+ <action-widget response="-5">button20</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="add_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Add File</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkFileChooserButton" id="add_file_chooser_button">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select file to add:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="force_check">
+ <property name="label" translatable="yes">Force</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button1</action-widget>
+ <action-widget response="-5">button2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="remove_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Remove File</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkFileChooserButton" id="remove_file_chooser_button">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select file to remove:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="force_check1">
+ <property name="label" translatable="yes">Force</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button5">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button6">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button5</action-widget>
+ <action-widget response="-5">button6</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="resolve_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Set Conflicts as Resolved</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame30">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment28">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow10">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaVcsStatusTreeView" id="resolve_status_view">
+ <property name="width_request">600</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="status_codes">ANJUTA_VCS_STATUS_CONFLICTED</property>
+ <property name="show_status">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select Files to Mark as Resolved:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="resolve_status_progress_bar">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="resolve_select_all_button">
+ <property name="label">gtk-select-all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="resolve_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="revert_cancel_button3">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="revert_ok_button3">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">revert_cancel_button3</action-widget>
+ <action-widget response="-5">revert_ok_button3</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="merge_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Merge</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkComboBox" id="merge_branch_combo">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Branch:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame7">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckButton" id="no_commit_check">
+ <property name="label" translatable="yes">Do not commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="squash_check">
+ <property name="label" translatable="yes">Squash</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckButton" id="use_custom_log_check">
+ <property name="label" translatable="yes">Use a custom log message</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="merge_log_view">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="indent">5</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Log message:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button3">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button4">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button3</action-widget>
+ <action-widget response="-5">button4</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="switch_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Switch to Another Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame9">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkComboBox" id="switch_branch_combo">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Branch to switch to:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area7">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button7">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button8">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button7</action-widget>
+ <action-widget response="-5">button8</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="create_branch_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Create Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox9">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame11">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="branch_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Branch name:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame19">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment19">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="branch_head_radio">
+ <property name="label" translatable="yes">Head</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="branch_revision_radio">
+ <property name="label" translatable="yes">Revision/Tag:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">branch_head_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="branch_revision_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Revision:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame12">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="branch_checkout_check">
+ <property name="label" translatable="yes">Check out the branch after it is created</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button11">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button12">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button11</action-widget>
+ <action-widget response="-5">button12</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="delete_branch_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Delete Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox11">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame13">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkComboBox" id="delete_branch_combo">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Branch to delete:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame14">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment14">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="require_merged_check">
+ <property name="label" translatable="yes">Branch must be fully merged</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area11">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button13">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button14">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button13</action-widget>
+ <action-widget response="-5">button14</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="unstage_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Unstage Files</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox13">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame15">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaVcsStatusTreeView" id="unstage_status_view">
+ <property name="width_request">600</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select Files to Unstage:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="unstage_status_progress_bar">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="unstage_select_all_button">
+ <property name="label">gtk-select-all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="unstage_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area13">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="revert_cancel_button2">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="revert_ok_button2">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">revert_cancel_button2</action-widget>
+ <action-widget response="-5">revert_ok_button2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="checkout_files_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Check Out Files</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox15">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame16">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaVcsStatusTreeView" id="checkout_status_view">
+ <property name="width_request">600</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select Files to Check Out:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="checkout_status_progress_bar">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="checkout_select_all_button">
+ <property name="label">gtk-select-all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="checkout_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area15">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="revert_cancel_button4">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="revert_ok_button4">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">revert_cancel_button4</action-widget>
+ <action-widget response="-5">revert_ok_button4</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="log_window">
+ <property name="resizable">False</property>
+ <child>
+ <object class="GtkVBox" id="log_vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame10">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkHBox" id="log_path_entry_hbox">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <child>
+ <object class="GtkEntry" id="log_path_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="log_browse_button">
+ <property name="label" translatable="yes">Browse...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="log_view_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">View log</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="log_whole_project_check">
+ <property name="label" translatable="yes">Whole project</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>View the Log for File/Folder:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="expander1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox16">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Author:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="x_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Grep:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="x_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="log_filter_author_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="log_filter_grep_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments=""Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.">Author/Grep</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkCalendar" id="log_filter_to_calendar">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">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>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCalendar" id="log_filter_from_calendar">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="log_filter_from_check">
+ <property name="label" translatable="yes">From</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="log_filter_to_check">
+ <property name="label" translatable="yes">To</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Date</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">From:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="x_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">To:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="x_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="log_filter_from_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="log_filter_to_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Tag/Commit</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="log_filter_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Filters</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox15">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkFrame" id="frame17">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment17">
+ <property name="visible">True</property>
+ <property name="left_padding">12</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">in</property>
+ <child>
+ <object class="GtkTreeView" id="log_changes_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Changes:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame18">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment18">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <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">in</property>
+ <child>
+ <object class="GtkTextView" id="log_text_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Log Message:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="create_tag_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Create Tag</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox18">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame20">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment20">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="tag_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tag name:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame21">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment21">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox10">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="tag_head_radio">
+ <property name="label" translatable="yes">Head</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="tag_revision_radio">
+ <property name="label" translatable="yes">Revision:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">tag_head_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tag_revision_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Revision:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame22">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment22">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox11">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="tag_force_check">
+ <property name="label" translatable="yes">Force</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="tag_annotate_check">
+ <property name="label" translatable="yes">Annotate this tag</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <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">in</property>
+ <child>
+ <object class="GtkTextView" id="tag_log_view">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area18">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button9">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button10">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button9</action-widget>
+ <action-widget response="-5">button10</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="reset_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Reset Tree</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox20">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame24">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment24">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox12">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="reset_previous_radio">
+ <property name="label" translatable="yes">Previous commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="reset_revision_radio">
+ <property name="label" translatable="yes">Revision:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">reset_previous_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="reset_revision_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Reset to:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame23">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment23">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox13">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="reset_mixed_radio">
+ <property name="label" translatable="yes">Mixed</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="reset_soft_radio">
+ <property name="label" translatable="yes">Soft</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">reset_hard_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="reset_hard_radio">
+ <property name="label" translatable="yes">Hard</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">reset_mixed_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Mode:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area20">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button15">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button16">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button15</action-widget>
+ <action-widget response="-5">button16</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="revert_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Revert Commit</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="revert-dialog-vbox">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox14">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame25">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment25">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="revert_revision_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Commit to revert:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame26">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment26">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="revert_no_commit_check">
+ <property name="label" translatable="yes">Do not commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area22">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button17">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button18">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button17</action-widget>
+ <action-widget response="-5">button18</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="rebase_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Rebase</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox24">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame27">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment27">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkComboBox" id="rebase_branch_combo">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rebase_origin_check">
+ <property name="label" translatable="yes">Repository origin</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Remote branch to rebase from:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area24">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button21">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button22">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button21</action-widget>
+ <action-widget response="-5">button22</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="bisect_start_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Delete Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox26">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame28">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment29">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="bisect_start_head_radio">
+ <property name="label" translatable="yes">Head</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="bisect_start_revision_radio">
+ <property name="label" translatable="yes">Revision:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">bisect_start_head_radio</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="bisect_start_bad_revision_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Bad revision:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame29">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment31">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="bisect_start_good_revision_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">40</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Good revision:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area26">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button23">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button24">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button23</action-widget>
+ <action-widget response="-5">button24</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="ignore_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Ignore Files</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox28">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame31">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment33">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaVcsStatusTreeView" id="ignore_status_view">
+ <property name="width_request">600</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <property name="status_codes">ANJUTA_VCS_STATUS_UNVERSIONED</property>
+ <property name="show_status">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label39">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Select Files to Ignore:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="ignore_status_progress_bar">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ignore_select_all_button">
+ <property name="label">gtk-select-all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ignore_clear_button">
+ <property name="label">gtk-clear</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area28">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="revert_cancel_button1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="revert_ok_button1">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">revert_cancel_button1</action-widget>
+ <action-widget response="-5">revert_ok_button1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="add_remote_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Add Remote Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox30">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame33">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment34">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="add_remote_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Branch name:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame35">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment35">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="add_remote_url_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">60</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>URL:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame36">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment36">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="add_remote_fetch_check">
+ <property name="label" translatable="yes">Fetch remote branches after creation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area30">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button25">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button26">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button25</action-widget>
+ <action-widget response="-5">button26</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="delete_remote_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Delete Remote Branch</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox32">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame37">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment37">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkComboBox" id="delete_remote_combo">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label43">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Remote to delete:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area32">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button27">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delete_remote_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button27</action-widget>
+ <action-widget response="-5">delete_remote_ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="patch_series_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Create patch series</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox34">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox19">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame40">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment40">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkComboBox" id="patch_series_branch_combo">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="patch_series_origin_check">
+ <property name="label" translatable="yes">Repository origin</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Generate patches relative to:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame38">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment38">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkFileChooserButton" id="patch_series_file_chooser_button">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="action">select-folder</property>
+ <property name="title" translatable="yes">Select A Folder</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Folder to create patches in:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame39">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment39">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="patch_series_signoff_check">
+ <property name="label" translatable="yes" comments="A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.">Add signed off by line</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label45">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area34">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button28">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button29">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button28</action-widget>
+ <action-widget response="-5">button29</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="pull_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Pull</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox36">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox20">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkFrame" id="frame41">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment41">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkEntry" id="pull_url_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">60</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_origin_check">
+ <property name="label" translatable="yes">Repository origin</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label49">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Repository to pull from:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame42">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment42">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox21">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckButton" id="pull_rebase_check">
+ <property name="label" translatable="yes">Rebase</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_no_commit_check">
+ <property name="label" translatable="yes">Do not commit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_squash_check">
+ <property name="label" translatable="yes">Squash</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_fast_forward_commit_check">
+ <property name="label" translatable="yes">Commit on fast-forward merges</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_append_fetch_data_check">
+ <property name="label" translatable="yes" comments="Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.">Append fetch data</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_force_check">
+ <property name="label" translatable="yes">Force</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pull_no_follow_tags_check">
+ <property name="label" translatable="yes">Do not follow tags</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area36">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button30">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button31">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button30</action-widget>
+ <action-widget response="-5">button31</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="push_dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Push</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="push-dialog-vbox">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkEntry" id="push_url_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">60</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="push_origin_check">
+ <property name="label" translatable="yes">Repository origin</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Repository to push to:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="push_all_check">
+ <property name="label" translatable="yes">Push all refs</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="push_tags_check">
+ <property name="label" translatable="yes">Push tags</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area22">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button5">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button6">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button5</action-widget>
+ <action-widget response="-5">button6</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="apply_mailbox_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Apply mailbox files</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="am-dialog-vbox">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkFileChooserButton" id="apply_mailbox_file_chooser_button">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select Mailbox File</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Mailbox file containing patches:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="apply_mailbox_signoff_check">
+ <property name="label" translatable="yes">Add signed off by line</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area22">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label" translatable="yes">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button2">
+ <property name="label" translatable="yes">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button1</action-widget>
+ <action-widget response="-5">button2</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/git/anjuta-git.xml b/plugins/git/anjuta-git.xml
new file mode 100644
index 0000000..cab203e
--- /dev/null
+++ b/plugins/git/anjuta-git.xml
@@ -0,0 +1,108 @@
+<!--*- xml -*-->
+<ui>
+ <menubar name="MenuMain">
+ <placeholder name="PlaceHolderVersionControlMenus">
+ <menu name="MenuGit" action="ActionMenuGit">
+ <placeholder name="PlaceholderGitMenus">
+ <menuitem name="Commit..." action="ActionGitCommit" />
+ <menuitem name="Fetch" action="ActionGitFetch" />
+ <placeholder name="PlaceholderRebaseMenu">
+ <menu name="Rebase" action="ActionMenuGitRebase">
+ <menuitem name="Start..." action="ActionGitRebaseStart" />
+ <separator name="rebase_separator1" />
+ <menuitem name="Continue" action="ActionGitRebaseContinue" />
+ <menuitem name="Skip" action="ActionGitRebaseSkip" />
+ <menuitem name="Abort" action="ActionGitRebaseAbort" />
+ </menu>
+ </placeholder>
+ <menuitem name="Push..." action="ActionGitPush" />
+ <menuitem name="Pull..." action="ActionGitPull" />
+ <menuitem name="Diff uncommitted changes" action="ActionGitDiffUncommitted" />
+ <separator />
+ <menuitem name="Add..." action="ActionGitAdd" />
+ <menuitem name="Remove..." action="ActionGitRemove" />
+ <menuitem name="Ignore..." action="ActionGitIgnore" />
+ <separator />
+ <menuitem name="Check out files..." action="ActionGitCheckoutFiles" />
+ <menuitem name="Unstage files..." action="ActionGitUnstageFiles" />
+ <menuitem name="Resolve conflicts..." action="ActionGitResolve" />
+ <separator />
+ <placeholder name="PlaceholderPatchMenu">
+ <menu name="Patches" action="ActionMenuGitPatches">
+ <menuitem name="Create patch series..." action="ActionGitCreatePatchSeries" />
+ <placeholder name="PlaceholderApplyMailboxMenu">
+ <menu name="Apply from mailbox files" action="ActionMenuGitApplyMailboxFiles">
+ <menuitem name="Apply" action="ActionGitApplyMailboxApply" />
+ <separator />
+ <menuitem name="Continue with resolved conflicts" action="ActionGitApplyMailboxContinue" />
+ <menuitem name="Skip current patch" action="ActionGitApplyMailboxSkip" />
+ <menuitem name="Abort" action="ActionGitApplyMailboxAbort" />
+ </menu>
+ </placeholder>
+ </menu>
+ </placeholder>
+ <separator />
+ <placeholder name="PlaceholderBranches">
+ <menu name="BranchesMenu" action="ActionMenuGitBranches">
+ <menuitem name="Create branch..." action="ActionGitCreateBranch" />
+ <menuitem name="Delete branch..." action="ActionGitDeleteBranch" />
+ <menuitem name="Switch to another branch..." action="ActionGitSwitch" />
+ <menuitem name="Merge..." action="ActionGitMerge" />
+ <placeholder name="PlaceholderRemoteMenu">
+ <menu name="Remote branches" action="ActionMenuGitRemoteBranches">
+ <menuitem name="Add..." action="ActionGitRemoteAdd" />
+ <menuitem name="Delete..." action="ActionGitRemoteDelete" />
+ </menu>
+ </placeholder>
+ </menu>
+ </placeholder>
+ <separator />
+ <menuitem name="Create tag..." action="ActionGitCreateTag" />
+ <separator />
+ <menuitem name="Reset tree..." action="ActionGitReset" />
+ <menuitem name="Revert commit..." action="ActionGitRevert" />
+ <separator />
+ <placeholder name="PlaceholderBisectMenu">
+ <menu name="Bisect" action="ActionMenuGitBisect">
+ <menuitem name="Start..." action="ActionGitBisectStart" />
+ <menuitem name="Reset" action="ActionGitBisectReset" />
+ <separator name="bisect_separator1" />
+ <menuitem name="Good" action="ActionGitBisectGood" />
+ <menuitem name="Bad" action="ActionGitBisectBad" />
+ </menu>
+ </placeholder>
+ <separator />
+ <menuitem name="View log..." action="ActionGitLog" />
+ </placeholder>
+ </menu>
+ </placeholder>
+ </menubar>
+
+ <popup name="PopupLog">
+ <menuitem name="Commit diff" action="ActionGitLogCommitDiff" />
+ <menuitem name="View Selected Revision" action="ActionGitLogViewRevision" />
+ <separator />
+ <menuitem name="Create branch..." action="ActionGitLogCreateBranch" />
+ <menuitem name="Create tag..." action="ActionGitLogCreateTag" />
+ <separator name ="log_separator2" />
+ <menuitem name="Reset tree..." action="ActionGitLogReset" />
+ <menuitem name="Revert commit..." action="ActionGitLogRevert" />
+ <separator />
+ <placeholder name="PlaceholderLogBisectMenu">
+ <menu name="Bisect" action="ActionMenuGitLogBisect">
+ <menuitem name="Set good revision" action="ActionGitLogBisectGood" />
+ <menuitem name="Set bad revision" action="ActionGitLogBisectBad" />
+ </menu>
+ </placeholder>
+ </popup>
+
+ <popup name="PopupFileManager">
+ <placeholder name="PlaceholderPopupFileVCS">
+ <menu name="MenuGitFM" action="ActionMenuGitFM">
+ <menuitem name="View log..." action="ActionGitFMLog" />
+ <menuitem name="Add..." action="ActionGitFMAdd" />
+ <menuitem name="Remove..." action="ActionGitFMRemove" />
+ </menu>
+ </placeholder>
+ </popup>
+</ui>
diff --git a/plugins/git/git-add-dialog.c b/plugins/git/git-add-dialog.c
index e99d5bd..0374e47 100644
--- a/plugins/git/git-add-dialog.c
+++ b/plugins/git/git-add-dialog.c
@@ -53,9 +53,9 @@ on_add_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- add_file_chooser_button = glade_xml_get_widget (data->gxml,
- "add_file_chooser_button");
- force_check = glade_xml_get_widget (data->gxml, "force_check");
+ add_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "add_file_chooser_button"));
+ force_check = GTK_WIDGET (gtk_builder_get_object (data->bxml, "force_check"));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (add_file_chooser_button));
if (git_check_input (GTK_WIDGET (dialog), add_file_chooser_button, filename,
@@ -87,16 +87,26 @@ on_add_dialog_response (GtkDialog *dialog, gint response_id,
static void
add_dialog (Git *plugin, const gchar *filename)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"add_dialog", NULL};;
+ GError *error;
GtkWidget *dialog;
GtkWidget *add_file_chooser_button;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "add_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "add_dialog");
- add_file_chooser_button = glade_xml_get_widget (gxml,
- "add_file_chooser_button");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "add_dialog"));
+ add_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "add_file_chooser_button"));
if (filename)
{
@@ -104,7 +114,7 @@ add_dialog (Git *plugin, const gchar *filename)
filename);
}
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_add_dialog_response),
diff --git a/plugins/git/git-add-remote-dialog.c b/plugins/git/git-add-remote-dialog.c
index dcc9a4c..5a93a54 100644
--- a/plugins/git/git-add-remote-dialog.c
+++ b/plugins/git/git-add-remote-dialog.c
@@ -54,7 +54,7 @@ on_remote_add_command_finished (AnjutaCommand *command, guint return_code,
static void
on_add_remote_dialog_response (GtkDialog *dialog, gint response_id,
- GitUIData *data)
+ GitUIData *data)
{
GtkWidget *add_remote_name_entry;
GtkWidget *add_remote_url_entry;
@@ -67,12 +67,12 @@ on_add_remote_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- add_remote_name_entry = glade_xml_get_widget (data->gxml,
- "add_remote_name_entry");
- add_remote_url_entry = glade_xml_get_widget (data->gxml,
- "add_remote_url_entry");
- add_remote_fetch_check = glade_xml_get_widget (data->gxml,
- "add_remote_fetch_check");
+ add_remote_name_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "add_remote_name_entry"));
+ add_remote_url_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "add_remote_url_entry"));
+ add_remote_fetch_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "add_remote_fetch_check"));
branch_name = gtk_editable_get_chars (GTK_EDITABLE (add_remote_name_entry),
0, -1);
@@ -143,14 +143,25 @@ on_add_remote_dialog_response (GtkDialog *dialog, gint response_id,
static void
add_remote_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"add_remote_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GitUIData *data;
-
- gxml = glade_xml_new (GLADE_FILE, "add_remote_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "add_remote_dialog");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "add_remote_dialog"));
+
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_add_remote_dialog_response),
diff --git a/plugins/git/git-apply-mailbox-dialog.c b/plugins/git/git-apply-mailbox-dialog.c
index 593f489..b5bc60b 100644
--- a/plugins/git/git-apply-mailbox-dialog.c
+++ b/plugins/git/git-apply-mailbox-dialog.c
@@ -35,10 +35,10 @@ on_apply_mailbox_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- apply_mailbox_file_chooser_button = glade_xml_get_widget (data->gxml,
- "apply_mailbox_file_chooser_button");
- apply_mailbox_signoff_check = glade_xml_get_widget (data->gxml,
- "apply_mailbox_signoff_check");
+ apply_mailbox_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "apply_mailbox_file_chooser_button"));
+ apply_mailbox_signoff_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "apply_mailbox_signoff_check"));
path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (apply_mailbox_file_chooser_button));
if (git_check_input (GTK_WIDGET (dialog), apply_mailbox_file_chooser_button, path,
@@ -74,14 +74,25 @@ on_apply_mailbox_dialog_response (GtkDialog *dialog, gint response_id,
static void
apply_mailbox_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"apply_mailbox_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GitUIData *data;
+
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- gxml = glade_xml_new (GLADE_FILE, "apply_mailbox_dialog", NULL);
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
- dialog = glade_xml_get_widget (gxml, "apply_mailbox_dialog");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "apply_mailbox_dialog"));
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_apply_mailbox_dialog_response),
diff --git a/plugins/git/git-bisect-dialog.c b/plugins/git/git-bisect-dialog.c
index eec9fee..f50722e 100644
--- a/plugins/git/git-bisect-dialog.c
+++ b/plugins/git/git-bisect-dialog.c
@@ -37,12 +37,12 @@ on_bisect_start_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- bisect_start_revision_radio = glade_xml_get_widget (data->gxml,
- "bisect_start_revision_radio");
- bisect_start_bad_revision_entry = glade_xml_get_widget (data->gxml,
- "bisect_start_bad_revision_entry");
- bisect_start_good_revision_entry = glade_xml_get_widget (data->gxml,
- "bisect_start_good_revision_entry");
+ bisect_start_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "bisect_start_revision_radio"));
+ bisect_start_bad_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "bisect_start_bad_revision_entry"));
+ bisect_start_good_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "bisect_start_good_revision_entry"));
bad_revision = "";
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (bisect_start_revision_radio)))
@@ -97,10 +97,10 @@ on_bisect_start_revision_radio_toggled (GtkToggleButton *toggle_button,
GtkWidget *bisect_start_revision_entry;
gboolean active;
- bisect_start_dialog = glade_xml_get_widget (data->gxml,
- "bisect_start_dialog");
- bisect_start_revision_entry = glade_xml_get_widget (data->gxml,
- "bisect_start_bad_revision_entry");
+ bisect_start_dialog = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "bisect_start_dialog"));
+ bisect_start_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "bisect_start_bad_revision_entry"));
active = gtk_toggle_button_get_active (toggle_button);
gtk_widget_set_sensitive (bisect_start_revision_entry, active);
@@ -116,16 +116,27 @@ on_bisect_start_revision_radio_toggled (GtkToggleButton *toggle_button,
static void
bisect_start_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"bisect_start_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *bisect_start_revision_radio;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "bisect_start_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "bisect_start_dialog");
- bisect_start_revision_radio = glade_xml_get_widget (gxml,
- "bisect_start_revision_radio");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "bisect_start_dialog"));
+ bisect_start_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "bisect_start_revision_radio"));
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_bisect_start_dialog_response),
diff --git a/plugins/git/git-branch-combo-model.c b/plugins/git/git-branch-combo-model.c
index e387813..d7c2565 100644
--- a/plugins/git/git-branch-combo-model.c
+++ b/plugins/git/git-branch-combo-model.c
@@ -34,14 +34,14 @@ enum
GitBranchComboData *
git_branch_combo_data_new (GtkListStore *model, GtkComboBox *combo_box,
- GladeXML *gxml, Git *plugin)
+ GtkBuilder *bxml, Git *plugin)
{
GitBranchComboData *data;
data = g_new0 (GitBranchComboData, 1);
data->model = model;
data->combo_box = combo_box;
- data->gxml = gxml;
+ data->bxml = bxml;
data->plugin = plugin;
return data;
@@ -50,7 +50,7 @@ git_branch_combo_data_new (GtkListStore *model, GtkComboBox *combo_box,
void
git_branch_combo_data_free (GitBranchComboData *data)
{
- g_object_unref (data->gxml);
+ g_object_unref (data->bxml);
g_free (data);
}
diff --git a/plugins/git/git-branch-combo-model.h b/plugins/git/git-branch-combo-model.h
index 5fe969d..2261d0b 100644
--- a/plugins/git/git-branch-combo-model.h
+++ b/plugins/git/git-branch-combo-model.h
@@ -34,14 +34,14 @@ typedef struct
{
GtkListStore *model;
GtkComboBox *combo_box;
- GladeXML *gxml; /* Seems redundant, but we don't know what the combo box
+ GtkBuilder *bxml; /* Seems redundant, but we don't know what the combo box
* is called in the glade file. */
Git *plugin;
} GitBranchComboData;
GitBranchComboData *git_branch_combo_data_new (GtkListStore *model,
GtkComboBox *combo_box,
- GladeXML *gxml, Git *plugin);
+ GtkBuilder *bxml, Git *plugin);
void git_branch_combo_data_free (GitBranchComboData *data);
GtkListStore *git_branch_combo_model_new (void);
void git_branch_combo_model_setup_widget (GtkWidget *widget);
diff --git a/plugins/git/git-checkout-files-dialog.c b/plugins/git/git-checkout-files-dialog.c
index 9daf1e8..72c7d97 100644
--- a/plugins/git/git-checkout-files-dialog.c
+++ b/plugins/git/git-checkout-files-dialog.c
@@ -51,7 +51,7 @@ on_checkout_files_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- checkout_status_view = glade_xml_get_widget (data->gxml, "checkout_status_view");
+ checkout_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "checkout_status_view"));
selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (checkout_status_view));
checkout_files_command = git_checkout_files_command_new (data->plugin->project_root_directory,
selected_paths);
@@ -72,7 +72,9 @@ on_checkout_files_dialog_response (GtkDialog *dialog, gint response_id,
static void
checkout_files_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"checkout_files_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *checkout_select_all_button;
GtkWidget *checkout_clear_button;
@@ -81,13 +83,21 @@ checkout_files_dialog (Git *plugin)
GitStatusCommand *status_command;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "checkout_files_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "checkout_files_dialog");
- checkout_select_all_button = glade_xml_get_widget (gxml, "checkout_select_all_button");
- checkout_clear_button = glade_xml_get_widget (gxml, "checkout_clear_button");
- checkout_status_view = glade_xml_get_widget (gxml, "checkout_status_view");
- checkout_status_progress_bar = glade_xml_get_widget (gxml, "checkout_status_progress_bar");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "checkout_files_dialog"));
+ checkout_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml, "checkout_select_all_button"));
+ checkout_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml, "checkout_clear_button"));
+ checkout_status_view = GTK_WIDGET (gtk_builder_get_object (bxml, "checkout_status_view"));
+ checkout_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml, "checkout_status_progress_bar"));
status_command = git_status_command_new (plugin->project_root_directory,
GIT_STATUS_SECTION_NOT_UPDATED);
@@ -124,7 +134,7 @@ checkout_files_dialog (Git *plugin)
anjuta_command_start (ANJUTA_COMMAND (status_command));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_checkout_files_dialog_response),
diff --git a/plugins/git/git-commit-dialog.c b/plugins/git/git-commit-dialog.c
index 1a88016..47f91ff 100644
--- a/plugins/git/git-commit-dialog.c
+++ b/plugins/git/git-commit-dialog.c
@@ -64,10 +64,10 @@ on_commit_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- commit_amend_check = glade_xml_get_widget (data->gxml,
- "commit_amend_check");
+ commit_amend_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_amend_check"));
amend = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (commit_amend_check));
- commit_log_view = glade_xml_get_widget (data->gxml, "commit_log_view");
+ commit_log_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "commit_log_view"));
log = git_get_log_from_textview (commit_log_view);
if (!g_utf8_strlen(log, -1))
@@ -85,14 +85,14 @@ on_commit_dialog_response (GtkDialog *dialog, gint response_id,
return;
}
- commit_custom_author_info_check = glade_xml_get_widget (data->gxml,
- "commit_custom_author_info_check");
- commit_author_info_alignment = glade_xml_get_widget (data->gxml,
- "commit_author_info_alignment");
- commit_author_name_entry = glade_xml_get_widget (data->gxml,
- "commit_author_name_entry");
- commit_author_email_entry = glade_xml_get_widget (data->gxml,
- "commit_author_email_entry");
+ commit_custom_author_info_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_custom_author_info_check"));
+ commit_author_info_alignment = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_author_info_alignment"));
+ commit_author_name_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_author_name_entry"));
+ commit_author_email_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_author_email_entry"));
author_name = NULL;
author_email = NULL;
@@ -121,8 +121,9 @@ on_commit_dialog_response (GtkDialog *dialog, gint response_id,
}
- commit_status_view = glade_xml_get_widget (data->gxml, "commit_status_view");
- resolve_check = glade_xml_get_widget (data->gxml, "resolve_check");
+ commit_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "commit_status_view"));
+ resolve_check = GTK_WIDGET (gtk_builder_get_object (data->bxml, "resolve_check"));
selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (commit_status_view));
commit_command = git_commit_command_new (data->plugin->project_root_directory,
amend,
@@ -170,7 +171,9 @@ on_commit_custom_author_info_check_toggled (GtkToggleButton *button,
static void
commit_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"commit_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *commit_custom_author_info_check;
GtkWidget *commit_author_info_alignment;
@@ -181,15 +184,23 @@ commit_dialog (Git *plugin)
GitStatusCommand *status_command;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "commit_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "commit_dialog");
- commit_custom_author_info_check = glade_xml_get_widget (gxml, "commit_custom_author_info_check");
- commit_author_info_alignment = glade_xml_get_widget (gxml, "commit_author_info_alignment");
- commit_select_all_button = glade_xml_get_widget (gxml, "commit_select_all_button");
- commit_clear_button = glade_xml_get_widget (gxml, "commit_clear_button");
- commit_status_view = glade_xml_get_widget (gxml, "commit_status_view");
- commit_status_progress_bar = glade_xml_get_widget (gxml, "commit_status_progress_bar");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_dialog"));
+ commit_custom_author_info_check = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_custom_author_info_check"));
+ commit_author_info_alignment = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_author_info_alignment"));
+ commit_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_select_all_button"));
+ commit_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_clear_button"));
+ commit_status_view = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_status_view"));
+ commit_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_status_progress_bar"));
status_command = git_status_command_new (plugin->project_root_directory,
GIT_STATUS_SECTION_MODIFIED);
@@ -236,7 +247,7 @@ commit_dialog (Git *plugin)
anjuta_command_start (ANJUTA_COMMAND (status_command));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_commit_dialog_response),
diff --git a/plugins/git/git-create-branch-dialog.c b/plugins/git/git-create-branch-dialog.c
index d9cb83f..19a2933 100644
--- a/plugins/git/git-create-branch-dialog.c
+++ b/plugins/git/git-create-branch-dialog.c
@@ -69,14 +69,14 @@ on_create_branch_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- branch_name_entry = glade_xml_get_widget (data->gxml,
- "branch_name_entry");
- branch_checkout_check = glade_xml_get_widget (data->gxml,
- "branch_checkout_check");
- branch_revision_radio = glade_xml_get_widget (data->gxml,
- "branch_revision_radio");
- branch_revision_entry = glade_xml_get_widget (data->gxml,
- "branch_revision_entry");
+ branch_name_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "branch_name_entry"));
+ branch_checkout_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "branch_checkout_check"));
+ branch_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "branch_revision_radio"));
+ branch_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "branch_revision_entry"));
branch_name = gtk_editable_get_chars (GTK_EDITABLE (branch_name_entry),
0, -1);
revision = NULL;
@@ -138,10 +138,10 @@ on_branch_revision_radio_toggled (GtkToggleButton *toggle_button,
GtkWidget *branch_revision_entry;
gboolean active;
- create_branch_dialog = glade_xml_get_widget (data->gxml,
- "create_branch_dialog");
- branch_revision_entry = glade_xml_get_widget (data->gxml,
- "branch_revision_entry");
+ create_branch_dialog = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "create_branch_dialog"));
+ branch_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "branch_revision_entry"));
active = gtk_toggle_button_get_active (toggle_button);
gtk_widget_set_sensitive (branch_revision_entry, active);
@@ -157,19 +157,30 @@ on_branch_revision_radio_toggled (GtkToggleButton *toggle_button,
static void
create_branch_dialog (Git *plugin, const gchar *revision)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"create_branch_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *branch_revision_radio;
GtkWidget *branch_revision_entry;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "create_branch_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "create_branch_dialog");
- branch_revision_radio = glade_xml_get_widget (gxml,
- "branch_revision_radio");
- branch_revision_entry = glade_xml_get_widget (gxml,
- "branch_revision_entry");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "create_branch_dialog"));
+ branch_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "branch_revision_radio"));
+ branch_revision_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "branch_revision_entry"));
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_create_branch_dialog_response),
diff --git a/plugins/git/git-create-patch-series-dialog.c b/plugins/git/git-create-patch-series-dialog.c
index 441b969..a1deb20 100644
--- a/plugins/git/git-create-patch-series-dialog.c
+++ b/plugins/git/git-create-patch-series-dialog.c
@@ -39,14 +39,14 @@ on_create_patch_series_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- patch_series_origin_check = glade_xml_get_widget (data->gxml,
- "patch_series_origin_check");
- patch_series_branch_combo = glade_xml_get_widget (data->gxml,
- "patch_series_branch_combo");
- patch_series_file_chooser_button = glade_xml_get_widget (data->gxml,
- "patch_series_file_chooser_button");
- patch_series_signoff_check = glade_xml_get_widget (data->gxml,
- "patch_series_signoff_check");
+ patch_series_origin_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "patch_series_origin_check"));
+ patch_series_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "patch_series_branch_combo"));
+ patch_series_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "patch_series_file_chooser_button"));
+ patch_series_signoff_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "patch_series_signoff_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (patch_series_origin_check)))
branch = g_strdup ("origin");
@@ -87,7 +87,9 @@ on_create_patch_series_dialog_response (GtkDialog *dialog, gint response_id,
static void
create_patch_series_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"patch_series_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *patch_series_origin_check;
GtkWidget *patch_series_branch_combo;
@@ -95,13 +97,21 @@ create_patch_series_dialog (Git *plugin)
GitBranchComboData *data;
GitBranchListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "patch_series_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "patch_series_dialog");
- patch_series_origin_check = glade_xml_get_widget (gxml,
- "patch_series_origin_check");
- patch_series_branch_combo = glade_xml_get_widget (gxml,
- "patch_series_branch_combo");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "patch_series_dialog"));
+ patch_series_origin_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "patch_series_origin_check"));
+ patch_series_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "patch_series_branch_combo"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (patch_series_branch_combo),
@@ -110,7 +120,7 @@ create_patch_series_dialog (Git *plugin)
data = git_branch_combo_data_new (branch_list_store,
GTK_COMBO_BOX (patch_series_branch_combo),
- gxml, plugin);
+ bxml, plugin);
list_command = git_branch_list_command_new (plugin->project_root_directory,
GIT_BRANCH_TYPE_ALL);
diff --git a/plugins/git/git-create-tag-dialog.c b/plugins/git/git-create-tag-dialog.c
index 793a544..23f1080 100644
--- a/plugins/git/git-create-tag-dialog.c
+++ b/plugins/git/git-create-tag-dialog.c
@@ -73,18 +73,18 @@ on_create_tag_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- tag_name_entry = glade_xml_get_widget (data->gxml,
- "tag_name_entry");
- tag_revision_radio = glade_xml_get_widget (data->gxml,
- "tag_revision_radio");
- tag_revision_entry = glade_xml_get_widget (data->gxml,
- "tag_revision_entry");
- tag_force_check = glade_xml_get_widget (data->gxml,
- "tag_force_check");
- tag_annotate_check = glade_xml_get_widget (data->gxml,
- "tag_annotate_check");
- tag_log_view = glade_xml_get_widget (data->gxml,
- "tag_log_view");
+ tag_name_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_name_entry"));
+ tag_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_revision_radio"));
+ tag_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_revision_entry"));
+ tag_force_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_force_check"));
+ tag_annotate_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_annotate_check"));
+ tag_log_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_log_view"));
tag_name = gtk_editable_get_chars (GTK_EDITABLE (tag_name_entry),
0, -1);
@@ -168,10 +168,10 @@ on_tag_revision_radio_toggled (GtkToggleButton *toggle_button,
GtkWidget *tag_revision_entry;
gboolean active;
- create_tag_dialog = glade_xml_get_widget (data->gxml,
- "create_tag_dialog");
- tag_revision_entry = glade_xml_get_widget (data->gxml,
- "tag_revision_entry");
+ create_tag_dialog = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "create_tag_dialog"));
+ tag_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "tag_revision_entry"));
active = gtk_toggle_button_get_active (toggle_button);
gtk_widget_set_sensitive (tag_revision_entry, active);
@@ -195,7 +195,9 @@ on_tag_annotate_check_toggled (GtkToggleButton *toggle_button,
static void
create_tag_dialog (Git *plugin, const gchar *revision)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"create_tag_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *tag_revision_radio;
GtkWidget *tag_revision_entry;
@@ -203,17 +205,26 @@ create_tag_dialog (Git *plugin, const gchar *revision)
GtkWidget *tag_log_view;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "create_tag_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "create_tag_dialog");
- tag_revision_radio = glade_xml_get_widget (gxml,
- "tag_revision_radio");
- tag_revision_entry = glade_xml_get_widget (gxml,
- "tag_revision_entry");
- tag_annotate_check = glade_xml_get_widget (gxml,
- "tag_annotate_check");
- tag_log_view = glade_xml_get_widget (gxml,
- "tag_log_view");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "create_tag_dialog"));
+ tag_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "tag_revision_radio"));
+ tag_revision_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "tag_revision_entry"));
+ tag_annotate_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "tag_annotate_check"));
+ tag_log_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "tag_log_view"));
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_create_tag_dialog_response),
diff --git a/plugins/git/git-delete-branch-dialog.c b/plugins/git/git-delete-branch-dialog.c
index 0b6eaaf..a25bd05 100644
--- a/plugins/git/git-delete-branch-dialog.c
+++ b/plugins/git/git-delete-branch-dialog.c
@@ -64,9 +64,10 @@ on_delete_branch_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- delete_branch_combo = glade_xml_get_widget (data->gxml, "delete_branch_combo");
- require_merged_check = glade_xml_get_widget (data->gxml,
- "require_merged_check");
+ delete_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "delete_branch_combo"));
+ require_merged_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "require_merged_check"));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (delete_branch_combo), &iter);
branch = git_branch_combo_model_get_branch (data->model, &iter);
@@ -97,17 +98,27 @@ on_delete_branch_dialog_response (GtkDialog *dialog, gint response_id,
static void
delete_branch_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"delete_branch_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *delete_branch_combo;
GtkListStore *branch_list_store;
GitBranchComboData *data;
GitBranchListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "delete_branch_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "delete_branch_dialog");
- delete_branch_combo = glade_xml_get_widget (gxml, "delete_branch_combo");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_branch_dialog"));
+ delete_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_branch_combo"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (delete_branch_combo),
@@ -115,7 +126,7 @@ delete_branch_dialog (Git *plugin)
git_branch_combo_model_setup_widget (delete_branch_combo);
data = git_branch_combo_data_new (branch_list_store,
- GTK_COMBO_BOX (delete_branch_combo), gxml,
+ GTK_COMBO_BOX (delete_branch_combo), bxml,
plugin);
list_command = git_branch_list_command_new (plugin->project_root_directory,
diff --git a/plugins/git/git-delete-remote-dialog.c b/plugins/git/git-delete-remote-dialog.c
index 3fc853c..38f7bdf 100644
--- a/plugins/git/git-delete-remote-dialog.c
+++ b/plugins/git/git-delete-remote-dialog.c
@@ -35,8 +35,8 @@ on_delete_remote_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- delete_remote_branch_combo = glade_xml_get_widget (data->gxml,
- "delete_remote_combo");
+ delete_remote_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "delete_remote_combo"));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (delete_remote_branch_combo),
&iter);
@@ -89,10 +89,10 @@ on_remote_list_command_finished (AnjutaCommand *command, guint return_code,
GtkWidget *delete_remote_combo;
GtkTreeIter iter;
- delete_remote_ok_button = glade_xml_get_widget (data->gxml,
- "delete_remote_ok_button");
- delete_remote_combo = glade_xml_get_widget (data->gxml,
- "delete_remote_combo");
+ delete_remote_ok_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "delete_remote_ok_button"));
+ delete_remote_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "delete_remote_combo"));
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (data->model),
&iter))
@@ -105,18 +105,28 @@ on_remote_list_command_finished (AnjutaCommand *command, guint return_code,
static void
delete_remote_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"delete_remote_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *delete_remote_combo;
GtkListStore *branch_list_store;
GitBranchComboData *data;
GitRemoteListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "delete_remote_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "delete_remote_dialog");
- delete_remote_combo = glade_xml_get_widget (gxml,
- "delete_remote_combo");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_remote_dialog"));
+ delete_remote_combo = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "delete_remote_combo"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (delete_remote_combo),
@@ -124,7 +134,7 @@ delete_remote_dialog (Git *plugin)
git_branch_combo_model_setup_widget (delete_remote_combo);
data = git_branch_combo_data_new (branch_list_store,
- GTK_COMBO_BOX (delete_remote_combo), gxml,
+ GTK_COMBO_BOX (delete_remote_combo), bxml,
plugin);
list_command = git_remote_list_command_new (plugin->project_root_directory);
diff --git a/plugins/git/git-ignore-dialog.c b/plugins/git/git-ignore-dialog.c
index c15b46a..9486718 100644
--- a/plugins/git/git-ignore-dialog.c
+++ b/plugins/git/git-ignore-dialog.c
@@ -34,7 +34,7 @@ on_ignore_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- ignore_status_view = glade_xml_get_widget (data->gxml, "ignore_status_view");
+ ignore_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "ignore_status_view"));
selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (ignore_status_view));
ignore_command = git_ignore_command_new_list (data->plugin->project_root_directory,
selected_paths);
@@ -55,7 +55,9 @@ on_ignore_dialog_response (GtkDialog *dialog, gint response_id,
static void
ignore_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"ignore_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *ignore_select_all_button;
GtkWidget *ignore_clear_button;
@@ -64,13 +66,21 @@ ignore_dialog (Git *plugin)
GitStatusCommand *status_command;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "ignore_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "ignore_dialog");
- ignore_select_all_button = glade_xml_get_widget (gxml, "ignore_select_all_button");
- ignore_clear_button = glade_xml_get_widget (gxml, "ignore_clear_button");
- ignore_status_view = glade_xml_get_widget (gxml, "ignore_status_view");
- ignore_status_progress_bar = glade_xml_get_widget (gxml, "ignore_status_progress_bar");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "ignore_dialog"));
+ ignore_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml, "ignore_select_all_button"));
+ ignore_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml, "ignore_clear_button"));
+ ignore_status_view = GTK_WIDGET (gtk_builder_get_object (bxml, "ignore_status_view"));
+ ignore_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml, "ignore_status_progress_bar"));
status_command = git_status_command_new (plugin->project_root_directory,
GIT_STATUS_SECTION_UNTRACKED);
@@ -107,7 +117,7 @@ ignore_dialog (Git *plugin)
anjuta_command_start (ANJUTA_COMMAND (status_command));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_ignore_dialog_response),
diff --git a/plugins/git/git-log-dialog.c b/plugins/git/git-log-dialog.c
index 79ec354..e92b91b 100644
--- a/plugins/git/git-log-dialog.c
+++ b/plugins/git/git-log-dialog.c
@@ -35,7 +35,7 @@ enum
typedef struct
{
Git *plugin;
- GladeXML *gxml;
+ GtkBuilder *bxml;
GtkListStore *list_store;
GtkCellRenderer *graph_renderer;
gchar *path;
@@ -125,7 +125,7 @@ create_columns (LogData *data)
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+ log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET (log_changes_view)->style->font_desc));
/* Ref info */
@@ -210,7 +210,7 @@ on_log_command_finished (AnjutaCommand *command, guint return_code,
return;
}
- log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+ log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
g_object_ref (data->list_store);
gtk_tree_view_set_model (GTK_TREE_VIEW (log_changes_view), NULL);
@@ -273,7 +273,7 @@ on_ref_command_finished (AnjutaCommand *command, guint return_code,
/* If the user is using any filters or getting the log of an individual,
* file or folder, hide the graph column, because we can't be assured that
* the graph will be correct in these cases */
- log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+ log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
graph_column = gtk_tree_view_get_column (GTK_TREE_VIEW (log_changes_view),
1);
@@ -329,12 +329,13 @@ on_log_view_button_clicked (GtkButton *button, LogData *data)
path = NULL;
- log_whole_project_check = glade_xml_get_widget (data->gxml,
- "log_whole_project_check");
+ log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_whole_project_check"));
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (log_whole_project_check)))
{
- log_path_entry = glade_xml_get_widget (data->gxml, "log_path_entry");
+ log_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry"));
path = gtk_editable_get_chars (GTK_EDITABLE (log_path_entry), 0, -1);
/* Log widget belongs to the shell at this point. */
@@ -376,10 +377,41 @@ on_log_view_button_clicked (GtkButton *button, LogData *data)
}
static void
+on_log_browse_button_clicked (GtkButton *button, LogData *data)
+{
+ GtkWidget *log_file_entry;
+ GtkWidget *file_chooser_dialog;
+ gchar *filename;
+ gint response;
+
+ log_file_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry"));
+
+ file_chooser_dialog = gtk_file_chooser_dialog_new (_("Select a file"),
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (file_chooser_dialog));
+
+ if (response == GTK_RESPONSE_ACCEPT)
+ {
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser_dialog));
+ gtk_entry_set_text (GTK_ENTRY (log_file_entry), filename);
+
+ g_free (filename);
+ }
+
+ gtk_widget_destroy (file_chooser_dialog);
+}
+
+static void
on_log_vbox_destroy (GtkObject *log_vbox, LogData *data)
{
g_free (data->path);
- g_object_unref (data->gxml);
+ g_object_unref (data->bxml);
if (data->refs)
g_hash_table_unref (data->refs);
@@ -397,7 +429,7 @@ on_log_message_command_finished (AnjutaCommand *command, guint return_code,
GtkTextBuffer *buffer;
gchar *log_message;
- log_text_view = glade_xml_get_widget (data->gxml, "log_text_view");
+ log_text_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_text_view"));
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_text_view));
log_message = git_log_message_command_get_message (GIT_LOG_MESSAGE_COMMAND (command));
@@ -628,18 +660,18 @@ on_log_filter_clear_button_clicked (GtkButton *button, LogData *data)
GtkWidget *log_filter_from_entry;
GtkWidget *log_filter_to_entry;
- log_filter_author_entry = glade_xml_get_widget (data->gxml,
- "log_filter_author_entry");
- log_filter_grep_entry = glade_xml_get_widget (data->gxml,
- "log_filter_grep_entry");
- log_filter_from_check = glade_xml_get_widget (data->gxml,
- "log_filter_from_check");
- log_filter_to_check = glade_xml_get_widget (data->gxml,
- "log_filter_to_check");
- log_filter_from_entry = glade_xml_get_widget (data->gxml,
- "log_filter_from_entry");
- log_filter_to_entry = glade_xml_get_widget (data->gxml,
- "log_filter_to_entry");
+ log_filter_author_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_author_entry"));
+ log_filter_grep_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_grep_entry"));
+ log_filter_from_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_from_check"));
+ log_filter_to_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_to_check"));
+ log_filter_from_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_from_entry"));
+ log_filter_to_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_to_entry"));
gtk_entry_set_text (GTK_ENTRY (log_filter_author_entry), "");
gtk_entry_set_text (GTK_ENTRY (log_filter_grep_entry), "");
@@ -670,24 +702,24 @@ setup_filters (LogData *data)
data->filters = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
g_free);
- log_filter_author_entry = glade_xml_get_widget (data->gxml,
- "log_filter_author_entry");
- log_filter_grep_entry = glade_xml_get_widget (data->gxml,
- "log_filter_grep_entry");
- log_filter_from_check = glade_xml_get_widget (data->gxml,
- "log_filter_from_check");
- log_filter_to_check = glade_xml_get_widget (data->gxml,
- "log_filter_to_check");
- log_filter_from_calendar = glade_xml_get_widget (data->gxml,
- "log_filter_from_calendar");
- log_filter_to_calendar = glade_xml_get_widget (data->gxml,
- "log_filter_to_calendar");
- log_filter_from_entry = glade_xml_get_widget (data->gxml,
- "log_filter_from_entry");
- log_filter_to_entry = glade_xml_get_widget (data->gxml,
- "log_filter_to_entry");
- log_filter_clear_button = glade_xml_get_widget (data->gxml,
- "log_filter_clear_button");
+ log_filter_author_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_author_entry"));
+ log_filter_grep_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_grep_entry"));
+ log_filter_from_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_from_check"));
+ log_filter_to_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_to_check"));
+ log_filter_from_calendar = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_from_calendar"));
+ log_filter_to_calendar = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_to_calendar"));
+ log_filter_from_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_from_entry"));
+ log_filter_to_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_to_entry"));
+ log_filter_clear_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_filter_clear_button"));
/* Each widget that has some kind of filter must have a "filter name"
* associated with it so that we can generically see how many filters
@@ -764,29 +796,47 @@ GtkWidget *
git_log_window_create (Git *plugin)
{
LogData *data;
+ gchar *objects[] = {"log_window", NULL};
+ GError *error;
GtkWidget *log_window;
GtkWidget *log_vbox;
GtkWidget *log_changes_view;
GtkWidget *log_view_button;
+ GtkWidget *log_browse_button;
GtkWidget *log_whole_project_check;
GtkWidget *log_path_entry;
+ GtkWidget *log_path_entry_hbox;
GtkTreeSelection *selection;
data = g_new0 (LogData, 1);
- data->gxml = glade_xml_new (GLADE_FILE, "log_window", NULL);
+ data->bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (data->bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
data->plugin = plugin;
data->path = NULL;
data->graph_renderer = giggle_graph_renderer_new ();
- log_window = glade_xml_get_widget (data->gxml, "log_window");
- log_vbox = glade_xml_get_widget (data->gxml, "log_vbox");
- log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
- log_whole_project_check = glade_xml_get_widget (data->gxml,
- "log_whole_project_check");
- log_path_entry = glade_xml_get_widget (data->gxml, "log_path_entry");
- log_view_button = glade_xml_get_widget (data->gxml,
- "log_view_button");
+ log_window = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_window"));
+ log_vbox = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_vbox"));
+ log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_changes_view"));
+ log_view_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_view_button"));
+ log_browse_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_browse_button"));
+ log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_whole_project_check"));
+ log_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry"));
+ log_path_entry_hbox = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry_hbox"));
g_object_set_data (G_OBJECT (log_vbox), "log-data", data);
@@ -795,6 +845,7 @@ git_log_window_create (Git *plugin)
g_signal_connect (G_OBJECT (log_changes_view), "query-tooltip",
G_CALLBACK (on_log_changes_view_query_tooltip),
data);
+
g_signal_connect (G_OBJECT (log_changes_view), "button-press-event",
G_CALLBACK (on_log_changes_view_button_press_event),
plugin);
@@ -803,9 +854,14 @@ git_log_window_create (Git *plugin)
g_signal_connect (G_OBJECT (log_view_button), "clicked",
G_CALLBACK (on_log_view_button_clicked),
data);
+
+ g_signal_connect (G_OBJECT (log_browse_button), "clicked",
+ G_CALLBACK (on_log_browse_button_clicked),
+ data);
g_object_set_data (G_OBJECT (log_whole_project_check), "file-entry",
- log_path_entry);
+ log_path_entry_hbox);
+
g_signal_connect (G_OBJECT (log_whole_project_check), "toggled",
G_CALLBACK (on_git_whole_project_toggled), plugin);
@@ -846,10 +902,10 @@ on_fm_git_log (GtkAction *action, Git *plugin)
GtkWidget *log_whole_project_check;
data = g_object_get_data (G_OBJECT (plugin->log_viewer), "log-data");
- log_path_entry = glade_xml_get_widget (data->gxml,
- "log_path_entry");
- log_whole_project_check = glade_xml_get_widget (data->gxml,
- "log_whole_project_check");
+ log_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry"));
+ log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_whole_project_check"));
gtk_entry_set_text (GTK_ENTRY (log_path_entry),
plugin->current_fm_filename);
@@ -868,7 +924,7 @@ git_log_window_clear (Git *plugin)
GtkTextBuffer *buffer;
data = g_object_get_data (G_OBJECT (plugin->log_viewer), "log-data");
- log_text_view = glade_xml_get_widget (data->gxml, "log_text_view");
+ log_text_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_text_view"));
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_text_view));
gtk_list_store_clear (data->list_store);
@@ -886,7 +942,8 @@ git_log_get_selected_revision (Git *plugin)
GtkTreeIter iter;
data = g_object_get_data (G_OBJECT (plugin->log_viewer), "log-data");
- log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+ log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_changes_view"));
revision = NULL;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (log_changes_view));
@@ -905,7 +962,8 @@ git_log_get_path (Git *plugin)
GtkWidget *log_path_entry;
data = g_object_get_data (G_OBJECT (plugin->log_viewer), "log-data");
- log_path_entry = glade_xml_get_widget (data->gxml, "log_path_entry");
+ log_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "log_path_entry"));
return gtk_editable_get_chars (GTK_EDITABLE (log_path_entry), 0, -1);
}
diff --git a/plugins/git/git-merge-dialog.c b/plugins/git/git-merge-dialog.c
index c1fb142..350d231 100644
--- a/plugins/git/git-merge-dialog.c
+++ b/plugins/git/git-merge-dialog.c
@@ -59,12 +59,16 @@ on_merge_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- merge_branch_combo = glade_xml_get_widget (data->gxml, "merge_branch_combo");
- no_commit_check = glade_xml_get_widget (data->gxml, "no_commit_check");
- squash_check = glade_xml_get_widget (data->gxml, "squash_check");
- use_custom_log_check = glade_xml_get_widget (data->gxml,
- "use_custom_log_check");
- merge_log_view = glade_xml_get_widget (data->gxml, "merge_log_view");
+ merge_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "merge_branch_combo"));
+ no_commit_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "no_commit_check"));
+ squash_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "squash_check"));
+ use_custom_log_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "use_custom_log_check"));
+ merge_log_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "merge_log_view"));
log = NULL;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (use_custom_log_check)))
@@ -126,7 +130,9 @@ on_use_custom_log_check_toggled (GtkToggleButton *toggle_button, GtkWidget *merg
static void
merge_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"merge_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *merge_branch_combo;
GtkWidget *use_custom_log_check;
@@ -135,13 +141,21 @@ merge_dialog (Git *plugin)
GitBranchComboData *data;
GitBranchListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "merge_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "merge_dialog");
- merge_branch_combo = glade_xml_get_widget (gxml, "merge_branch_combo");
- use_custom_log_check = glade_xml_get_widget (gxml,
- "use_custom_log_check");
- merge_log_view = glade_xml_get_widget (gxml, "merge_log_view");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "merge_dialog"));
+ merge_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "merge_branch_combo"));
+ use_custom_log_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "use_custom_log_check"));
+ merge_log_view = GTK_WIDGET (gtk_builder_get_object (bxml, "merge_log_view"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (merge_branch_combo),
@@ -149,7 +163,7 @@ merge_dialog (Git *plugin)
git_branch_combo_model_setup_widget (merge_branch_combo);
data = git_branch_combo_data_new (branch_list_store,
- GTK_COMBO_BOX (merge_branch_combo), gxml,
+ GTK_COMBO_BOX (merge_branch_combo), bxml,
plugin);
list_command = git_branch_list_command_new (plugin->project_root_directory,
diff --git a/plugins/git/git-pull-dialog.c b/plugins/git/git-pull-dialog.c
index 2186f6e..87900f5 100644
--- a/plugins/git/git-pull-dialog.c
+++ b/plugins/git/git-pull-dialog.c
@@ -59,23 +59,24 @@ on_pull_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- pull_origin_check = glade_xml_get_widget (data->gxml,
- "pull_origin_check");
- pull_rebase_check = glade_xml_get_widget (data->gxml,
- "pull_rebase_check");
- pull_url_entry = glade_xml_get_widget (data->gxml, "pull_url_entry");
- pull_no_commit_check = glade_xml_get_widget (data->gxml,
- "pull_no_commit_check");
- pull_squash_check = glade_xml_get_widget (data->gxml,
- "pull_squash_check");
- pull_fast_forward_commit_check = glade_xml_get_widget (data->gxml,
- "pull_fast_forward_commit_check");
- pull_append_fetch_data_check = glade_xml_get_widget (data->gxml,
- "pull_append_fetch_data_check");
- pull_force_check = glade_xml_get_widget (data->gxml,
- "pull_force_check");
- pull_no_follow_tags_check = glade_xml_get_widget (data->gxml,
- "pull_no_follow_tags_check");
+ pull_origin_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_origin_check"));
+ pull_rebase_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_rebase_check"));
+ pull_url_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_url_entry"));
+ pull_no_commit_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_no_commit_check"));
+ pull_squash_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_squash_check"));
+ pull_fast_forward_commit_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_fast_forward_commit_check"));
+ pull_append_fetch_data_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_append_fetch_data_check"));
+ pull_force_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_force_check"));
+ pull_no_follow_tags_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "pull_no_follow_tags_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pull_origin_check)))
url = g_strdup ("origin");
@@ -122,17 +123,30 @@ on_pull_dialog_response (GtkDialog *dialog, gint response_id,
static void
pull_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"pull_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *pull_origin_check;
GtkWidget *pull_url_entry;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "pull_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "pull_dialog");
- pull_origin_check = glade_xml_get_widget (gxml, "pull_origin_check");
- pull_url_entry = glade_xml_get_widget (gxml, "pull_url_entry");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "pull_dialog"));
+ pull_origin_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "pull_origin_check"));
+ pull_url_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "pull_url_entry"));
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_pull_dialog_response),
diff --git a/plugins/git/git-push-dialog.c b/plugins/git/git-push-dialog.c
index e7b324d..e3eaa81 100644
--- a/plugins/git/git-push-dialog.c
+++ b/plugins/git/git-push-dialog.c
@@ -55,11 +55,14 @@ on_push_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- push_origin_check = glade_xml_get_widget (data->gxml,
- "push_origin_check");
- push_url_entry = glade_xml_get_widget (data->gxml, "push_url_entry");
- push_all_check = glade_xml_get_widget (data->gxml, "push_all_check");
- push_tags_check = glade_xml_get_widget (data->gxml, "push_tags_check");
+ push_origin_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "push_origin_check"));
+ push_url_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "push_url_entry"));
+ push_all_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "push_all_check"));
+ push_tags_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "push_tags_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (push_origin_check)))
url = g_strdup ("origin");
@@ -108,19 +111,31 @@ on_push_dialog_response (GtkDialog *dialog, gint response_id,
static void
push_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"push_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *push_origin_check;
GtkWidget *push_url_entry;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "push_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "push_dialog");
- push_origin_check = glade_xml_get_widget (gxml, "push_origin_check");
- push_url_entry = glade_xml_get_widget (gxml, "push_url_entry");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "push_dialog"));
+ push_origin_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "push_origin_check"));
+ push_url_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "push_url_entry"));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_push_dialog_response),
diff --git a/plugins/git/git-rebase-dialog.c b/plugins/git/git-rebase-dialog.c
index 4f775a9..abab746 100644
--- a/plugins/git/git-rebase-dialog.c
+++ b/plugins/git/git-rebase-dialog.c
@@ -37,17 +37,17 @@ on_rebase_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- rebase_branch_combo = glade_xml_get_widget (data->gxml,
- "rebase_branch_combo");
- rebase_origin_check = glade_xml_get_widget (data->gxml,
- "rebase_origin_check");
+ rebase_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "rebase_branch_combo"));
+ rebase_origin_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "rebase_origin_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rebase_origin_check)))
branch = g_strdup ("origin");
else
{
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (rebase_branch_combo),
- &iter);
+ &iter);
branch = git_branch_combo_model_get_branch (data->model, &iter);
}
@@ -87,7 +87,9 @@ on_rebase_dialog_response (GtkDialog *dialog, gint response_id,
static void
rebase_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"rebase_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *rebase_branch_combo;
GtkWidget *rebase_origin_check;
@@ -95,11 +97,21 @@ rebase_dialog (Git *plugin)
GitBranchComboData *data;
GitBranchListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "rebase_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "rebase_dialog");
- rebase_branch_combo = glade_xml_get_widget (gxml, "rebase_branch_combo");
- rebase_origin_check = glade_xml_get_widget (gxml, "rebase_origin_check");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "rebase_dialog"));
+ rebase_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "rebase_branch_combo"));
+ rebase_origin_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "rebase_origin_check"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (rebase_branch_combo),
@@ -107,7 +119,7 @@ rebase_dialog (Git *plugin)
git_branch_combo_model_setup_widget (rebase_branch_combo);
data = git_branch_combo_data_new (branch_list_store,
- GTK_COMBO_BOX (rebase_branch_combo), gxml,
+ GTK_COMBO_BOX (rebase_branch_combo), bxml,
plugin);
list_command = git_branch_list_command_new (plugin->project_root_directory,
diff --git a/plugins/git/git-remove-dialog.c b/plugins/git/git-remove-dialog.c
index c282293..38313ce 100644
--- a/plugins/git/git-remove-dialog.c
+++ b/plugins/git/git-remove-dialog.c
@@ -53,9 +53,10 @@ on_remove_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- remove_file_chooser_button = glade_xml_get_widget (data->gxml,
- "remove_file_chooser_button");
- force_check = glade_xml_get_widget (data->gxml, "force_check");
+ remove_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "remove_file_chooser_button"));
+ force_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "force_check"));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (remove_file_chooser_button));
if (git_check_input (GTK_WIDGET (dialog), remove_file_chooser_button, filename,
@@ -87,23 +88,33 @@ on_remove_dialog_response (GtkDialog *dialog, gint response_id,
static void
remove_dialog (Git *plugin, const gchar *filename)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"remove_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *remove_file_chooser_button;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "remove_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "remove_dialog");
- remove_file_chooser_button = glade_xml_get_widget (gxml,
- "remove_file_chooser_button");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "remove_dialog"));
+ remove_file_chooser_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "remove_file_chooser_button"));
if (filename)
{
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (remove_file_chooser_button),
filename);
}
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_remove_dialog_response),
diff --git a/plugins/git/git-reset-dialog.c b/plugins/git/git-reset-dialog.c
index ca55c8f..4db29b3 100644
--- a/plugins/git/git-reset-dialog.c
+++ b/plugins/git/git-reset-dialog.c
@@ -38,14 +38,14 @@ on_reset_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- reset_revision_radio = glade_xml_get_widget (data->gxml,
- "reset_revision_radio");
- reset_revision_entry = glade_xml_get_widget (data->gxml,
- "reset_revision_entry");
- reset_soft_radio = glade_xml_get_widget (data->gxml,
- "reset_soft_radio");
- reset_hard_radio = glade_xml_get_widget (data->gxml,
- "reset_hard_radio");
+ reset_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_revision_radio"));
+ reset_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_revision_entry"));
+ reset_soft_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_soft_radio"));
+ reset_hard_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_hard_radio"));
revision = NULL;
mode = GIT_RESET_TREE_MODE_MIXED;
@@ -105,10 +105,10 @@ on_reset_revision_radio_toggled (GtkToggleButton *toggle_button,
GtkWidget *reset_revision_entry;
gboolean active;
- reset_dialog = glade_xml_get_widget (data->gxml,
- "reset_dialog");
- reset_revision_entry = glade_xml_get_widget (data->gxml,
- "reset_revision_entry");
+ reset_dialog = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_dialog"));
+ reset_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "reset_revision_entry"));
active = gtk_toggle_button_get_active (toggle_button);
gtk_widget_set_sensitive (reset_revision_entry, active);
@@ -124,19 +124,30 @@ on_reset_revision_radio_toggled (GtkToggleButton *toggle_button,
static void
reset_dialog (Git *plugin, const gchar *revision)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"reset_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *reset_revision_radio;
GtkWidget *reset_revision_entry;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "reset_dialog", NULL);
- dialog = glade_xml_get_widget (gxml, "reset_dialog");
- reset_revision_radio = glade_xml_get_widget (gxml,
- "reset_revision_radio");
- reset_revision_entry = glade_xml_get_widget (gxml,
- "reset_revision_entry");
- data = git_ui_data_new (plugin, gxml);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "reset_dialog"));
+ reset_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "reset_revision_radio"));
+ reset_revision_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "reset_revision_entry"));
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_reset_dialog_response),
diff --git a/plugins/git/git-resolve-dialog.c b/plugins/git/git-resolve-dialog.c
index f4f3ca2..6f66652 100644
--- a/plugins/git/git-resolve-dialog.c
+++ b/plugins/git/git-resolve-dialog.c
@@ -51,7 +51,8 @@ on_resolve_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- resolve_status_view = glade_xml_get_widget (data->gxml, "resolve_status_view");
+ resolve_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "resolve_status_view"));
selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (resolve_status_view));
add_command = git_add_command_new_list (data->plugin->project_root_directory,
selected_paths, FALSE);
@@ -72,7 +73,9 @@ on_resolve_dialog_response (GtkDialog *dialog, gint response_id,
static void
resolve_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"resolve_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *resolve_select_all_button;
GtkWidget *resolve_clear_button;
@@ -81,13 +84,24 @@ resolve_dialog (Git *plugin)
GitStatusCommand *status_command;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "resolve_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "resolve_dialog");
- resolve_select_all_button = glade_xml_get_widget (gxml, "resolve_select_all_button");
- resolve_clear_button = glade_xml_get_widget (gxml, "resolve_clear_button");
- resolve_status_view = glade_xml_get_widget (gxml, "resolve_status_view");
- resolve_status_progress_bar = glade_xml_get_widget (gxml, "resolve_status_progress_bar");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "resolve_dialog"));
+ resolve_select_all_button = GTK_WIDGET(gtk_builder_get_object (bxml, "resolve_select_all_button"));
+ resolve_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "resolve_clear_button"));
+ resolve_status_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "resolve_status_view"));
+ resolve_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "resolve_status_progress_bar"));
status_command = git_status_command_new (plugin->project_root_directory,
GIT_STATUS_SECTION_NOT_UPDATED);
@@ -124,7 +138,7 @@ resolve_dialog (Git *plugin)
anjuta_command_start (ANJUTA_COMMAND (status_command));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_resolve_dialog_response),
diff --git a/plugins/git/git-revert-dialog.c b/plugins/git/git-revert-dialog.c
index 027b57f..896ad1e 100644
--- a/plugins/git/git-revert-dialog.c
+++ b/plugins/git/git-revert-dialog.c
@@ -35,10 +35,10 @@ on_revert_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- revert_revision_entry = glade_xml_get_widget (data->gxml,
- "revert_revision_entry");
- revert_no_commit_check = glade_xml_get_widget (data->gxml,
- "revert_no_commit_check");
+ revert_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "revert_revision_entry"));
+ revert_no_commit_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "revert_no_commit_check"));
revision = gtk_editable_get_chars (GTK_EDITABLE (revert_revision_entry),
0, -1);
@@ -77,18 +77,28 @@ on_revert_dialog_response (GtkDialog *dialog, gint response_id,
static void
revert_dialog (Git *plugin, const gchar *revision)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"revert_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *revert_revision_entry;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "revert_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "revert_dialog");
- revert_revision_entry = glade_xml_get_widget (gxml,
- "revert_revision_entry");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "revert_dialog"));
+ revert_revision_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "revert_revision_entry"));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
if (revision)
gtk_entry_set_text (GTK_ENTRY (revert_revision_entry), revision);
diff --git a/plugins/git/git-switch-dialog.c b/plugins/git/git-switch-dialog.c
index 0167c8a..70d00cf 100644
--- a/plugins/git/git-switch-dialog.c
+++ b/plugins/git/git-switch-dialog.c
@@ -52,7 +52,8 @@ on_switch_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- switch_branch_combo = glade_xml_get_widget (data->gxml, "switch_branch_combo");
+ switch_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "switch_branch_combo"));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (switch_branch_combo), &iter);
branch = git_branch_combo_model_get_branch (data->model, &iter);
@@ -82,17 +83,28 @@ on_switch_dialog_response (GtkDialog *dialog, gint response_id,
static void
switch_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ gchar *objects[] = {"switch_dialog", NULL};
+ GError *error;
GtkWidget *dialog;
GtkWidget *switch_branch_combo;
GtkListStore *branch_list_store;
GitBranchComboData *data;
GitBranchListCommand *list_command;
- gxml = glade_xml_new (GLADE_FILE, "switch_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_objects_from_file (bxml, BUILDER_FILE, objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "switch_dialog");
- switch_branch_combo = glade_xml_get_widget (gxml, "switch_branch_combo");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "switch_dialog"));
+ switch_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "switch_branch_combo"));
branch_list_store = git_branch_combo_model_new ();
gtk_combo_box_set_model (GTK_COMBO_BOX (switch_branch_combo),
@@ -100,7 +112,7 @@ switch_dialog (Git *plugin)
git_branch_combo_model_setup_widget (switch_branch_combo);
data = git_branch_combo_data_new (branch_list_store,
- GTK_COMBO_BOX (switch_branch_combo), gxml,
+ GTK_COMBO_BOX (switch_branch_combo), bxml,
plugin);
list_command = git_branch_list_command_new (plugin->project_root_directory,
diff --git a/plugins/git/git-ui-utils.c b/plugins/git/git-ui-utils.c
index bdd103a..f7c47c7 100644
--- a/plugins/git/git-ui-utils.c
+++ b/plugins/git/git-ui-utils.c
@@ -32,11 +32,11 @@ typedef struct
} PulseProgressData;
GitUIData*
-git_ui_data_new (Git* plugin, GladeXML* gxml)
+git_ui_data_new (Git* plugin, GtkBuilder *bxml)
{
GitUIData* data = g_new0 (GitUIData, 1);
data->plugin = plugin;
- data->gxml = gxml;
+ data->bxml = bxml;
return data;
}
@@ -44,7 +44,7 @@ git_ui_data_new (Git* plugin, GladeXML* gxml)
void
git_ui_data_free (GitUIData* data)
{
- g_object_unref (data->gxml);
+ g_object_unref (data->bxml);
g_free (data);
}
diff --git a/plugins/git/git-ui-utils.h b/plugins/git/git-ui-utils.h
index ed8e4cc..ad28488 100644
--- a/plugins/git/git-ui-utils.h
+++ b/plugins/git/git-ui-utils.h
@@ -37,7 +37,7 @@
typedef struct
{
- GladeXML* gxml;
+ GtkBuilder *bxml;
Git* plugin;
} GitUIData;
@@ -48,7 +48,7 @@ typedef struct
gchar *text;
} GitProgressData;
-GitUIData* git_ui_data_new (Git* plugin, GladeXML* gxml);
+GitUIData* git_ui_data_new (Git* plugin, GtkBuilder *bxml);
void git_ui_data_free (GitUIData* data);
GitProgressData *git_progress_data_new (Git *plugin, const gchar *text);
void git_progress_data_free (GitProgressData *data);
diff --git a/plugins/git/git-unstage-dialog.c b/plugins/git/git-unstage-dialog.c
index cd48c49..54c3ed1 100644
--- a/plugins/git/git-unstage-dialog.c
+++ b/plugins/git/git-unstage-dialog.c
@@ -51,7 +51,8 @@ on_unstage_dialog_response (GtkDialog *dialog, gint response_id,
if (response_id == GTK_RESPONSE_OK)
{
- unstage_status_view = glade_xml_get_widget (data->gxml, "unstage_status_view");
+ unstage_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "unstage_status_view"));
selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (unstage_status_view));
reset_files_command = git_reset_files_command_new (data->plugin->project_root_directory,
GIT_RESET_FILES_HEAD,
@@ -73,7 +74,8 @@ on_unstage_dialog_response (GtkDialog *dialog, gint response_id,
static void
unstage_dialog (Git *plugin)
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
+ GError *error;
GtkWidget *dialog;
GtkWidget *unstage_select_all_button;
GtkWidget *unstage_clear_button;
@@ -82,13 +84,24 @@ unstage_dialog (Git *plugin)
GitStatusCommand *status_command;
GitUIData *data;
- gxml = glade_xml_new (GLADE_FILE, "unstage_dialog", NULL);
+ bxml = gtk_builder_new ();
+ error = NULL;
+
+ if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
- dialog = glade_xml_get_widget (gxml, "unstage_dialog");
- unstage_select_all_button = glade_xml_get_widget (gxml, "unstage_select_all_button");
- unstage_clear_button = glade_xml_get_widget (gxml, "unstage_clear_button");
- unstage_status_view = glade_xml_get_widget (gxml, "unstage_status_view");
- unstage_status_progress_bar = glade_xml_get_widget (gxml, "unstage_status_progress_bar");
+ dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "unstage_dialog"));
+ unstage_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "unstage_select_all_button"));
+ unstage_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "unstage_clear_button"));
+ unstage_status_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "unstage_status_view"));
+ unstage_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "unstage_status_progress_bar"));
status_command = git_status_command_new (plugin->project_root_directory,
GIT_STATUS_SECTION_COMMIT);
@@ -125,7 +138,7 @@ unstage_dialog (Git *plugin)
anjuta_command_start (ANJUTA_COMMAND (status_command));
- data = git_ui_data_new (plugin, gxml);
+ data = git_ui_data_new (plugin, bxml);
g_signal_connect(G_OBJECT (dialog), "response",
G_CALLBACK (on_unstage_dialog_response),
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 81221e2..e256eb2 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -48,7 +48,7 @@
#include "git-push-dialog.h"
#include "git-apply-mailbox-dialog.h"
-#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-git.ui"
+#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-git.xml"
static gpointer parent_class;
diff --git a/plugins/git/plugin.h b/plugins/git/plugin.h
index e128fec..7df0a46 100644
--- a/plugins/git/plugin.h
+++ b/plugins/git/plugin.h
@@ -43,7 +43,7 @@ extern GType git_get_type (GTypeModule *module);
typedef struct _Git Git;
typedef struct _GitClass GitClass;
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-git.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-git.ui"
#define ICON_FILE "anjuta-git-plugin-48.png"
struct _Git
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
