[anjuta] git: Use actions for recurring items in the glade file
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] git: Use actions for recurring items in the glade file
- Date: Mon, 25 Mar 2013 20:27:07 +0000 (UTC)
commit 269802579c05a16c6438b32857882a4c5b6fa34d
Author: James Liggett <jrliggett cox net>
Date: Sat Mar 9 15:53:26 2013 -0800
git: Use actions for recurring items in the glade file
Glade doesn't support unique names within toplevels only anymore, so use
an action for common widgets like OK and Cancel buttons, and other common check
boxes like Force or Add Signed Off By Line.
plugins/git/anjuta-git.ui | 774 ++++++++++++++++++--------------
plugins/git/git-add-files-pane.c | 39 +-
plugins/git/git-add-remote-pane.c | 22 +-
plugins/git/git-apply-mailbox-pane.c | 34 +-
plugins/git/git-checkout-pane.c | 31 +-
plugins/git/git-cherry-pick-pane.c | 53 ++-
plugins/git/git-commit-pane.c | 40 +-
plugins/git/git-create-branch-pane.c | 40 +-
plugins/git/git-create-tag-pane.c | 67 ++--
plugins/git/git-delete-branches-pane.c | 22 +-
plugins/git/git-merge-pane.c | 70 ++--
plugins/git/git-patch-series-pane.c | 42 +-
plugins/git/git-pull-pane.c | 58 ++--
plugins/git/git-push-pane.c | 39 +-
plugins/git/git-remove-files-pane.c | 43 +-
plugins/git/git-reset-pane.c | 25 +-
plugins/git/git-revert-pane.c | 25 +-
plugins/git/git-stash-changes-pane.c | 22 +-
18 files changed, 783 insertions(+), 663 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index dc45358..7fa31a0 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires anjuta 0.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAction" id="cancel_action">
+ <property name="label" translatable="yes">Cancel</property>
+ </object>
+ <object class="GtkToggleAction" id="force_action">
+ <property name="label" translatable="yes">Force</property>
+ </object>
+ <object class="GtkToggleAction" id="no_commit_action">
+ <property name="label" translatable="yes">Do not commit</property>
+ </object>
+ <object class="GtkAction" id="ok_action">
+ <property name="label" translatable="yes">OK</property>
+ </object>
+ <object class="GtkToggleAction" id="signoff_action">
+ <property name="label" translatable="yes">Add signed off by line</property>
+ </object>
+ <object class="GtkToggleAction" id="squash_action">
+ <property name="label" translatable="yes">Squash</property>
+ </object>
<object class="GtkVBox" id="add_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -18,7 +35,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaFileList" id="file_list">
+ <object class="AnjutaFileList" id="add_file_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -57,10 +74,12 @@
<child>
<object class="GtkCheckButton" id="force_check">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
</child>
@@ -92,10 +111,11 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -107,10 +127,11 @@
<child>
<object class="GtkButton" id="ok_button">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -131,13 +152,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -152,7 +173,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Remote name:</property>
@@ -169,13 +190,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -190,7 +211,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">URL:</property>
@@ -207,13 +228,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -227,7 +248,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -242,7 +262,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -259,18 +279,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button1">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -280,12 +301,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button1">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -306,13 +328,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -327,7 +349,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Mailbox files to apply:</property>
@@ -344,23 +366,24 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="signoff_check">
<property name="label" translatable="yes">Add signed off by line</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">signoff_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -368,7 +391,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -385,18 +408,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button2">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -406,12 +430,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button2">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -444,13 +469,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -465,10 +490,13 @@
<property name="can_focus">True</property>
<property name="model">branches_list_model</property>
<property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="branch_selected_column">
- <property name="title">column</property>
<property name="visible">False</property>
+ <property name="title">column</property>
<child>
<object class="GtkCellRendererToggle" id="branch_selected_renderer"/>
<attributes>
@@ -498,7 +526,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Branches</property>
@@ -519,27 +547,29 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="force_check">
+ <object class="GtkCheckButton" id="force_check1">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="relief">none</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -554,7 +584,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -571,18 +601,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button3">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -592,12 +623,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button3">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -618,28 +650,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="cherry_pick_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="help_text" translatable="yes">Drop or enter revision here</property>
+ <property name="help_text">Drop or enter revision here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Commit to cherry pick:</property>
@@ -656,27 +688,29 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="no_commit_check">
<property name="label" translatable="yes">Do not commit</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">no_commit_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -691,7 +725,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -701,12 +735,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="signoff_check">
+ <object class="GtkCheckButton" id="signoff_check1">
<property name="label" translatable="yes">Append signed-off-by line</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -720,7 +754,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -737,18 +771,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button4">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -758,12 +793,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button4">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -784,18 +820,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaColumnTextView" id="log_view">
+ <object class="AnjutaColumnTextView" id="commit_log_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
@@ -803,7 +839,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Log Message:</property>
@@ -820,18 +856,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -840,7 +876,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -856,7 +891,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -872,7 +906,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -895,18 +928,18 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Name:</property>
</object>
<packing>
- <property name="x_options"></property>
+ <property name="x_options"/>
<property name="x_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">E-mail:</property>
@@ -914,11 +947,11 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="x_options"/>
</packing>
</child>
<child>
- <object class="GtkEntry" id="name_entry">
+ <object class="GtkEntry" id="name_entry1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -958,7 +991,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -975,18 +1008,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button5">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -996,12 +1030,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button5">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1022,18 +1057,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkEntry" id="name_entry">
+ <object class="GtkEntry" id="branch_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -1043,7 +1078,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Branch name:</property>
@@ -1060,31 +1095,31 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="branch_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="text" translatable="yes">Repository head; Drop or type a different revision
here</property>
<property name="invisible_char_set">True</property>
<property name="secondary_icon_stock">gtk-clear</property>
- <property name="help_text" translatable="yes">Repository head; Drop or type a different
revision here</property>
+ <property name="help_text">Repository head; Drop or type a different revision here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Revision</property>
@@ -1101,18 +1136,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1121,7 +1156,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1136,7 +1170,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
@@ -1153,18 +1187,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox3">
+ <object class="GtkHButtonBox" id="hbuttonbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button6">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1174,12 +1209,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button6">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1200,18 +1236,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkEntry" id="name_entry">
+ <object class="GtkEntry" id="tag_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -1221,7 +1257,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Tag name:</property>
@@ -1238,31 +1274,31 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="tag_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="text" translatable="yes">Repository head; Drop or type a different revision
here</property>
<property name="invisible_char_set">True</property>
<property name="secondary_icon_stock">gtk-clear</property>
- <property name="help_text" translatable="yes">Repository head; Drop or type a different
revision here</property>
+ <property name="help_text">Repository head; Drop or type a different revision here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Revision</property>
@@ -1279,27 +1315,28 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="force_check">
+ <object class="GtkCheckButton" id="force_check2">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1315,7 +1352,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1331,7 +1367,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1342,12 +1377,12 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaColumnTextView" id="log_view">
+ <object class="AnjutaColumnTextView" id="create_tag_log_view">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -1365,7 +1400,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
@@ -1382,18 +1417,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox3">
+ <object class="GtkHButtonBox" id="hbuttonbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button7">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1403,12 +1439,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button7">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1429,18 +1466,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame14">
+ <object class="GtkFrame" id="frame20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment14">
+ <object class="GtkAlignment" id="alignment21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1449,7 +1486,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1464,7 +1500,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -1481,18 +1517,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button8">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1502,12 +1539,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button8">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1524,6 +1562,12 @@
</packing>
</child>
</object>
+ <object class="GtkListStore" id="remotes_list_model">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkListStore" id="log_branch_combo_model">
<columns>
<!-- column-name active -->
@@ -1556,13 +1600,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame10">
+ <object class="GtkFrame" id="frame21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment10">
+ <object class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -1577,7 +1621,7 @@
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="yes">Whole project; Drop a file here or type a
path to view a file or folder log</property>
+ <property name="text" translatable="yes">Whole project; Drop a file here to view a
file or folder log</property>
<property name="help_text" translatable="yes">Whole project; Drop a file here to
view a file or folder log</property>
</object>
<packing>
@@ -1591,7 +1635,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label19">
+ <object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">View the Log for File/Folder:</property>
@@ -1608,13 +1652,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame17">
+ <object class="GtkFrame" id="frame22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment17">
+ <object class="GtkAlignment" id="alignment23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -1640,7 +1684,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Branch:</property>
@@ -1673,13 +1717,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkFrame" id="frame18">
+ <object class="GtkFrame" id="frame23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment18">
+ <object class="GtkAlignment" id="alignment24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -1690,7 +1734,7 @@
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
@@ -1700,6 +1744,9 @@
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="has_tooltip">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="ref_icon_column">
<property name="resizable">True</property>
@@ -1744,7 +1791,7 @@
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">page 1</property>
@@ -1754,7 +1801,7 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
@@ -1763,6 +1810,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">log_loading_model</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1"/>
</child>
@@ -1795,7 +1845,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">page 2</property>
@@ -1810,7 +1860,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label22">
+ <object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Changes:</property>
@@ -1826,13 +1876,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame20">
+ <object class="GtkFrame" id="frame24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment20">
+ <object class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -1853,7 +1903,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label23">
+ <object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Log Message:</property>
@@ -1887,30 +1937,30 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="merge_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
<property name="secondary_icon_stock">gtk-clear</property>
- <property name="help_text" translatable="yes">Drop or enter revision here</property>
+ <property name="help_text">Drop or enter revision here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Revision to merge with:</property>
@@ -1927,27 +1977,28 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="do_not_commit_check">
<property name="label" translatable="yes">Do not commit</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">no_commit_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1960,10 +2011,11 @@
<child>
<object class="GtkCheckButton" id="squash_check">
<property name="label" translatable="yes">Squash</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">squash_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1979,7 +2031,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1990,7 +2041,7 @@
</packing>
</child>
<child>
- <object class="AnjutaColumnTextView" id="log_view">
+ <object class="AnjutaColumnTextView" id="merge_log_view">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -2006,7 +2057,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -2023,18 +2074,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button9">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2044,12 +2096,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button9">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2070,30 +2123,30 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="patch_series_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="text" translatable="yes">Repository origin; Drop or type a different
revision here</property>
<property name="secondary_icon_stock">gtk-clear</property>
- <property name="help_text" translatable="yes">Repository origin; Drop or type a different
revision here</property>
+ <property name="help_text">Repository origin; Drop or type a different revision
here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Generate patches relative to:</property>
@@ -2110,13 +2163,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -2130,7 +2183,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Folder to create patches in:</property>
@@ -2147,27 +2200,28 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="signoff_check">
+ <object class="GtkCheckButton" id="signoff_check2">
<property name="label" translatable="yes">Add signed off by line</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">signoff_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2182,7 +2236,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -2199,18 +2253,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button10">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2220,12 +2275,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button10">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2246,13 +2302,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="repository_alignment">
+ <object class="GtkAlignment" id="pushrepository_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -2262,7 +2318,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">1</property>
@@ -2280,18 +2336,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2300,7 +2356,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -2312,12 +2367,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="no_commit_check">
+ <object class="GtkCheckButton" id="no_commit_check1">
<property name="label" translatable="yes">Do not commit</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">no_commit_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2328,12 +2384,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="squash_check">
+ <object class="GtkCheckButton" id="squash_check1">
<property name="label" translatable="yes">Squash</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">squash_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2349,7 +2406,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2365,7 +2421,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2376,12 +2431,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="force_check">
+ <object class="GtkCheckButton" id="force_check3">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2397,7 +2453,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2412,7 +2467,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -2429,18 +2484,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button11">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2450,12 +2506,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button11">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2480,6 +2537,14 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkListStore" id="push_tag_model">
+ <columns>
+ <!-- column-name selected -->
+ <column type="gboolean"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkVBox" id="push_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2490,7 +2555,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="repository_alignment">
+ <object class="GtkAlignment" id="push_repository_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -2521,23 +2586,23 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="branches_view">
+ <object class="GtkTreeView" id="push_branches_view">
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2545,8 +2610,11 @@
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection4"/>
+ </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="title">column</property>
<child>
<object class="GtkCellRendererToggle" id="branches_selected_renderer"/>
@@ -2569,13 +2637,13 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Branches:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2586,23 +2654,23 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="tags_view">
+ <object class="GtkTreeView" id="push_tags_view">
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2610,8 +2678,11 @@
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection5"/>
+ </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="title">column</property>
<child>
<object class="GtkCellRendererToggle" id="tags_selected_renderer"/>
@@ -2634,13 +2705,13 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label6">
+ <object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Tags:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2658,18 +2729,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2678,7 +2749,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2694,7 +2764,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2705,12 +2774,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="force_check">
+ <object class="GtkCheckButton" id="force_check4">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -2725,7 +2795,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -2742,18 +2812,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button12">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2763,12 +2834,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button12">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2785,36 +2857,22 @@
</packing>
</child>
</object>
- <object class="GtkListStore" id="push_tag_model">
- <columns>
- <!-- column-name selected -->
- <column type="gboolean"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="remotes_list_model">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkVBox" id="remotes_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
@@ -2825,8 +2883,11 @@
<property name="model">remotes_list_model</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection6"/>
+ </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn7">
<property name="title">column</property>
<child>
<object class="GtkCellRendererText" id="name_renderer"/>
@@ -2843,7 +2904,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Remote Repositories:</property>
@@ -2864,18 +2925,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaFileList" id="file_list">
+ <object class="AnjutaFileList" id="remove_file_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -2884,7 +2945,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Remove Files:</property>
@@ -2901,30 +2962,32 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkCheckButton" id="force_check">
+ <object class="GtkCheckButton" id="force_check5">
<property name="label" translatable="yes">Force</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">force_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -2941,18 +3004,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button13">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2962,12 +3026,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button13">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -2988,28 +3053,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame38">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment38">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="AnjutaDropEntry" id="revision_entry">
+ <object class="AnjutaDropEntry" id="reset_revision_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="help_text" translatable="yes">Previous commit; Drop or enter a different
revision here</property>
+ <property name="help_text">Previous commit; Drop or enter a different revision
here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Revision:</property>
@@ -3026,18 +3091,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -3046,7 +3111,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -3062,7 +3127,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">mixed_radio</property>
@@ -3079,7 +3144,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">mixed_radio</property>
@@ -3095,7 +3160,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Mode:</property>
@@ -3112,18 +3177,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button14">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3133,12 +3199,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button14">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3159,13 +3226,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame40">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment40">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -3174,13 +3241,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="help_text" translatable="yes">Drop or type a revision here</property>
+ <property name="help_text">Drop or type a revision here</property>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Commit to revert:</property>
@@ -3197,27 +3264,29 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="no_commit_check">
+ <object class="GtkCheckButton" id="no_commit_check2">
<property name="label" translatable="yes">Do not commit</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">no_commit_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -3231,7 +3300,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -3248,18 +3317,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button15">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3269,12 +3339,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button15">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3295,13 +3366,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -3314,7 +3385,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Stash Message (Optional):</property>
@@ -3331,13 +3402,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -3347,7 +3418,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -3355,7 +3425,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options:</property>
@@ -3372,18 +3442,19 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button16">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">cancel_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3393,12 +3464,13 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button16">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3429,18 +3501,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
@@ -3451,8 +3523,11 @@
<property name="model">stash_list_model</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection7"/>
+ </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn8">
<property name="title">column</property>
<child>
<object class="GtkCellRendererText" id="number_renderer"/>
@@ -3463,7 +3538,7 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn9">
<property name="title">column</property>
<child>
<object class="GtkCellRendererText" id="message_renderer"/>
@@ -3480,7 +3555,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Stashed Changes:</property>
@@ -3513,18 +3588,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
@@ -3536,6 +3611,9 @@
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection8"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="status_column">
<property name="title">column</property>
@@ -3560,7 +3638,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label49">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Repository Status:</property>
@@ -3577,7 +3655,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
@@ -3588,7 +3666,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3603,7 +3680,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3618,7 +3694,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -3647,34 +3722,37 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow10">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="tags_view">
+ <object class="GtkTreeView" id="tags_view1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">tags_list_model</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection9"/>
+ </child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn10">
<property name="title">column</property>
<child>
- <object class="GtkCellRendererToggle" id="selected_renderer"/>
+ <object class="GtkCellRendererToggle" id="selected_renderer1"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
@@ -3682,10 +3760,10 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn11">
<property name="title">column</property>
<child>
- <object class="GtkCellRendererText" id="name_renderer"/>
+ <object class="GtkCellRendererText" id="name_renderer1"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
@@ -3699,7 +3777,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Tags:</property>
diff --git a/plugins/git/git-add-files-pane.c b/plugins/git/git-add-files-pane.c
index 85bb0e8..b1c4657 100644
--- a/plugins/git/git-add-files-pane.c
+++ b/plugins/git/git-add-files-pane.c
@@ -27,23 +27,23 @@ struct _GitAddFilesPanePriv
G_DEFINE_TYPE (GitAddFilesPane, git_add_files_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitAddFilesPane *self)
+on_ok_action_activated (GtkAction *action, GitAddFilesPane *self)
{
Git *plugin;
- AnjutaFileList *file_list;
- GtkToggleButton *force_check;
+ AnjutaFileList *add_file_list;
+ GtkToggleAction *force_action;
GList *paths;
GitAddCommand *add_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- file_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
- "file_list"));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
- paths = anjuta_file_list_get_paths (file_list);
+ add_file_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
+ "add_file_list"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
+ paths = anjuta_file_list_get_paths (add_file_list);
add_command = git_add_command_new_list (plugin->project_root_directory,
paths,
- gtk_toggle_button_get_active (force_check));
+ gtk_toggle_action_get_active (force_action));
anjuta_util_glist_strings_free (paths);
@@ -65,10 +65,13 @@ static void
git_add_files_pane_init (GitAddFilesPane *self)
{
gchar *objects[] = {"add_pane",
+ "ok_action",
+ "cancel_action",
+ "force_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitAddFilesPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -81,16 +84,16 @@ git_add_files_pane_init (GitAddFilesPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-add-remote-pane.c b/plugins/git/git-add-remote-pane.c
index af35cc4..f303e00 100644
--- a/plugins/git/git-add-remote-pane.c
+++ b/plugins/git/git-add-remote-pane.c
@@ -27,7 +27,7 @@ struct _GitAddRemotePanePriv
G_DEFINE_TYPE (GitAddRemotePane, git_add_remote_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitAddRemotePane *self)
+on_ok_action_activated (GtkAction *action, GitAddRemotePane *self)
{
Git *plugin;
GtkEntry *name_entry;
@@ -96,10 +96,12 @@ static void
git_add_remote_pane_init (GitAddRemotePane *self)
{
gchar *objects[] = {"add_remote_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitAddRemotePanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -112,16 +114,16 @@ git_add_remote_pane_init (GitAddRemotePane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-apply-mailbox-pane.c b/plugins/git/git-apply-mailbox-pane.c
index 650912b..0dd7762 100644
--- a/plugins/git/git-apply-mailbox-pane.c
+++ b/plugins/git/git-apply-mailbox-pane.c
@@ -27,24 +27,24 @@ struct _GitApplyMailboxPanePriv
G_DEFINE_TYPE (GitApplyMailboxPane, git_apply_mailbox_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitApplyMailboxPane *self)
+on_ok_action_activated (GtkAction *action, GitApplyMailboxPane *self)
{
Git *plugin;
AnjutaFileList *mailbox_list;
- GtkToggleButton *signoff_check;
+ GtkToggleAction *signoff_action;
GList *paths;
GitApplyMailboxCommand *apply_mailbox_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
mailbox_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
"mailbox_list"));
- signoff_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "signoff_check"));
+ signoff_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "signoff_action"));
paths = anjuta_file_list_get_paths (mailbox_list);
apply_mailbox_command = git_apply_mailbox_command_new (plugin->project_root_directory,
paths,
- gtk_toggle_button_get_active (signoff_check));
+ gtk_toggle_action_get_active (signoff_action));
git_pane_create_message_view (plugin);
@@ -73,11 +73,13 @@ static void
git_apply_mailbox_pane_init (GitApplyMailboxPane *self)
{
gchar *objects[] = {"apply_mailbox_pane",
+ "ok_action",
+ "cancel_action",
+ "signoff_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitApplyMailboxPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -90,16 +92,16 @@ git_apply_mailbox_pane_init (GitApplyMailboxPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
-
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-checkout-pane.c b/plugins/git/git-checkout-pane.c
index 0d083bc..e76e81b 100644
--- a/plugins/git/git-checkout-pane.c
+++ b/plugins/git/git-checkout-pane.c
@@ -27,22 +27,22 @@ struct _GitCheckoutPanePriv
G_DEFINE_TYPE (GitCheckoutPane, git_checkout_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitCheckoutPane *self)
+on_ok_action_activated (GtkAction *action, GitCheckoutPane *self)
{
Git *plugin;
- GtkToggleButton *force_check;
+ GtkToggleAction *force_action;
GList *paths;
GitCheckoutFilesCommand *checkout_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
paths = git_status_pane_get_selected_not_updated_items (GIT_STATUS_PANE (plugin->status_pane),
ANJUTA_VCS_STATUS_ALL);
checkout_command = git_checkout_files_command_new (plugin->project_root_directory,
paths,
- gtk_toggle_button_get_active (force_check));
+ gtk_toggle_action_get_active (force_action));
anjuta_util_glist_strings_free (paths);
@@ -64,10 +64,13 @@ static void
git_checkout_pane_init (GitCheckoutPane *self)
{
gchar *objects[] = {"checkout_pane",
+ "ok_action",
+ "cancel_action",
+ "force_action",
NULL};
GError *error = NULL;
- GtkButton *ok_button;
- GtkButton *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitCheckoutPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -80,16 +83,16 @@ git_checkout_pane_init (GitCheckoutPane *self)
g_error_free (error);
}
- ok_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-cherry-pick-pane.c b/plugins/git/git-cherry-pick-pane.c
index 97327b4..0007099 100644
--- a/plugins/git/git-cherry-pick-pane.c
+++ b/plugins/git/git-cherry-pick-pane.c
@@ -27,29 +27,29 @@ struct _GitCherryPickPanePriv
G_DEFINE_TYPE (GitCherryPickPane, git_cherry_pick_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitCherryPickPane *self)
+on_ok_action_activated (GtkAction *action, GitCherryPickPane *self)
{
Git *plugin;
- AnjutaEntry *revision_entry;
- GtkToggleButton *no_commit_check;
+ AnjutaEntry *cherry_pick_revision_entry;
+ GtkToggleAction *no_commit_action;
GtkToggleButton *show_source_check;
- GtkToggleButton *signoff_check;
+ GtkToggleAction *signoff_action;
gchar *revision;
GitCherryPickCommand *cherry_pick_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
- "revision_entry"));
- no_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "no_commit_check"));
+ cherry_pick_revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "revision_entry"));
+ no_commit_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "no_commit_action"));
show_source_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"show_source_check"));
- signoff_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "signoff_check"));
- revision = anjuta_entry_dup_text (revision_entry);
+ signoff_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "signoff_action"));
+ revision = anjuta_entry_dup_text (cherry_pick_revision_entry);
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (revision_entry), revision,
+ GTK_WIDGET (cherry_pick_revision_entry), revision,
_("Please enter a revision.")))
{
g_free (revision);
@@ -58,9 +58,9 @@ on_ok_button_clicked (GtkButton *button, GitCherryPickPane *self)
cherry_pick_command = git_cherry_pick_command_new (plugin->project_root_directory,
revision,
- gtk_toggle_button_get_active (no_commit_check),
+ gtk_toggle_action_get_active (no_commit_action),
gtk_toggle_button_get_active (show_source_check),
- gtk_toggle_button_get_active (signoff_check));
+ gtk_toggle_action_get_active (signoff_action));
git_pane_create_message_view (plugin);
@@ -89,11 +89,14 @@ static void
git_cherry_pick_pane_init (GitCherryPickPane *self)
{
gchar *objects[] = {"cherry_pick_pane",
+ "ok_action",
+ "cancel_action",
+ "signoff_action",
+ "no_commit_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitCherryPickPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -106,16 +109,16 @@ git_cherry_pick_pane_init (GitCherryPickPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
-
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-commit-pane.c b/plugins/git/git-commit-pane.c
index 9a52ca4..8615d2e 100644
--- a/plugins/git/git-commit-pane.c
+++ b/plugins/git/git-commit-pane.c
@@ -30,7 +30,7 @@ static void
on_amend_check_toggled (GtkToggleButton *button, GitCommitPane *self)
{
Git *plugin;
- AnjutaColumnTextView *log_view;
+ AnjutaColumnTextView *commit_log_view;
GtkTextBuffer *log_text_buffer;
gchar *commit_message_path;
GIOChannel *io_channel;
@@ -38,9 +38,9 @@ on_amend_check_toggled (GtkToggleButton *button, GitCommitPane *self)
GtkTextIter end_iter;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
- "log_view"));
- log_text_buffer = anjuta_column_text_view_get_buffer (log_view);
+ commit_log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
+ "commit_log_view"));
+ log_text_buffer = anjuta_column_text_view_get_buffer (commit_log_view);
/* Make sure to clear any pre-existing text */
gtk_text_buffer_set_text (log_text_buffer, "", 0);
@@ -91,10 +91,10 @@ on_use_custom_author_info_check_toggled (GtkToggleButton *button,
}
static void
-on_ok_button_clicked (GtkButton *button, GitCommitPane *self)
+on_ok_action_activated (GtkAction *action, GitCommitPane *self)
{
Git *plugin;
- AnjutaColumnTextView *log_view;
+ AnjutaColumnTextView *commit_log_view;
GtkToggleButton *amend_check;
GtkToggleButton *failed_merge_check;
GtkToggleButton *use_custom_author_info_check;
@@ -107,20 +107,20 @@ on_ok_button_clicked (GtkButton *button, GitCommitPane *self)
GitCommitCommand *commit_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE(self)));
- log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
- "log_view"));
+ commit_log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
+ "commit_log_view"));
amend_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"amend_check"));
failed_merge_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"failed_merge_check"));
use_custom_author_info_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"use_custom_author_info_check"));
- log = anjuta_column_text_view_get_text (log_view);
+ log = anjuta_column_text_view_get_text (commit_log_view);
author_name = NULL;
author_email = NULL;
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (log_view), log,
+ GTK_WIDGET (commit_log_view), log,
_("Please enter a log message.")))
{
g_free (log);
@@ -199,12 +199,14 @@ static void
git_commit_pane_init (GitCommitPane *self)
{
gchar *objects[] = {"commit_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
GtkWidget *amend_check;
GtkWidget *use_custom_author_info_check;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitCommitPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -221,10 +223,10 @@ git_commit_pane_init (GitCommitPane *self)
"amend_check"));
use_custom_author_info_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"use_custom_author_info_check"));
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
g_signal_connect (G_OBJECT (amend_check), "toggled",
G_CALLBACK (on_amend_check_toggled),
@@ -234,11 +236,11 @@ git_commit_pane_init (GitCommitPane *self)
G_CALLBACK (on_use_custom_author_info_check_toggled),
self);
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
diff --git a/plugins/git/git-create-branch-pane.c b/plugins/git/git-create-branch-pane.c
index 5aef30c..70af283 100644
--- a/plugins/git/git-create-branch-pane.c
+++ b/plugins/git/git-create-branch-pane.c
@@ -27,27 +27,27 @@ struct _GitCreateBranchPanePriv
G_DEFINE_TYPE (GitCreateBranchPane, git_create_branch_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitCreateBranchPane *self)
+on_ok_action_activated (GtkAction *action, GitCreateBranchPane *self)
{
Git *plugin;
- GtkEntry *name_entry;
- AnjutaEntry *revision_entry;
+ GtkEntry *branch_name_entry;
+ AnjutaEntry *branch_revision_entry;
GtkToggleButton *checkout_check;
gchar *name;
const gchar *revision;
GitBranchCreateCommand *create_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- name_entry = GTK_ENTRY (gtk_builder_get_object (self->priv->builder,
- "name_entry"));
- revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
- "revision_entry"));
+ branch_name_entry = GTK_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "branch_name_entry"));
+ branch_revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "branch_revision_entry"));
checkout_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"checkout_check"));
- name = gtk_editable_get_chars (GTK_EDITABLE (name_entry), 0, -1);
+ name = gtk_editable_get_chars (GTK_EDITABLE (branch_name_entry), 0, -1);
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (name_entry), name,
+ GTK_WIDGET (branch_name_entry), name,
_("Please enter a branch name.")))
{
g_free (name);
@@ -55,7 +55,7 @@ on_ok_button_clicked (GtkButton *button, GitCreateBranchPane *self)
return;
}
- revision = anjuta_entry_get_text (revision_entry);
+ revision = anjuta_entry_get_text (branch_revision_entry);
if (g_utf8_strlen (revision, -1) == 0)
revision = NULL;
@@ -86,10 +86,12 @@ static void
git_create_branch_pane_init (GitCreateBranchPane *self)
{
gchar *objects[] = {"create_branch_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitCreateBranchPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -102,16 +104,16 @@ git_create_branch_pane_init (GitCreateBranchPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-create-tag-pane.c b/plugins/git/git-create-tag-pane.c
index 4eb847b..f9d962b 100644
--- a/plugins/git/git-create-tag-pane.c
+++ b/plugins/git/git-create-tag-pane.c
@@ -27,39 +27,39 @@ struct _GitCreateTagPanePriv
G_DEFINE_TYPE (GitCreateTagPane, git_create_tag_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitCreateTagPane *self)
+on_ok_action_activated (GtkAction *action, GitCreateTagPane *self)
{
Git *plugin;
- GtkEntry *name_entry;
- AnjutaEntry *revision_entry;
- GtkToggleButton *force_check;
+ GtkEntry *tag_name_entry;
+ AnjutaEntry *tag_revision_entry;
+ GtkToggleAction *force_action;
GtkToggleButton *sign_check;
GtkToggleButton *annotate_check;
- AnjutaColumnTextView *log_view;
+ AnjutaColumnTextView *tag_log_view;
gchar *name;
const gchar *revision;
gchar *log;
GitTagCreateCommand *create_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- name_entry = GTK_ENTRY (gtk_builder_get_object (self->priv->builder,
- "name_entry"));
- revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
- "revision_entry"));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
+ tag_name_entry = GTK_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "tag_name_entry"));
+ tag_revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+ "tag_revision_entry"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
sign_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"sign_check"));
annotate_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"annotate_check"));
- log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
- "log_view"));
- name = gtk_editable_get_chars (GTK_EDITABLE (name_entry), 0, -1);
- revision = anjuta_entry_get_text (revision_entry);
+ tag_log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
+ "tag_log_view"));
+ name = gtk_editable_get_chars (GTK_EDITABLE (tag_name_entry), 0, -1);
+ revision = anjuta_entry_get_text (tag_revision_entry);
log = NULL;
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (name_entry), name,
+ GTK_WIDGET (tag_name_entry), name,
_("Please enter a tag name.")))
{
g_free (name);
@@ -72,10 +72,10 @@ on_ok_button_clicked (GtkButton *button, GitCreateTagPane *self)
if (gtk_toggle_button_get_active (annotate_check))
{
- log = anjuta_column_text_view_get_text (log_view);
+ log = anjuta_column_text_view_get_text (tag_log_view);
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (log_view), log,
+ GTK_WIDGET (tag_log_view), log,
_("Please enter a log message.")))
{
g_free (name);
@@ -90,7 +90,7 @@ on_ok_button_clicked (GtkButton *button, GitCreateTagPane *self)
revision,
log,
gtk_toggle_button_get_active (sign_check),
- gtk_toggle_button_get_active (force_check));
+ gtk_toggle_action_get_active (force_action));
g_signal_connect (G_OBJECT (create_command), "command-finished",
G_CALLBACK (git_pane_report_errors),
@@ -132,13 +132,16 @@ static void
git_create_tag_pane_init (GitCreateTagPane *self)
{
gchar *objects[] = {"create_tag_pane",
+ "ok_action",
+ "cancel_action",
+ "force_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
GtkWidget *annotate_check;
GtkWidget *sign_check;
- GtkWidget *log_view;
+ GtkWidget *tag_log_view;
self->priv = g_new0 (GitCreateTagPanePriv, 1);
@@ -152,28 +155,28 @@ git_create_tag_pane_init (GitCreateTagPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
annotate_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"annotate_check"));
sign_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"sign_check"));
- log_view = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "log_view"));
+ tag_log_view = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "tag_log_view"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
g_signal_connect (G_OBJECT (annotate_check), "toggled",
G_CALLBACK (set_widget_sensitive),
- log_view);
+ tag_log_view);
g_signal_connect (G_OBJECT (sign_check), "toggled",
G_CALLBACK (on_sign_check_toggled),
diff --git a/plugins/git/git-delete-branches-pane.c b/plugins/git/git-delete-branches-pane.c
index 079e687..b1d7f30 100644
--- a/plugins/git/git-delete-branches-pane.c
+++ b/plugins/git/git-delete-branches-pane.c
@@ -27,7 +27,7 @@ struct _GitDeleteBranchesPanePriv
G_DEFINE_TYPE (GitDeleteBranchesPane, git_delete_branches_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitDeleteBranchesPane *self)
+on_ok_action_activated (GtkAction *action, GitDeleteBranchesPane *self)
{
Git *plugin;
GtkToggleButton *require_merged_check;
@@ -124,10 +124,12 @@ static void
git_delete_branches_pane_init (GitDeleteBranchesPane *self)
{
gchar *objects[] = {"delete_branches_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkButton *ok_button;
- GtkButton *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitDeleteBranchesPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -140,16 +142,16 @@ git_delete_branches_pane_init (GitDeleteBranchesPane *self)
g_error_free (error);
}
- ok_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-merge-pane.c b/plugins/git/git-merge-pane.c
index 01b974e..0026be8 100644
--- a/plugins/git/git-merge-pane.c
+++ b/plugins/git/git-merge-pane.c
@@ -27,32 +27,32 @@ struct _GitMergePanePriv
G_DEFINE_TYPE (GitMergePane, git_merge_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitMergePane *self)
+on_ok_action_activated (GtkAction *action, GitMergePane *self)
{
Git *plugin;
- GtkEditable *revision_entry;
- GtkToggleButton *do_not_commit_check;
- GtkToggleButton *squash_check;
+ GtkEditable *merge_revision_entry;
+ GtkToggleAction *no_commit_action;
+ GtkToggleAction *squash_action;
GtkToggleButton *use_custom_log_check;
gchar *revision;
gchar *log;
- AnjutaColumnTextView *log_view;
+ AnjutaColumnTextView *merge_log_view;
GitMergeCommand *merge_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- revision_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
- "revision_entry"));
- do_not_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "do_not_commit_check"));
- squash_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "squash_check"));
+ merge_revision_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
+ "merge_revision_entry"));
+ no_commit_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "no_commit_action"));
+ squash_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "squash_action"));
use_custom_log_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"use_custom_log_check"));
- revision = gtk_editable_get_chars (revision_entry, 0, -1);
+ revision = gtk_editable_get_chars (merge_revision_entry, 0, -1);
log = NULL;
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (revision_entry), revision,
+ GTK_WIDGET (merge_revision_entry), revision,
_("Please enter a revision.")))
{
g_free (revision);
@@ -61,12 +61,12 @@ on_ok_button_clicked (GtkButton *button, GitMergePane *self)
if (gtk_toggle_button_get_active (use_custom_log_check))
{
- log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
- "log_view"));
- log = anjuta_column_text_view_get_text (log_view);
+ merge_log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
+ "merge_log_view"));
+ log = anjuta_column_text_view_get_text (merge_log_view);
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
- GTK_WIDGET (log_view), log,
+ GTK_WIDGET (merge_log_view), log,
_("Please enter a log message.")))
{
g_free (revision);
@@ -77,8 +77,8 @@ on_ok_button_clicked (GtkButton *button, GitMergePane *self)
merge_command = git_merge_command_new (plugin->project_root_directory,
revision, log,
- gtk_toggle_button_get_active (do_not_commit_check),
- gtk_toggle_button_get_active (squash_check));
+ gtk_toggle_action_get_active (no_commit_action),
+ gtk_toggle_action_get_active (squash_action));
g_free (revision);
g_free (log);
@@ -106,24 +106,28 @@ on_ok_button_clicked (GtkButton *button, GitMergePane *self)
static void
on_use_custom_log_check_toggled (GtkToggleButton *button, GitMergePane *self)
{
- GtkWidget *log_view;
+ GtkWidget *merge_log_view;
gboolean active;
- log_view = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "log_view"));
+ merge_log_view = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "merge_log_view"));
active = gtk_toggle_button_get_active (button);
- gtk_widget_set_sensitive (log_view, active);
+ gtk_widget_set_sensitive (merge_log_view, active);
}
static void
git_merge_pane_init (GitMergePane *self)
{
gchar *objects[] = {"merge_pane",
+ "ok_action",
+ "cancel_action",
+ "no_commit_action",
+ "squash_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
GtkWidget *use_custom_log_check;
self->priv = g_new0 (GitMergePanePriv, 1);
@@ -137,18 +141,18 @@ git_merge_pane_init (GitMergePane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
use_custom_log_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "use_custom_log_check"));
+ "use_custom_log_check"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
diff --git a/plugins/git/git-patch-series-pane.c b/plugins/git/git-patch-series-pane.c
index cea6ff7..c803701 100644
--- a/plugins/git/git-patch-series-pane.c
+++ b/plugins/git/git-patch-series-pane.c
@@ -27,24 +27,24 @@ struct _GitPatchSeriesPanePriv
G_DEFINE_TYPE (GitPatchSeriesPane, git_patch_series_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitPatchSeriesPane *self)
+on_ok_action_activated (GtkAction *action, GitPatchSeriesPane *self)
{
Git *plugin;
- AnjutaEntry *revision_entry;
+ AnjutaEntry *patch_series_revision_entry;
GtkFileChooser *folder_chooser_button;
- GtkToggleButton *signoff_check;
+ GtkToggleAction *signoff_action;
const gchar *revision;
gchar *output_path;
GitFormatPatchCommand *format_patch_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
- "revision_entry"));
+ patch_series_revision_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+
"revision_entry"));
folder_chooser_button = GTK_FILE_CHOOSER (gtk_builder_get_object (self->priv->builder,
"folder_chooser_button"));
- signoff_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "signoff_check"));
- revision = anjuta_entry_get_text (revision_entry);
+ signoff_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "signoff_action"));
+ revision = anjuta_entry_get_text (patch_series_revision_entry);
if (g_utf8_strlen (revision, -1) == 0)
revision = "origin";
@@ -54,7 +54,7 @@ on_ok_button_clicked (GtkButton *button, GitPatchSeriesPane *self)
format_patch_command = git_format_patch_command_new (plugin->project_root_directory,
output_path,
revision,
- gtk_toggle_button_get_active (signoff_check));
+ gtk_toggle_action_get_active (signoff_action));
git_pane_create_message_view (plugin);
@@ -83,11 +83,13 @@ static void
git_patch_series_pane_init (GitPatchSeriesPane *self)
{
gchar *objects[] = {"patch_series_pane",
+ "ok_action",
+ "cancel_action",
+ "signoff_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitPatchSeriesPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -100,16 +102,16 @@ git_patch_series_pane_init (GitPatchSeriesPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
-
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-pull-pane.c b/plugins/git/git-pull-pane.c
index 6847d8d..af841fa 100644
--- a/plugins/git/git-pull-pane.c
+++ b/plugins/git/git-pull-pane.c
@@ -28,15 +28,15 @@ struct _GitPullPanePriv
G_DEFINE_TYPE (GitPullPane, git_pull_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitPullPane *self)
+on_ok_action_activated (GtkAction *action, GitPullPane *self)
{
Git *plugin;
GtkToggleButton *rebase_check;
- GtkToggleButton *no_commit_check;
- GtkToggleButton *squash_check;
+ GtkToggleAction *no_commit_action;
+ GtkToggleAction *squash_action;
GtkToggleButton *append_fetch_data_check;
GtkToggleButton *fast_forward_commit_check;
- GtkToggleButton *force_check;
+ GtkToggleAction *force_action;
GtkToggleButton *no_follow_tags_check;
gchar *repository;
GitPullCommand *pull_command;
@@ -44,16 +44,16 @@ on_ok_button_clicked (GtkButton *button, GitPullPane *self)
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
rebase_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"rebase_check"));
- no_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "no_commit_check"));
- squash_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "squash_check"));
+ no_commit_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "no_commit_action"));
+ squash_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "squash_action"));
append_fetch_data_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"append_fetch_data_check"));
fast_forward_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"fast_forward_commit_check"));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
no_follow_tags_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"no_follow_tags_check"));
@@ -72,11 +72,11 @@ on_ok_button_clicked (GtkButton *button, GitPullPane *self)
pull_command = git_pull_command_new (plugin->project_root_directory,
repository,
gtk_toggle_button_get_active (rebase_check),
- gtk_toggle_button_get_active (no_commit_check),
- gtk_toggle_button_get_active (squash_check),
+ gtk_toggle_action_get_active (no_commit_action),
+ gtk_toggle_action_get_active (squash_action),
gtk_toggle_button_get_active (append_fetch_data_check),
gtk_toggle_button_get_active (fast_forward_commit_check),
- gtk_toggle_button_get_active (force_check),
+ gtk_toggle_action_get_active (force_action),
gtk_toggle_button_get_active (no_follow_tags_check));
g_free (repository);
@@ -120,15 +120,19 @@ static void
git_pull_pane_init (GitPullPane *self)
{
gchar *objects[] = {"pull_pane",
+ "ok_action",
+ "cancel_action",
+ "force_action",
+ "squash_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
- GtkContainer *repository_alignment;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
+ GtkContainer *pull_repository_alignment;
self->priv = g_new0 (GitPullPanePriv, 1);
self->priv->builder = gtk_builder_new ();
-
+
if (!gtk_builder_add_objects_from_file (self->priv->builder, BUILDER_FILE,
objects,
&error))
@@ -137,21 +141,21 @@ git_pull_pane_init (GitPullPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
- repository_alignment = GTK_CONTAINER (gtk_builder_get_object (self->priv->builder,
- "repository_alignment"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+ pull_repository_alignment = GTK_CONTAINER (gtk_builder_get_object (self->priv->builder,
+ "pull_repository_alignment"));
self->priv->repository_selector = git_repository_selector_new ();
- gtk_container_add (repository_alignment, self->priv->repository_selector);
+ gtk_container_add (pull_repository_alignment, self->priv->repository_selector);
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-push-pane.c b/plugins/git/git-push-pane.c
index 48bf607..376ae0a 100644
--- a/plugins/git/git-push-pane.c
+++ b/plugins/git/git-push-pane.c
@@ -54,14 +54,14 @@ get_selected_items (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
}
static void
-on_ok_button_clicked (GtkButton *button, GitPushPane *self)
+on_ok_action_activated (GtkAction *action, GitPushPane *self)
{
Git *plugin;
GtkTreeModel *push_branch_model;
GtkTreeModel *push_tag_model;
GtkToggleButton *push_all_tags_check;
GtkToggleButton *push_all_check;
- GtkToggleButton *force_check;
+ GtkToggleAction *force_action;
GList *selected_items;
gboolean push_all_tags;
gboolean push_all;
@@ -77,8 +77,8 @@ on_ok_button_clicked (GtkButton *button, GitPushPane *self)
"push_all_tags_check"));
push_all_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
"push_all_check"));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
selected_items = NULL;
push_all_tags = gtk_toggle_button_get_active (push_all_tags_check);
push_all = gtk_toggle_button_get_active (push_all_check);
@@ -118,7 +118,7 @@ on_ok_button_clicked (GtkButton *button, GitPushPane *self)
push_command = git_push_command_new (plugin->project_root_directory,
repository, selected_items,
push_all, push_all_tags,
- gtk_toggle_button_get_active (force_check));
+ gtk_toggle_action_get_active (force_action));
g_free (repository);
anjuta_util_glist_strings_free (selected_items);
@@ -240,11 +240,14 @@ git_push_pane_init (GitPushPane *self)
gchar *objects[] = {"push_pane",
"push_branch_model",
"push_tag_model",
+ "ok_action",
+ "cancel_action",
+ "force_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
- GtkContainer *repository_alignment;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
+ GtkContainer *push_repository_alignment;
GtkWidget *branches_view;
GtkWidget *tags_view;
GtkTreeModel *push_branch_model;
@@ -265,12 +268,12 @@ git_push_pane_init (GitPushPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
- repository_alignment = GTK_CONTAINER (gtk_builder_get_object (self->priv->builder,
- "repository_alignment"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+ push_repository_alignment = GTK_CONTAINER (gtk_builder_get_object (self->priv->builder,
+ "push_repository_alignment"));
self->priv->repository_selector = git_repository_selector_new ();
branches_view = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"branches_view"));
@@ -289,13 +292,13 @@ git_push_pane_init (GitPushPane *self)
push_all_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"push_all_check"));
- gtk_container_add (repository_alignment, self->priv->repository_selector);
+ gtk_container_add (push_repository_alignment, self->priv->repository_selector);
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
diff --git a/plugins/git/git-remove-files-pane.c b/plugins/git/git-remove-files-pane.c
index ab45f74..f35fe3b 100644
--- a/plugins/git/git-remove-files-pane.c
+++ b/plugins/git/git-remove-files-pane.c
@@ -2,12 +2,12 @@
/*
* anjuta
* Copyright (C) James Liggett 2010 <jrliggett cox net>
- *
+ *
* anjuta is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* anjuta is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -27,23 +27,23 @@ struct _GitRemoveFilesPanePriv
G_DEFINE_TYPE (GitRemoveFilesPane, git_remove_files_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitRemoveFilesPane *self)
+on_ok_action_activated (GtkAction *action, GitRemoveFilesPane *self)
{
Git *plugin;
- AnjutaFileList *file_list;
- GtkToggleButton *force_check;
+ AnjutaFileList *remove_file_list;
+ GtkToggleAction *force_action;
GList *paths;
GitRemoveCommand *remove_command;
plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
- file_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
- "file_list"));
- force_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
- "force_check"));
- paths = anjuta_file_list_get_paths (file_list);
+ remove_file_list = ANJUTA_FILE_LIST (gtk_builder_get_object (self->priv->builder,
+ "remove_file_list"));
+ force_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (self->priv->builder,
+ "force_action"));
+ paths = anjuta_file_list_get_paths (remove_file_list);
remove_command = git_remove_command_new_list (plugin->project_root_directory,
paths,
- gtk_toggle_button_get_active (force_check));
+ gtk_toggle_action_get_active (force_action));
anjuta_util_glist_strings_free (paths);
@@ -65,10 +65,13 @@ static void
git_remove_files_pane_init (GitRemoveFilesPane *self)
{
gchar *objects[] = {"remove_pane",
+ "ok_action",
+ "cancel_action",
+ "force_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitRemoveFilesPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -81,16 +84,16 @@ git_remove_files_pane_init (GitRemoveFilesPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-reset-pane.c b/plugins/git/git-reset-pane.c
index 710c0ba..25e3a65 100644
--- a/plugins/git/git-reset-pane.c
+++ b/plugins/git/git-reset-pane.c
@@ -27,7 +27,7 @@ struct _GitResetPanePriv
G_DEFINE_TYPE (GitResetPane, git_reset_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitResetPane *self)
+on_ok_action_activated (GtkAction *action, GitResetPane *self)
{
Git *plugin;
AnjutaEntry *revision_entry;
@@ -80,11 +80,12 @@ static void
git_reset_pane_init (GitResetPane *self)
{
gchar *objects[] = {"reset_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitResetPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -97,16 +98,16 @@ git_reset_pane_init (GitResetPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
-
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-revert-pane.c b/plugins/git/git-revert-pane.c
index 172e999..d80467b 100644
--- a/plugins/git/git-revert-pane.c
+++ b/plugins/git/git-revert-pane.c
@@ -27,7 +27,7 @@ struct _GitRevertPanePriv
G_DEFINE_TYPE (GitRevertPane, git_revert_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitRevertPane *self)
+on_ok_action_activated (GtkAction *action, GitRevertPane *self)
{
Git *plugin;
AnjutaEntry *commit_entry;
@@ -78,11 +78,12 @@ static void
git_revert_pane_init (GitRevertPane *self)
{
gchar *objects[] = {"revert_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitRevertPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -95,16 +96,16 @@ git_revert_pane_init (GitRevertPane *self)
g_error_free (error);
}
- ok_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
-
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
+
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
diff --git a/plugins/git/git-stash-changes-pane.c b/plugins/git/git-stash-changes-pane.c
index 1a2f0b2..c0d366e 100644
--- a/plugins/git/git-stash-changes-pane.c
+++ b/plugins/git/git-stash-changes-pane.c
@@ -27,7 +27,7 @@ struct _GitStashChangesPanePriv
G_DEFINE_TYPE (GitStashChangesPane, git_stash_changes_pane, GIT_TYPE_PANE);
static void
-on_ok_button_clicked (GtkButton *button, GitStashChangesPane *self)
+on_ok_action_activated (GtkAction *action, GitStashChangesPane *self)
{
Git *plugin;
AnjutaColumnTextView *message_view;
@@ -75,10 +75,12 @@ static void
git_stash_changes_pane_init (GitStashChangesPane *self)
{
gchar *objects[] = {"stash_changes_pane",
+ "ok_action",
+ "cancel_action",
NULL};
GError *error = NULL;
- GtkButton *ok_button;
- GtkButton *cancel_button;
+ GtkAction *ok_action;
+ GtkAction *cancel_action;
self->priv = g_new0 (GitStashChangesPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -91,16 +93,16 @@ git_stash_changes_pane_init (GitStashChangesPane *self)
g_error_free (error);
}
- ok_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "ok_button"));
- cancel_button = GTK_BUTTON (gtk_builder_get_object (self->priv->builder,
- "cancel_button"));
+ ok_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "ok_action"));
+ cancel_action = GTK_ACTION (gtk_builder_get_object (self->priv->builder,
+ "cancel_action"));
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (on_ok_button_clicked),
+ g_signal_connect (G_OBJECT (ok_action), "activate",
+ G_CALLBACK (on_ok_action_activated),
self);
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ g_signal_connect_swapped (G_OBJECT (cancel_action), "activate",
G_CALLBACK (git_pane_remove_from_dock),
self);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
