[gnome-disk-utility/new-ui] Implement "Format Drive" button
- From: David Zeuthen <davidz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/new-ui] Implement "Format Drive" button
- Date: Mon, 26 Oct 2009 18:36:57 +0000 (UTC)
commit ee845dd5d41901c6b455b18d05a98cc04c7bdd64
Author: David Zeuthen <davidz redhat com>
Date: Mon Oct 26 14:36:34 2009 -0400
Implement "Format Drive" button
src/gdu-gtk/Makefile.am | 2 +
src/gdu-gtk/gdu-gtk-enums.h | 1 -
src/gdu-gtk/gdu-gtk-types.h | 1 +
src/gdu-gtk/gdu-gtk.h | 1 +
src/gdu-gtk/gdu-partition-dialog.c | 288 ++++++++++++++++++++++++++++++++++++
src/gdu-gtk/gdu-partition-dialog.h | 64 ++++++++
src/palimpsest/gdu-section-drive.c | 77 ++++++++++-
7 files changed, 431 insertions(+), 3 deletions(-)
---
diff --git a/src/gdu-gtk/Makefile.am b/src/gdu-gtk/Makefile.am
index 0a523d8..edf227c 100644
--- a/src/gdu-gtk/Makefile.am
+++ b/src/gdu-gtk/Makefile.am
@@ -47,6 +47,7 @@ libgdu_gtkinclude_HEADERS = \
gdu-dialog.h \
gdu-edit-partition-dialog.h \
gdu-format-dialog.h \
+ gdu-partition-dialog.h \
$(NULL)
libgdu_gtk_la_SOURCES = \
@@ -71,6 +72,7 @@ libgdu_gtk_la_SOURCES = \
gdu-dialog.h gdu-dialog.c \
gdu-edit-partition-dialog.h gdu-edit-partition-dialog.c \
gdu-format-dialog.h gdu-format-dialog.c \
+ gdu-partition-dialog.h gdu-partition-dialog.c \
$(NULL)
libgdu_gtk_la_CPPFLAGS = \
diff --git a/src/gdu-gtk/gdu-gtk-enums.h b/src/gdu-gtk/gdu-gtk-enums.h
index 481ea72..e5968d0 100644
--- a/src/gdu-gtk/gdu-gtk-enums.h
+++ b/src/gdu-gtk/gdu-gtk-enums.h
@@ -88,5 +88,4 @@ typedef enum {
GDU_FORMAT_DIALOG_FLAGS_DISK_UTILITY_BUTTON = (1<<1),
} GduFormatDialogFlags;
-
#endif /* GDU_GTK_ENUMS_H */
diff --git a/src/gdu-gtk/gdu-gtk-types.h b/src/gdu-gtk/gdu-gtk-types.h
index f3f38db..200616f 100644
--- a/src/gdu-gtk/gdu-gtk-types.h
+++ b/src/gdu-gtk/gdu-gtk-types.h
@@ -54,6 +54,7 @@ typedef struct GduButtonTable GduButtonTable;
typedef struct GduDialog GduDialog;
typedef struct GduEditPartitionDialog GduEditPartitionDialog;
typedef struct GduFormatDialog GduFormatDialog;
+typedef struct GduPartitionDialog GduPartitionDialog;
G_END_DECLS
diff --git a/src/gdu-gtk/gdu-gtk.h b/src/gdu-gtk/gdu-gtk.h
index 5131701..bc5945e 100644
--- a/src/gdu-gtk/gdu-gtk.h
+++ b/src/gdu-gtk/gdu-gtk.h
@@ -46,6 +46,7 @@
#include <gdu-gtk/gdu-dialog.h>
#include <gdu-gtk/gdu-edit-partition-dialog.h>
#include <gdu-gtk/gdu-format-dialog.h>
+#include <gdu-gtk/gdu-partition-dialog.h>
#undef __GDU_GTK_INSIDE_GDU_GTK_H
G_BEGIN_DECLS
diff --git a/src/gdu-gtk/gdu-partition-dialog.c b/src/gdu-gtk/gdu-partition-dialog.c
new file mode 100644
index 0000000..81804ee
--- /dev/null
+++ b/src/gdu-gtk/gdu-partition-dialog.c
@@ -0,0 +1,288 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008-2009 Red Hat, Inc.
+ *
+ * This library 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 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ *
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+#include <gdu/gdu.h>
+#include <gdu-gtk/gdu-gtk.h>
+
+#include "gdu-partition-dialog.h"
+
+struct GduPartitionDialogPrivate
+{
+ GtkWidget *scheme_combo_box;
+ GtkWidget *scheme_desc_label;
+
+ gchar *scheme;
+
+ gulong removed_signal_handler_id;
+};
+
+enum
+{
+ PROP_0,
+ PROP_SCHEME,
+};
+
+static void gdu_partition_dialog_constructed (GObject *object);
+
+G_DEFINE_TYPE (GduPartitionDialog, gdu_partition_dialog, GDU_TYPE_DIALOG)
+
+static void
+gdu_partition_dialog_finalize (GObject *object)
+{
+ GduPartitionDialog *dialog = GDU_PARTITION_DIALOG (object);
+
+ g_free (dialog->priv->scheme);
+
+ if (dialog->priv->removed_signal_handler_id > 0) {
+ g_signal_handler_disconnect (gdu_dialog_get_presentable (GDU_DIALOG (dialog)),
+ dialog->priv->removed_signal_handler_id);
+ }
+
+ if (G_OBJECT_CLASS (gdu_partition_dialog_parent_class)->finalize != NULL)
+ G_OBJECT_CLASS (gdu_partition_dialog_parent_class)->finalize (object);
+}
+
+static void
+gdu_partition_dialog_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GduPartitionDialog *dialog = GDU_PARTITION_DIALOG (object);
+
+ switch (property_id) {
+ case PROP_SCHEME:
+ g_value_take_string (value, dialog->priv->scheme);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gdu_partition_dialog_class_init (GduPartitionDialogClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (GduPartitionDialogPrivate));
+
+ object_class->get_property = gdu_partition_dialog_get_property;
+ object_class->constructed = gdu_partition_dialog_constructed;
+ object_class->finalize = gdu_partition_dialog_finalize;
+
+ g_object_class_install_property (object_class,
+ PROP_SCHEME,
+ g_param_spec_string ("scheme",
+ _("Partitioning Scheme"),
+ _("The selected partitioning scheme"),
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB));
+}
+
+static void
+gdu_partition_dialog_init (GduPartitionDialog *dialog)
+{
+ dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, GDU_TYPE_PARTITION_DIALOG, GduPartitionDialogPrivate);
+}
+
+GtkWidget *
+gdu_partition_dialog_new (GtkWindow *parent,
+ GduPresentable *presentable)
+{
+ return GTK_WIDGET (g_object_new (GDU_TYPE_PARTITION_DIALOG,
+ "transient-for", parent,
+ "presentable", presentable,
+ NULL));
+}
+
+GtkWidget *
+gdu_partition_dialog_for_drive (GtkWindow *parent,
+ GduDevice *device)
+{
+ return GTK_WIDGET (g_object_new (GDU_TYPE_PARTITION_DIALOG,
+ "transient-for", parent,
+ "drive-device", device,
+ NULL));
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+gchar *
+gdu_partition_dialog_get_scheme (GduPartitionDialog *dialog)
+{
+ g_return_val_if_fail (GDU_IS_PARTITION_DIALOG (dialog), NULL);
+ return g_strdup (dialog->priv->scheme);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+update (GduPartitionDialog *dialog)
+{
+ /* keep in sync with where combo box is constructed in constructed() */
+ g_free (dialog->priv->scheme);
+ dialog->priv->scheme = gdu_util_part_table_type_combo_box_get_selected (dialog->priv->scheme_combo_box);
+}
+
+static void
+on_combo_box_changed (GtkWidget *combo_box,
+ gpointer user_data)
+{
+ GduPartitionDialog *dialog = GDU_PARTITION_DIALOG (user_data);
+ update (dialog);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+on_presentable_removed (GduPresentable *presentable,
+ gpointer user_data)
+{
+ GduPartitionDialog *dialog = GDU_PARTITION_DIALOG (user_data);
+
+ gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+gdu_partition_dialog_constructed (GObject *object)
+{
+ GduPartitionDialog *dialog = GDU_PARTITION_DIALOG (object);
+ GtkWidget *content_area;
+ GtkWidget *label;
+ GtkWidget *hbox;
+ GtkWidget *image;
+ GtkWidget *table;
+ GtkWidget *combo_box;
+ GtkWidget *vbox2;
+ GdkPixbuf *pixbuf;
+ gint row;
+ gboolean ret;
+ GtkWidget *align;
+ gchar *s;
+ gchar *s2;
+
+ ret = FALSE;
+
+ pixbuf = gdu_util_get_pixbuf_for_presentable (gdu_dialog_get_presentable (GDU_DIALOG (dialog)),
+ GTK_ICON_SIZE_DIALOG);
+
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
+
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+ s2 = gdu_presentable_get_vpd_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
+ /* Translators: Format is a verb here. The %s is the name of the volume */
+ s = g_strdup_printf (_("Format %s"), s2);
+ gtk_window_set_title (GTK_WINDOW (dialog), s);
+ g_free (s);
+ g_free (s2);
+
+ gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ /* Translators: Format is used as a verb here */
+ _("_Format"),
+ GTK_RESPONSE_OK);
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_container_set_border_width (GTK_CONTAINER (content_area), 10);
+
+ /* icon and text labels */
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
+
+ image = gtk_image_new_from_pixbuf (pixbuf);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 12);
+
+ align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 12, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
+
+ vbox2 = gtk_vbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (align), vbox2);
+
+ row = 0;
+
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+ gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
+
+ /* partitioning scheme */
+ label = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ /* Translators: 'scheme' means 'partitioning scheme' here. */
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Scheme:"));
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+ combo_box = gdu_util_part_table_type_combo_box_create ();
+ gdu_util_part_table_type_combo_box_select (combo_box, "mbr");
+ dialog->priv->scheme = g_strdup ("mbr");
+ gtk_table_attach (GTK_TABLE (table), combo_box, 1, 2, row, row +1,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
+ dialog->priv->scheme_combo_box = combo_box;
+ row++;
+
+ label = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row +1,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+ dialog->priv->scheme_desc_label = label;
+ row++;
+ gdu_util_part_table_type_combo_box_set_desc_label (dialog->priv->scheme_combo_box,
+ dialog->priv->scheme_desc_label);
+
+ g_signal_connect (dialog->priv->scheme_combo_box,
+ "changed",
+ G_CALLBACK (on_combo_box_changed),
+ dialog);
+
+ update (dialog);
+
+ /* nuke dialog if device is yanked */
+ dialog->priv->removed_signal_handler_id = g_signal_connect (gdu_dialog_get_presentable (GDU_DIALOG (dialog)),
+ "removed",
+ G_CALLBACK (on_presentable_removed),
+ dialog);
+
+ if (G_OBJECT_CLASS (gdu_partition_dialog_parent_class)->constructed != NULL)
+ G_OBJECT_CLASS (gdu_partition_dialog_parent_class)->constructed (object);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/gdu-gtk/gdu-partition-dialog.h b/src/gdu-gtk/gdu-partition-dialog.h
new file mode 100644
index 0000000..7c36842
--- /dev/null
+++ b/src/gdu-gtk/gdu-partition-dialog.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008-2009 Red Hat, Inc.
+ *
+ * This library 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 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ *
+ */
+
+#ifndef __GDU_PARTITION_DIALOG_H
+#define __GDU_PARTITION_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <gdu-gtk/gdu-gtk.h>
+
+G_BEGIN_DECLS
+
+#define GDU_TYPE_PARTITION_DIALOG gdu_partition_dialog_get_type()
+#define GDU_PARTITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDU_TYPE_PARTITION_DIALOG, GduPartitionDialog))
+#define GDU_PARTITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDU_TYPE_PARTITION_DIALOG, GduPartitionDialogClass))
+#define GDU_IS_PARTITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDU_TYPE_PARTITION_DIALOG))
+#define GDU_IS_PARTITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDU_TYPE_PARTITION_DIALOG))
+#define GDU_PARTITION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDU_TYPE_PARTITION_DIALOG, GduPartitionDialogClass))
+
+typedef struct GduPartitionDialogClass GduPartitionDialogClass;
+typedef struct GduPartitionDialogPrivate GduPartitionDialogPrivate;
+
+struct GduPartitionDialog
+{
+ GduDialog parent;
+
+ /*< private >*/
+ GduPartitionDialogPrivate *priv;
+};
+
+struct GduPartitionDialogClass
+{
+ GduDialogClass parent_class;
+};
+
+GType gdu_partition_dialog_get_type (void) G_GNUC_CONST;
+GtkWidget *gdu_partition_dialog_new (GtkWindow *parent,
+ GduPresentable *presentable);
+GtkWidget *gdu_partition_dialog_for_drive (GtkWindow *parent,
+ GduDevice *device);
+gchar *gdu_partition_dialog_get_scheme (GduPartitionDialog *dialog);
+
+G_END_DECLS
+
+#endif /* __GDU_PARTITION_DIALOG_H */
+
diff --git a/src/palimpsest/gdu-section-drive.c b/src/palimpsest/gdu-section-drive.c
index b55cf90..edac18e 100644
--- a/src/palimpsest/gdu-section-drive.c
+++ b/src/palimpsest/gdu-section-drive.c
@@ -397,6 +397,81 @@ on_detach_button_clicked (GduButtonElement *button_element,
/* ---------------------------------------------------------------------------------------------------- */
static void
+partition_table_create_op_callback (GduDevice *device,
+ GError *error,
+ gpointer user_data)
+{
+ GduShell *shell = GDU_SHELL (user_data);
+
+ if (error != NULL) {
+ GtkWidget *dialog;
+
+ g_debug ("error: %s", error->message);
+
+ dialog = gdu_error_dialog_for_drive (GTK_WINDOW (gdu_shell_get_toplevel (shell)),
+ device,
+ _("Error formatting drive"),
+ error);
+ gtk_widget_show_all (dialog);
+ gtk_window_present (GTK_WINDOW (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_error_free (error);
+ }
+ g_object_unref (shell);
+}
+
+static void
+on_format_button_clicked (GduButtonElement *button_element,
+ gpointer user_data)
+{
+ GduSectionDrive *section = GDU_SECTION_DRIVE (user_data);
+ GduDevice *d;
+ GtkWindow *toplevel;
+ GtkWidget *dialog;
+ GtkWidget *confirmation_dialog;
+ gint response;
+
+ dialog = NULL;
+ confirmation_dialog = NULL;
+
+ d = gdu_presentable_get_device (gdu_section_get_presentable (GDU_SECTION (section)));
+ if (d == NULL)
+ goto out;
+
+ toplevel = GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section))));
+ dialog = gdu_partition_dialog_for_drive (toplevel,
+ d);
+ gtk_widget_show_all (dialog);
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_hide (dialog);
+ if (response == GTK_RESPONSE_OK) {
+ confirmation_dialog = gdu_confirmation_dialog_for_drive (toplevel,
+ d,
+ _("Are you sure you want to format the drive?"),
+ _("_Format"));
+ gtk_widget_show_all (confirmation_dialog);
+ response = gtk_dialog_run (GTK_DIALOG (confirmation_dialog));
+ gtk_widget_hide (confirmation_dialog);
+ if (response == GTK_RESPONSE_OK) {
+ gdu_device_op_partition_table_create (d,
+ gdu_partition_dialog_get_scheme (GDU_PARTITION_DIALOG (dialog)),
+ partition_table_create_op_callback,
+ g_object_ref (gdu_section_get_shell (GDU_SECTION (section))));
+ }
+ }
+ out:
+ if (dialog != NULL)
+ gtk_widget_destroy (dialog);
+ if (confirmation_dialog != NULL)
+ gtk_widget_destroy (confirmation_dialog);
+ if (d != NULL)
+ g_object_unref (d);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
gdu_section_drive_constructed (GObject *object)
{
GduSectionDrive *section = GDU_SECTION_DRIVE (object);
@@ -492,12 +567,10 @@ gdu_section_drive_constructed (GObject *object)
button_element = gdu_button_element_new ("nautilus-gdu",
_("Format _Drive"),
_("Delete all data and partition the drive"));
-#if 0
g_signal_connect (button_element,
"clicked",
G_CALLBACK (on_format_button_clicked),
section);
-#endif
g_ptr_array_add (elements, button_element);
section->priv->format_button = button_element;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
