GNOME.org
 

[anjuta] git: Implement the Revert pane

commit b63aff5c6f8db581b22007323ed2b7a10f14bad6
Author: James Liggett <jrliggett cox net>
Date:   Fri Dec 17 23:44:19 2010 -0800

    git: Implement the Revert pane

 plugins/git/Makefile.am       |    4 +-
 plugins/git/anjuta-git.ui     |  117 +++++++++++++++++++++++++++++
 plugins/git/git-revert-pane.c |  164 +++++++++++++++++++++++++++++++++++++++++
 plugins/git/git-revert-pane.h |   60 +++++++++++++++
 plugins/git/plugin.c          |   24 ++++++-
 5 files changed, 367 insertions(+), 2 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 28f733d..84d944f 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -219,7 +219,9 @@ libanjuta_git_la_SOURCES = \
 	git-log-pane.c \
 	git-log-pane.h \
 	git-log-data-command.c \
-	git-log-data-command.h
+	git-log-data-command.h \
+	git-revert-pane.c \
+	git-revert-pane.h
 	
 
 libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 42e211e..f36196a 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -2707,4 +2707,121 @@
       </packing>
     </child>
   </object>
+  <object class="GtkVBox" id="revert_pane">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="AnjutaDropEntry" id="commit_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">â?¢</property>
+		<property name="help_text">Drop or type a revision here</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;Commit to revert:&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame2">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment2">
+            <property name="visible">True</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkCheckButton" id="no_commit_check">
+                    <property name="label" translatable="yes">Do not commit</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHButtonBox" id="hbuttonbox1">
+        <property name="visible">True</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_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="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_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/plugins/git/git-revert-pane.c b/plugins/git/git-revert-pane.c
new file mode 100644
index 0000000..f99a467
--- /dev/null
+++ b/plugins/git/git-revert-pane.c
@@ -0,0 +1,164 @@
+/* -*- 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-revert-pane.h"
+
+struct _GitRevertPanePriv
+{
+	GtkBuilder *builder;
+};
+
+G_DEFINE_TYPE (GitRevertPane, git_revert_pane, GIT_TYPE_PANE);
+
+static void
+on_ok_button_clicked (GtkButton *button, GitRevertPane *self)
+{
+	Git *plugin;
+	AnjutaEntry *commit_entry;
+	GtkToggleButton *no_commit_check;
+	gchar *commit;
+	GitRevertCommand *revert_command;
+
+	plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
+	commit_entry = ANJUTA_ENTRY (gtk_builder_get_object (self->priv->builder,
+	                                                     "commit_entry"));
+	no_commit_check = GTK_TOGGLE_BUTTON (gtk_builder_get_object (self->priv->builder,
+	                                                             "no_commit_check"));
+
+	commit = anjuta_entry_dup_text (commit_entry);
+
+	if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
+	                           GTK_WIDGET (commit_entry), commit,
+	                           _("Please enter a commit.")))
+	{
+		g_free (commit);
+
+		return;
+	}
+
+	revert_command = git_revert_command_new (plugin->project_root_directory,
+	                                         commit,
+	                                         gtk_toggle_button_get_active (no_commit_check));
+
+	g_signal_connect (G_OBJECT (revert_command), "command-finished",
+	                  G_CALLBACK (git_pane_report_errors),
+	                  plugin);
+
+
+	g_signal_connect (G_OBJECT (revert_command), "command-finished",
+	                  G_CALLBACK (g_object_unref),
+	                  NULL);
+
+	anjuta_command_start (ANJUTA_COMMAND (revert_command));
+
+
+	g_free (commit);
+
+	git_pane_remove_from_dock (GIT_PANE (self));
+}
+
+
+static void
+git_revert_pane_init (GitRevertPane *self)
+{
+	gchar *objects[] = {"revert_pane",
+						NULL};
+	GError *error = NULL;
+	GtkWidget *ok_button;
+	GtkWidget *cancel_button;
+	
+
+	self->priv = g_new0 (GitRevertPanePriv, 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_revert_pane_finalize (GObject *object)
+{
+	GitRevertPane *self;
+
+	self = GIT_REVERT_PANE (object);
+
+	g_object_unref (self->priv->builder);
+	g_free (self->priv);
+
+	G_OBJECT_CLASS (git_revert_pane_parent_class)->finalize (object);
+}
+
+static GtkWidget *
+git_revert_pane_get_widget (AnjutaDockPane *pane)
+{
+	GitRevertPane *self;
+
+	self = GIT_REVERT_PANE (pane);
+
+	return GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+	                                           "revert_pane"));
+}
+
+static void
+git_revert_pane_class_init (GitRevertPaneClass *klass)
+{
+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+	AnjutaDockPaneClass *pane_class = ANJUTA_DOCK_PANE_CLASS (klass);
+
+	object_class->finalize = git_revert_pane_finalize;
+	pane_class->get_widget = git_revert_pane_get_widget;
+	pane_class->refresh = NULL;
+}
+
+
+AnjutaDockPane *
+git_revert_pane_new (Git *plugin)
+{
+	return g_object_new (GIT_TYPE_REVERT_PANE, "plugin", plugin, NULL);
+}
+
+void
+on_revert_button_clicked (GtkAction *action, Git *plugin)
+{
+	AnjutaDockPane *pane;
+
+	pane = git_revert_pane_new (plugin);
+
+	anjuta_dock_add_pane (ANJUTA_DOCK (plugin->dock), "Revert", 
+	                      _("Revert"), NULL, pane, GDL_DOCK_BOTTOM, NULL, 0,
+	                      NULL);
+}
\ No newline at end of file
diff --git a/plugins/git/git-revert-pane.h b/plugins/git/git-revert-pane.h
new file mode 100644
index 0000000..92dca1f
--- /dev/null
+++ b/plugins/git/git-revert-pane.h
@@ -0,0 +1,60 @@
+/* -*- 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_REVERT_PANE_H_
+#define _GIT_REVERT_PANE_H_
+
+#include <glib-object.h>
+#include <libanjuta/anjuta-entry.h>
+#include "git-pane.h"
+#include "plugin.h"
+#include "git-revert-command.h"
+
+G_BEGIN_DECLS
+
+#define GIT_TYPE_REVERT_PANE             (git_revert_pane_get_type ())
+#define GIT_REVERT_PANE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_REVERT_PANE, GitRevertPane))
+#define GIT_REVERT_PANE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_REVERT_PANE, GitRevertPaneClass))
+#define GIT_IS_REVERT_PANE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_REVERT_PANE))
+#define GIT_IS_REVERT_PANE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_REVERT_PANE))
+#define GIT_REVERT_PANE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_REVERT_PANE, GitRevertPaneClass))
+
+typedef struct _GitRevertPaneClass GitRevertPaneClass;
+typedef struct _GitRevertPane GitRevertPane;
+typedef struct _GitRevertPanePriv GitRevertPanePriv;
+
+struct _GitRevertPaneClass
+{
+	GitPaneClass parent_class;
+};
+
+struct _GitRevertPane
+{
+	GitPane parent_instance;
+
+	GitRevertPanePriv *priv;
+};
+
+GType git_revert_pane_get_type (void) G_GNUC_CONST;
+AnjutaDockPane *git_revert_pane_new (Git *plugin);
+void on_revert_button_clicked (GtkAction *action, Git *plugin);
+
+G_END_DECLS
+
+#endif /* _GIT_REVERT_PANE_H_ */
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 9b16a07..6467906 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -51,6 +51,7 @@
 #include "git-clear-stash-pane.h"
 #include "git-rebase-pane.h"
 #include "git-log-pane.h"
+#include "git-revert-pane.h"
 
 AnjutaCommandBarEntry branch_entries[] =
 {
@@ -353,6 +354,26 @@ AnjutaCommandBarEntry stash_entries[] =
 	}
 };
 
+static AnjutaCommandBarEntry log_entries[] = 
+{
+	{
+		ANJUTA_COMMAND_BAR_ENTRY_FRAME,
+		"NULL",
+		N_("Reset/Revert"),
+		NULL,
+		NULL,
+		NULL
+	},
+	{
+		ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+		"Revert",
+		N_("Revert commit"),
+		N_("Revert a commit"),
+		GTK_STOCK_UNDO,
+		G_CALLBACK (on_revert_button_clicked)
+	}
+};
+
 static gpointer parent_class;
 
 static void
@@ -631,7 +652,8 @@ git_activate_plugin (AnjutaPlugin *plugin)
 	git_plugin->log_pane = git_log_pane_new (git_plugin);
 	anjuta_dock_add_pane (ANJUTA_DOCK (git_plugin->dock), "Log",
 	                      _("Log"), NULL, git_plugin->log_pane,
-	                      GDL_DOCK_CENTER, NULL, 0, NULL);
+	                      GDL_DOCK_CENTER, log_entries,
+	                      G_N_ELEMENTS (log_entries), git_plugin);
 	
 	git_plugin->branches_pane = git_branches_pane_new (git_plugin);
 	anjuta_dock_add_pane (ANJUTA_DOCK (git_plugin->dock), "Branches",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]