[anjuta] git: Implement the Apply Mailbox Files pane
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] git: Implement the Apply Mailbox Files pane
- Date: Sun, 23 Jan 2011 08:09:59 +0000 (UTC)
commit 4ab9dfb067ada970c05f8769bb13d14363e392f2
Author: James Liggett <jrliggett cox net>
Date: Sat Jan 22 22:17:32 2011 -0800
git: Implement the Apply Mailbox Files pane
plugins/git/Makefile.am | 4 +-
plugins/git/anjuta-git.ui | 122 ++++++++++++++++++
plugins/git/git-apply-mailbox-pane.c | 234 ++++++++++++++++++++++++++++++++++
plugins/git/git-apply-mailbox-pane.h | 64 +++++++++
plugins/git/plugin.c | 41 ++++++
5 files changed, 464 insertions(+), 1 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index d8267d2..85afa26 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -222,7 +222,9 @@ libanjuta_git_la_SOURCES = \
git-cherry-pick-pane.c \
git-cherry-pick-pane.h \
git-patch-series-pane.c \
- git-patch-series-pane.h
+ git-patch-series-pane.h \
+ git-apply-mailbox-pane.c \
+ git-apply-mailbox-pane.h
libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index f0d2df8..87fbc16 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -289,6 +289,128 @@
</packing>
</child>
</object>
+ <object class="GtkVBox" id="apply_mailbox_pane">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <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">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="AnjutaFileList" id="mailbox_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <property name="show_add_button">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Mailbox files to apply:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <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">
+ <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="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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Options:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <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">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
<object class="GtkListStore" id="branches_list_model">
<columns>
<!-- column-name selected -->
diff --git a/plugins/git/git-apply-mailbox-pane.c b/plugins/git/git-apply-mailbox-pane.c
new file mode 100644
index 0000000..aed20cf
--- /dev/null
+++ b/plugins/git/git-apply-mailbox-pane.c
@@ -0,0 +1,234 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * git-shell-test
+ * Copyright (C) James Liggett 2010 <jrliggett cox net>
+ *
+ * git-shell-test 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.
+ *
+ * git-shell-test 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.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "git-apply-mailbox-pane.h"
+
+struct _GitApplyMailboxPanePriv
+{
+ GtkBuilder *builder;
+};
+
+G_DEFINE_TYPE (GitApplyMailboxPane, git_apply_mailbox_pane, GIT_TYPE_PANE);
+
+static void
+on_ok_button_clicked (GtkButton *button, GitApplyMailboxPane *self)
+{
+ Git *plugin;
+ AnjutaFileList *mailbox_list;
+ GtkToggleButton *signoff_check;
+ 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"));
+ 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));
+
+ git_pane_create_message_view (plugin);
+
+ g_signal_connect (G_OBJECT (apply_mailbox_command), "data-arrived",
+ G_CALLBACK (git_pane_on_command_info_arrived),
+ plugin);
+
+ g_signal_connect (G_OBJECT (apply_mailbox_command), "command-finished",
+ G_CALLBACK (git_pane_report_errors),
+ plugin);
+
+
+ g_signal_connect (G_OBJECT (apply_mailbox_command), "command-finished",
+ G_CALLBACK (g_object_unref),
+ NULL);
+
+ anjuta_command_start (ANJUTA_COMMAND (apply_mailbox_command));
+
+ git_command_free_string_list (paths);
+
+ git_pane_remove_from_dock (GIT_PANE (self));
+}
+
+
+static void
+git_apply_mailbox_pane_init (GitApplyMailboxPane *self)
+{
+ gchar *objects[] = {"apply_mailbox_pane",
+ NULL};
+ GError *error = NULL;
+ GtkWidget *ok_button;
+ GtkWidget *cancel_button;
+
+
+ self->priv = g_new0 (GitApplyMailboxPanePriv, 1);
+ self->priv->builder = gtk_builder_new ();
+
+ if (!gtk_builder_add_objects_from_file (self->priv->builder, BUILDER_FILE,
+ objects,
+ &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ 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),
+ self);
+
+ g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ G_CALLBACK (git_pane_remove_from_dock),
+ self);
+}
+
+static void
+git_apply_mailbox_pane_finalize (GObject *object)
+{
+ GitApplyMailboxPane *self;
+
+ self = GIT_APPLY_MAILBOX_PANE (object);
+
+ g_object_unref (self->priv->builder);
+ g_free (self->priv);
+
+ G_OBJECT_CLASS (git_apply_mailbox_pane_parent_class)->finalize (object);
+}
+
+static GtkWidget *
+git_apply_mailbox_pane_get_widget (AnjutaDockPane *pane)
+{
+ GitApplyMailboxPane *self;
+
+ self = GIT_APPLY_MAILBOX_PANE (pane);
+
+ return GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+ "apply_mailbox_pane"));
+}
+
+static void
+git_apply_mailbox_pane_class_init (GitApplyMailboxPaneClass *klass)
+{
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
+ AnjutaDockPaneClass *pane_class = ANJUTA_DOCK_PANE_CLASS (klass);
+
+ object_class->finalize = git_apply_mailbox_pane_finalize;
+ pane_class->get_widget = git_apply_mailbox_pane_get_widget;
+ pane_class->refresh = NULL;
+}
+
+
+AnjutaDockPane *
+git_apply_mailbox_pane_new (Git *plugin)
+{
+ return g_object_new (GIT_TYPE_APPLY_MAILBOX_PANE, "plugin", plugin, NULL);
+}
+
+void
+on_apply_mailbox_button_clicked (GtkAction *action, Git *plugin)
+{
+ AnjutaDockPane *pane;
+
+ pane = git_apply_mailbox_pane_new (plugin);
+
+ anjuta_dock_add_pane (ANJUTA_DOCK (plugin->dock), "ApplyMailbox",
+ _("Apply Mailbox Files"), NULL, pane,
+ GDL_DOCK_BOTTOM, NULL, 0, NULL);
+}
+
+void
+on_apply_mailbox_continue_button_clicked (GtkAction *action, Git *plugin)
+{
+ GitApplyMailboxContinueCommand *continue_command;
+
+ continue_command = git_apply_mailbox_continue_command_new (plugin->project_root_directory,
+ GIT_APPLY_MAILBOX_CONTINUE_ACTION_RESOLVED);
+
+ git_pane_create_message_view (plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "data-arrived",
+ G_CALLBACK (git_pane_on_command_info_arrived),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (git_pane_report_errors),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (g_object_unref),
+ NULL);
+
+ anjuta_command_start (ANJUTA_COMMAND (continue_command));
+}
+
+void
+on_apply_mailbox_skip_button_clicked (GtkAction *action, Git *plugin)
+{
+ GitApplyMailboxContinueCommand *continue_command;
+
+ continue_command = git_apply_mailbox_continue_command_new (plugin->project_root_directory,
+ GIT_APPLY_MAILBOX_CONTINUE_ACTION_SKIP);
+
+ git_pane_create_message_view (plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "data-arrived",
+ G_CALLBACK (git_pane_on_command_info_arrived),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (git_pane_report_errors),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (g_object_unref),
+ NULL);
+
+ anjuta_command_start (ANJUTA_COMMAND (continue_command));
+}
+
+void
+on_apply_mailbox_abort_button_clicked (GtkAction *action, Git *plugin)
+{
+ GitApplyMailboxContinueCommand *continue_command;
+
+ continue_command = git_apply_mailbox_continue_command_new (plugin->project_root_directory,
+ GIT_APPLY_MAILBOX_CONTINUE_ACTION_ABORT);
+
+ git_pane_create_message_view (plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "data-arrived",
+ G_CALLBACK (git_pane_on_command_info_arrived),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (git_pane_report_errors),
+ plugin);
+
+ g_signal_connect (G_OBJECT (continue_command), "command-finished",
+ G_CALLBACK (g_object_unref),
+ NULL);
+
+ anjuta_command_start (ANJUTA_COMMAND (continue_command));
+}
\ No newline at end of file
diff --git a/plugins/git/git-apply-mailbox-pane.h b/plugins/git/git-apply-mailbox-pane.h
new file mode 100644
index 0000000..1df6501
--- /dev/null
+++ b/plugins/git/git-apply-mailbox-pane.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * git-shell-test
+ * Copyright (C) James Liggett 2010 <jrliggett cox net>
+ *
+ * git-shell-test 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.
+ *
+ * git-shell-test 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.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _GIT_APPLY_MAILBOX_PANE_H_
+#define _GIT_APPLY_MAILBOX_PANE_H_
+
+#include <glib-object.h>
+#include <libanjuta/anjuta-file-list.h>
+#include "git-pane.h"
+#include "plugin.h"
+#include "git-apply-mailbox-command.h"
+#include "git-apply-mailbox-continue-command.h"
+
+G_BEGIN_DECLS
+
+#define GIT_TYPE_APPLY_MAILBOX_PANE (git_apply_mailbox_pane_get_type ())
+#define GIT_APPLY_MAILBOX_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_APPLY_MAILBOX_PANE, GitApplyMailboxPane))
+#define GIT_APPLY_MAILBOX_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_APPLY_MAILBOX_PANE, GitApplyMailboxPaneClass))
+#define GIT_IS_APPLY_MAILBOX_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_APPLY_MAILBOX_PANE))
+#define GIT_IS_APPLY_MAILBOX_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_APPLY_MAILBOX_PANE))
+#define GIT_APPLY_MAILBOX_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_APPLY_MAILBOX_PANE, GitApplyMailboxPaneClass))
+
+typedef struct _GitApplyMailboxPaneClass GitApplyMailboxPaneClass;
+typedef struct _GitApplyMailboxPane GitApplyMailboxPane;
+typedef struct _GitApplyMailboxPanePriv GitApplyMailboxPanePriv;
+
+struct _GitApplyMailboxPaneClass
+{
+ GitPaneClass parent_class;
+};
+
+struct _GitApplyMailboxPane
+{
+ GitPane parent_instance;
+
+ GitApplyMailboxPanePriv *priv;
+};
+
+GType git_apply_mailbox_pane_get_type (void) G_GNUC_CONST;
+AnjutaDockPane *git_apply_mailbox_pane_new (Git *plugin);
+void on_apply_mailbox_button_clicked (GtkAction *action, Git *plugin);
+void on_apply_mailbox_continue_button_clicked (GtkAction *action, Git *plugin);
+void on_apply_mailbox_skip_button_clicked (GtkAction *action, Git *plugin);
+void on_apply_mailbox_abort_button_clicked (GtkAction *action, Git *plugin);
+
+G_END_DECLS
+
+#endif /* _GIT_RESET_PANE_H_ */
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 1d7955d..4cfcef3 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -55,6 +55,7 @@
#include "git-revert-pane.h"
#include "git-cherry-pick-pane.h"
#include "git-patch-series-pane.h"
+#include "git-apply-mailbox-pane.h"
AnjutaCommandBarEntry branch_entries[] =
{
@@ -423,6 +424,46 @@ static AnjutaCommandBarEntry log_entries[] =
NULL,
G_CALLBACK (on_patch_series_button_clicked)
},
+ {
+ ANJUTA_COMMAND_BAR_ENTRY_FRAME,
+ "NULL",
+ N_("Mailbox files"),
+ NULL,
+ NULL,
+ NULL
+ },
+ {
+ ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+ "ApplyMailboxFiles",
+ N_("Apply mailbox files"),
+ N_("Apply patches from mailbox files"),
+ NULL,
+ G_CALLBACK (on_apply_mailbox_button_clicked)
+ },
+ {
+ ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+ "ApplyMailboxContinue",
+ N_("Continue"),
+ N_("Continue applying patches with resolved conflicts"),
+ NULL,
+ G_CALLBACK (on_apply_mailbox_continue_button_clicked)
+ },
+ {
+ ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+ "ApplyMailboxSkip",
+ N_("Skip"),
+ N_("Skip the current patch in the series"),
+ NULL,
+ G_CALLBACK (on_apply_mailbox_skip_button_clicked)
+ },
+ {
+ ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+ "ApplyMailboxAbort",
+ N_("Abort"),
+ N_("Stop applying the patch series and return the tree to its previous state"),
+ NULL,
+ G_CALLBACK (on_apply_mailbox_abort_button_clicked)
+ }
};
static gpointer parent_class;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
