[anjuta] git: Allow multiple selections in the branch delete dialog
- From: James Liggett <jrliggett src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjuta] git: Allow multiple selections in the branch delete dialog
- Date: Sat, 13 Jun 2009 19:30:08 -0400 (EDT)
commit b50a12e0d4c49ef2dbe16d9e374161b33f3ab0a9
Author: James Liggett <jrliggett cox net>
Date: Sat Jun 13 16:06:06 2009 -0700
git: Allow multiple selections in the branch delete dialog
plugins/git/anjuta-git.ui | 52 ++++++++++++++----
plugins/git/git-branch-delete-command.c | 15 ++----
plugins/git/git-branch-delete-command.h | 3 +-
plugins/git/git-delete-branch-dialog.c | 91 ++++++++++++++++++++-----------
4 files changed, 104 insertions(+), 57 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 78deadd..ebb7eac 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -1141,9 +1141,9 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes">Branch to switch to:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1424,14 +1424,43 @@
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkComboBox" id="delete_branch_combo">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
- <property name="model">branch_combo_model</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkCellRendererText" id="delete_branch_combo_name"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkTreeView" id="delete_branch_view">
+ <property name="height_request">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">branch_list_model</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <property name="title">column</property>
+ <child>
+ <object class="GtkCellRendererToggle" id="delete_branch_selected_renderer"/>
+ <attributes>
+ <attribute name="active">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <property name="title">column</property>
+ <child>
+ <object class="GtkCellRendererText" id="delete_branch_name_renderer"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
@@ -1440,7 +1469,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Branch to delete:</property>
+ <property name="label" translatable="yes">Branches to delete:</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1448,7 +1477,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1463,7 +1491,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="require_merged_check">
- <property name="label" translatable="yes">Branch must be fully merged</property>
+ <property name="label" translatable="yes">Branches must be fully merged</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/plugins/git/git-branch-delete-command.c b/plugins/git/git-branch-delete-command.c
index 50ed668..0995f69 100644
--- a/plugins/git/git-branch-delete-command.c
+++ b/plugins/git/git-branch-delete-command.c
@@ -26,7 +26,7 @@
struct _GitBranchDeleteCommandPriv
{
- gchar *branch_name;
+ GList *branches;
gboolean require_merged;
};
@@ -45,7 +45,7 @@ git_branch_delete_command_finalize (GObject *object)
self = GIT_BRANCH_DELETE_COMMAND (object);
- g_free (self->priv->branch_name);
+ git_command_free_string_list (self->priv->branches);
g_free (self->priv);
G_OBJECT_CLASS (git_branch_delete_command_parent_class)->finalize (object);
@@ -65,7 +65,7 @@ git_branch_delete_command_run (AnjutaCommand *command)
else
git_command_add_arg (GIT_COMMAND (command), "-D");
- git_command_add_arg (GIT_COMMAND (command), self->priv->branch_name);
+ git_command_add_list_to_args (GIT_COMMAND (command), self->priv->branches);
return 0;
}
@@ -85,7 +85,7 @@ git_branch_delete_command_class_init (GitBranchDeleteCommandClass *klass)
GitBranchDeleteCommand *
git_branch_delete_command_new (const gchar *working_directory,
- const gchar *branch_name,
+ GList *branches,
gboolean require_merged)
{
GitBranchDeleteCommand *self;
@@ -95,14 +95,9 @@ git_branch_delete_command_new (const gchar *working_directory,
"single-line-output", TRUE,
NULL);
- self->priv->branch_name = g_strdup (branch_name);
+ self->priv->branches = git_command_copy_string_list (branches);
self->priv->require_merged = require_merged;
return self;
}
-gchar *
-git_branch_delete_command_get_branch_name (GitBranchDeleteCommand *self)
-{
- return g_strdup (self->priv->branch_name);
-}
diff --git a/plugins/git/git-branch-delete-command.h b/plugins/git/git-branch-delete-command.h
index f4472db..2489583 100644
--- a/plugins/git/git-branch-delete-command.h
+++ b/plugins/git/git-branch-delete-command.h
@@ -55,9 +55,8 @@ struct _GitBranchDeleteCommand
GType git_branch_delete_command_get_type (void) G_GNUC_CONST;
GitBranchDeleteCommand *git_branch_delete_command_new (const gchar *working_directory,
- const gchar *branch_name,
+ GList *branches,
gboolean require_merged);
-gchar *git_branch_delete_command_get_branch_name (GitBranchDeleteCommand *self);
G_END_DECLS
diff --git a/plugins/git/git-delete-branch-dialog.c b/plugins/git/git-delete-branch-dialog.c
index f877569..23c6a1c 100644
--- a/plugins/git/git-delete-branch-dialog.c
+++ b/plugins/git/git-delete-branch-dialog.c
@@ -29,21 +29,12 @@ on_delete_command_finished (AnjutaCommand *command, guint return_code,
Git *plugin)
{
AnjutaStatus *status;
- gchar *branch_name;
- gchar *status_message;
-
+
if (return_code == 0)
{
status = anjuta_shell_get_status (ANJUTA_PLUGIN (plugin)->shell,
NULL);
-
- branch_name = git_branch_delete_command_get_branch_name (GIT_BRANCH_DELETE_COMMAND (command));
- status_message = g_strdup_printf (_("Git: Deleted branch \"%s\"."),
- branch_name);
- anjuta_status (status, status_message, 5);
-
- g_free (branch_name);
- g_free (status_message);
+ anjuta_status (status, _("Git: Deleted selected branches."), 5);
}
git_report_errors (command, return_code);
@@ -51,35 +42,62 @@ on_delete_command_finished (AnjutaCommand *command, guint return_code,
g_object_unref (command);
}
+static void
+on_list_branch_command_data_arrived (AnjutaCommand *command,
+ GtkListStore *branch_list_model)
+{
+ GQueue *output_queue;
+ GitBranch *branch;
+ GtkTreeIter iter;
+ gchar *name;
+
+ output_queue = git_branch_list_command_get_output (GIT_BRANCH_LIST_COMMAND (command));
+
+ while (g_queue_peek_head (output_queue))
+ {
+ branch = g_queue_pop_head (output_queue);
+ name = git_branch_get_name (branch);
+
+ if (!git_branch_is_active (branch))
+ {
+ gtk_list_store_append (branch_list_model, &iter);
+ gtk_list_store_set (branch_list_model, &iter, 1, name, -1);
+ }
+
+ g_object_unref (branch);
+ g_free (name);
+ }
+}
static void
on_delete_branch_dialog_response (GtkDialog *dialog, gint response_id,
GitUIData *data)
{
- GtkWidget *delete_branch_combo;
+ GtkWidget *delete_branch_view;
GtkWidget *require_merged_check;
- GtkTreeModel *branch_combo_model;
- gchar *branch;
- GtkTreeIter iter;
+ GtkTreeModel *branch_list_model;
+ GList *selected_branches;
GitBranchDeleteCommand *delete_command;
if (response_id == GTK_RESPONSE_OK)
{
- delete_branch_combo = GTK_WIDGET (gtk_builder_get_object (data->bxml,
- "delete_branch_combo"));
+ delete_branch_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+ "delete_branch_view"));
require_merged_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
"require_merged_check"));
- branch_combo_model = GTK_TREE_MODEL (gtk_builder_get_object (data->bxml,
- "branch_combo_model"));
+ branch_list_model = GTK_TREE_MODEL (gtk_builder_get_object (data->bxml,
+ "branch_list_model"));
- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (delete_branch_combo), &iter);
- gtk_tree_model_get (branch_combo_model, &iter, 0, &branch, -1);
+ selected_branches = NULL;
+ gtk_tree_model_foreach (branch_list_model,
+ (GtkTreeModelForeachFunc) git_get_selected_refs,
+ &selected_branches);
delete_command = git_branch_delete_command_new (data->plugin->project_root_directory,
- branch,
+ selected_branches,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (require_merged_check)));
- g_free (branch);
+ git_command_free_string_list (selected_branches);
git_create_message_view (data->plugin);
@@ -102,11 +120,12 @@ static void
delete_branch_dialog (Git *plugin)
{
GtkBuilder *bxml;
- gchar *objects[] = {"delete_branch_dialog", "branch_combo_model", NULL};
+ gchar *objects[] = {"delete_branch_dialog", "branch_list_model", NULL};
GError *error;
GtkWidget *dialog;
- GtkWidget *delete_branch_combo;
- GtkListStore *branch_combo_model;
+ GtkWidget *delete_branch_view;
+ GtkListStore *branch_list_model;
+ GtkCellRenderer *delete_branch_selected_renderer;
GitUIData *data;
GitBranchListCommand *list_command;
@@ -121,9 +140,11 @@ delete_branch_dialog (Git *plugin)
}
dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_branch_dialog"));
- delete_branch_combo = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_branch_combo"));
- branch_combo_model = GTK_LIST_STORE (gtk_builder_get_object (bxml,
- "branch_combo_model"));
+ delete_branch_view = GTK_WIDGET (gtk_builder_get_object (bxml, "delete_branch_view"));
+ branch_list_model = GTK_LIST_STORE (gtk_builder_get_object (bxml,
+ "branch_list_model"));
+ delete_branch_selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (bxml,
+ "delete_branch_selected_renderer")),
data = git_ui_data_new (plugin, bxml);
@@ -131,18 +152,22 @@ delete_branch_dialog (Git *plugin)
GIT_BRANCH_TYPE_LOCAL);
g_signal_connect (G_OBJECT (list_command), "data-arrived",
- G_CALLBACK (on_git_list_branch_combo_command_data_arrived),
- branch_combo_model);
+ G_CALLBACK (on_list_branch_command_data_arrived),
+ branch_list_model);
g_signal_connect (G_OBJECT (list_command), "command-finished",
- G_CALLBACK (on_git_list_branch_combo_command_finished),
- delete_branch_combo);
+ G_CALLBACK (on_git_command_finished),
+ NULL);
anjuta_command_start (ANJUTA_COMMAND (list_command));
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (on_delete_branch_dialog_response),
data);
+
+ g_signal_connect (G_OBJECT (delete_branch_selected_renderer), "toggled",
+ G_CALLBACK (on_git_selected_column_toggled),
+ branch_list_model);
gtk_widget_show_all (dialog);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
