GNOME.org
 

[anjuta/git-shell] git: Implement the Check Out Files pane

commit 89e1f61a72f31218e0db31e624c6fd05b8a63249
Author: James Liggett <jrliggett cox net>
Date:   Sat Jul 10 19:19:33 2010 -0700

    git: Implement the Check Out Files pane

 plugins/git/Makefile.am         |    4 +-
 plugins/git/anjuta-git.ui       |   86 ++++++++++++++++++++++
 plugins/git/git-checkout-pane.c |  149 +++++++++++++++++++++++++++++++++++++++
 plugins/git/git-checkout-pane.h |   59 +++++++++++++++
 plugins/git/plugin.c            |   12 +++-
 5 files changed, 308 insertions(+), 2 deletions(-)
---
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 7e0636f..3df8004 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -181,7 +181,9 @@ libanjuta_git_la_SOURCES = \
 	git-repository-selector.c \
 	git-repository-selector.h \
 	git-pull-pane.h \
-	git-pull-pane.c
+	git-pull-pane.c \
+	git-checkout-pane.c \
+	git-checkout-pane.h
 
 libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 14ddb56..baa3d3b 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -2185,4 +2185,90 @@
       </packing>
     </child>
   </object>
+  <object class="GtkVBox" id="checkout_pane">
+    <property name="visible">True</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="force_check">
+                    <property name="label" translatable="yes">Force</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</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;Options:&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>
+      </object>
+      <packing>
+        <property name="position">0</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="position">1</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/plugins/git/git-checkout-pane.c b/plugins/git/git-checkout-pane.c
new file mode 100644
index 0000000..6867aff
--- /dev/null
+++ b/plugins/git/git-checkout-pane.c
@@ -0,0 +1,149 @@
+/* -*- 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-checkout-pane.h"
+
+struct _GitCheckoutPanePriv
+{
+	GtkBuilder *builder;
+};
+
+G_DEFINE_TYPE (GitCheckoutPane, git_checkout_pane, GIT_TYPE_PANE);
+
+static void
+on_ok_button_clicked (GtkButton *button, GitCheckoutPane *self)
+{
+	Git *plugin;
+	GtkToggleButton *force_check;
+	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"));
+
+	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));
+
+	git_command_free_string_list (paths);
+
+	g_signal_connect (G_OBJECT (checkout_command), "command-finished",
+	                  G_CALLBACK (git_pane_report_errors),
+	                  plugin);
+
+	g_signal_connect (G_OBJECT (checkout_command), "command-finished",
+	                  G_CALLBACK (g_object_unref),
+	                  NULL);
+
+	anjuta_command_start (ANJUTA_COMMAND (checkout_command));
+
+	git_pane_remove_from_dock (GIT_PANE (self));
+	                            
+}
+
+static void
+git_checkout_pane_init (GitCheckoutPane *self)
+{
+	gchar *objects[] = {"checkout_pane",
+						NULL};
+	GError *error = NULL;
+	GtkButton *ok_button;
+	GtkButton *cancel_button;
+
+	self->priv = g_new0 (GitCheckoutPanePriv, 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_BUTTON (gtk_builder_get_object (self->priv->builder, 
+	                                                "ok_button"));
+	cancel_button = GTK_BUTTON (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_checkout_pane_finalize (GObject *object)
+{
+	GitCheckoutPane *self;
+
+	self = GIT_CHECKOUT_PANE (object);
+
+	g_object_unref (self->priv->builder);
+	g_free (self->priv);
+
+	G_OBJECT_CLASS (git_checkout_pane_parent_class)->finalize (object);
+}
+
+static GtkWidget *
+get_widget (AnjutaDockPane *pane)
+{
+	GitCheckoutPane *self;
+
+	self = GIT_CHECKOUT_PANE (pane);
+
+	return GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+	                                           "checkout_pane"));
+}
+
+static void
+git_checkout_pane_class_init (GitCheckoutPaneClass *klass)
+{
+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+	AnjutaDockPaneClass* pane_class = ANJUTA_DOCK_PANE_CLASS (klass);
+
+	object_class->finalize = git_checkout_pane_finalize;
+	pane_class->get_widget = get_widget;
+	pane_class->refresh = NULL;
+}
+
+
+AnjutaDockPane *
+git_checkout_pane_new (Git *plugin)
+{
+	return g_object_new (GIT_TYPE_CHECKOUT_PANE, "plugin", plugin, NULL);
+}
+
+void
+on_checkout_button_clicked (GtkAction *action, Git *plugin)
+{
+	AnjutaDockPane *checkout_pane;
+
+	checkout_pane = git_checkout_pane_new (plugin);
+
+	anjuta_dock_add_pane (ANJUTA_DOCK (plugin->dock), "Checkout",
+	                      _("Check Out Files"), NULL, checkout_pane,
+	                      GDL_DOCK_BOTTOM, NULL, 0, NULL);
+}
diff --git a/plugins/git/git-checkout-pane.h b/plugins/git/git-checkout-pane.h
new file mode 100644
index 0000000..efd19a3
--- /dev/null
+++ b/plugins/git/git-checkout-pane.h
@@ -0,0 +1,59 @@
+/* -*- 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_CHECKOUT_PANE_H_
+#define _GIT_CHECKOUT_PANE_H_
+
+#include <glib-object.h>
+#include "git-pane.h"
+#include "git-status-pane.h"
+#include "git-checkout-files-command.h"
+
+G_BEGIN_DECLS
+
+#define GIT_TYPE_CHECKOUT_PANE             (git_checkout_pane_get_type ())
+#define GIT_CHECKOUT_PANE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIT_TYPE_CHECKOUT_PANE, GitCheckoutPane))
+#define GIT_CHECKOUT_PANE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GIT_TYPE_CHECKOUT_PANE, GitCheckoutPaneClass))
+#define GIT_IS_CHECKOUT_PANE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIT_TYPE_CHECKOUT_PANE))
+#define GIT_IS_CHECKOUT_PANE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GIT_TYPE_CHECKOUT_PANE))
+#define GIT_CHECKOUT_PANE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GIT_TYPE_CHECKOUT_PANE, GitCheckoutPaneClass))
+
+typedef struct _GitCheckoutPaneClass GitCheckoutPaneClass;
+typedef struct _GitCheckoutPane GitCheckoutPane;
+typedef struct _GitCheckoutPanePriv GitCheckoutPanePriv;
+
+struct _GitCheckoutPaneClass
+{
+	GitPaneClass parent_class;
+};
+
+struct _GitCheckoutPane
+{
+	GitPane parent_instance;
+
+	GitCheckoutPanePriv *priv;
+};
+
+GType git_checkout_pane_get_type (void) G_GNUC_CONST;
+AnjutaDockPane *git_checkout_pane_new (Git *plugin);
+void on_checkout_button_clicked (GtkAction *action, Git *plugin);
+
+G_END_DECLS
+
+#endif /* _GIT_CHECKOUT_PANE_H_ */
diff --git a/plugins/git/plugin.c b/plugins/git/plugin.c
index 793cc2c..7ddb113 100644
--- a/plugins/git/plugin.c
+++ b/plugins/git/plugin.c
@@ -33,6 +33,7 @@
 #include "git-remotes-pane.h"
 #include "git-push-pane.h"
 #include "git-pull-pane.h"
+#include "git-checkout-pane.h"
 
 AnjutaCommandBarEntry branch_entries[] =
 {
@@ -119,7 +120,16 @@ AnjutaCommandBarEntry status_entries[] =
 		N_("Remove files from the repository"),
 		GTK_STOCK_REMOVE,
 		G_CALLBACK (on_remove_button_clicked)
-	}
+	},
+	{
+		ANJUTA_COMMAND_BAR_ENTRY_BUTTON,
+		"Checkout",
+		N_("Check out"),
+		N_("Revert changes in unstaged files"),
+		GTK_STOCK_UNDO,
+		G_CALLBACK (on_checkout_button_clicked)
+	},
+	
 };
 
 AnjutaCommandBarEntry remotes_entries[] =
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]