[gnumeric] Widgets: extract workbook selector.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Widgets: extract workbook selector.
- Date: Mon, 9 Apr 2018 19:52:57 +0000 (UTC)
commit 63f7c9e0d6a6c8ffe9edcc12a5e6247cf276c965
Author: Morten Welinder <terra gnome org>
Date: Mon Apr 9 15:51:29 2018 -0400
Widgets: extract workbook selector.
Temporarily breaks diff.
po/POTFILES.in | 1 +
src/dialogs/dialog-sheet-compare.c | 71 +------------
src/widgets/Makefile.am | 2 +
src/widgets/gnm-workbook-sel.c | 211 ++++++++++++++++++++++++++++++++++++
src/widgets/gnm-workbook-sel.h | 43 ++++++++
5 files changed, 261 insertions(+), 67 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3d19bf..1d93bfb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -389,6 +389,7 @@ src/widgets/gnm-fontbutton.c
src/widgets/gnm-format-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c
+src/widgets/gnm-workbook-sel.c
src/widgets/gnumeric-cell-renderer-expr-entry.c
src/widgets/gnumeric-cell-renderer-text.c
src/widgets/gnumeric-cell-renderer-toggle.c
diff --git a/src/dialogs/dialog-sheet-compare.c b/src/dialogs/dialog-sheet-compare.c
index 74a32c4..65e5882 100644
--- a/src/dialogs/dialog-sheet-compare.c
+++ b/src/dialogs/dialog-sheet-compare.c
@@ -32,7 +32,7 @@
#include <ranges.h>
#include <cell.h>
#include <sheet-style.h>
-#include <application.h>
+#include <widgets/gnm-workbook-sel.h>
#define SHEET_COMPARE_KEY "sheet-compare-dialog"
@@ -163,72 +163,9 @@ static GtkWidget *
create_wb_selector (SheetCompare *state, GtkWidget *sheet_sel,
Workbook *wb0, gboolean qnew)
{
- GtkMenu *menu;
- GOOptionMenu *om;
- GList *l, *wbs;
- GtkWidget *act = NULL;
-
- om = GO_OPTION_MENU (go_option_menu_new ());
- menu = GTK_MENU (gtk_menu_new ());
-
- wbs = gnm_app_workbook_list ();
- for (l = wbs; l; l = l->next) {
- Workbook *wb = l->data;
- GtkWidget *item, *child;
- const char *uri;
- char *markup, *shortname, *filename, *dirname, *longname, *duri;
-
- uri = go_doc_get_uri (GO_DOC (wb));
- filename = go_filename_from_uri (uri);
- if (filename) {
- shortname = g_filename_display_basename (filename);
- } else {
- shortname = g_filename_display_basename (uri);
- }
-
- dirname = g_path_get_dirname (filename);
- duri = g_uri_unescape_string (dirname, NULL);
- longname = duri
- ? g_filename_display_name (duri)
- : g_strdup (uri);
-
- markup = g_markup_printf_escaped
- (_("%s\n<small>%s</small>"),
- shortname, longname);
-
- item = gtk_menu_item_new_with_label ("");
- child = gtk_bin_get_child (GTK_BIN (item));
- gtk_label_set_markup (GTK_LABEL (child), markup);
- gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_MIDDLE);
-
- g_free (markup);
- g_free (shortname);
- g_free (dirname);
- g_free (longname);
- g_free (duri);
- g_free (filename);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- g_object_set_data (G_OBJECT (item), "wb", wb);
- if (wb == wb0)
- act = item;
- }
-
- gtk_widget_show_all (GTK_WIDGET (menu));
- go_option_menu_set_menu (om, GTK_WIDGET (menu));
-
- if (act)
- go_option_menu_select_item (om, GTK_MENU_ITEM (act));
-
- reset_sheet_menu (sheet_sel, WORKBOOK (wbs->data),
- qnew ? 1 : 0);
-
- g_object_set_data (G_OBJECT (om), "sheet_sel", sheet_sel);
-
- g_signal_connect (G_OBJECT (om), "changed",
- G_CALLBACK (cb_wb_changed), state);
-
- return GTK_WIDGET (om);
+ GtkWidget *res = gnm_workbook_sel_new ();
+ gnm_workbook_sel_set_workbook (GNM_WORKBOOK_SEL (res), wb0);
+ return res;
}
/* ------------------------------------------------------------------------- */
diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 07a3dc2..3f04cdb 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -29,6 +29,8 @@ libwidgets_la_SOURCES = \
gnm-sheet-slicer-combo-view.h \
gnm-so-anchor-mode-chooser.c \
gnm-so-anchor-mode-chooser.h \
+ gnm-workbook-sel.c \
+ gnm-workbook-sel.h \
gnumeric-cell-renderer-text.c \
gnumeric-cell-renderer-text.h \
gnumeric-cell-renderer-expr-entry.c \
diff --git a/src/widgets/gnm-workbook-sel.c b/src/widgets/gnm-workbook-sel.c
new file mode 100644
index 0000000..ba9b9e2
--- /dev/null
+++ b/src/widgets/gnm-workbook-sel.c
@@ -0,0 +1,211 @@
+/**
+ * gnm-workbook-sel.c: A selector for workbooks.
+ *
+ * Copyright (c) 2018 Morten Welinder
+ *
+ * This program 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 program 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 <https://www.gnu.org/licenses/>.
+ **/
+
+#include <gnumeric-config.h>
+#include "gnm-workbook-sel.h"
+#include "gnm-i18n.h"
+#include "workbook.h"
+#include "application.h"
+
+#define WB_KEY "__wb"
+
+struct GnmWorkbookSel_ {
+ GOOptionMenu parent;
+
+ Workbook *wb;
+};
+
+typedef struct {
+ GOOptionMenuClass parent_klass;
+} GnmWorkbookSelClass;
+
+enum {
+ PROP_0,
+ PROP_WORKBOOK
+};
+
+static GOOptionMenuClass *gnm_workbook_sel_parent_class;
+
+void
+gnm_workbook_sel_set_workbook (GnmWorkbookSel *wbs, Workbook *wb)
+{
+ GtkWidget *menu;
+
+ g_return_if_fail (GNM_IS_WORKBOOK_SEL (wbs));
+
+ if (wb == wbs->wb);
+ return;
+
+ menu = go_option_menu_get_menu (&wbs->parent);
+ if (menu) {
+ GList *children =
+ gtk_container_get_children (GTK_CONTAINER (menu));
+ GList *l;
+
+ for (l = children; l; l = l->next) {
+ GtkMenuItem *item = l->data;
+ Workbook *this_wb =
+ g_object_get_data (G_OBJECT (item), WB_KEY);
+ if (this_wb == wb) {
+ go_option_menu_select_item (&wbs->parent, item);
+ break;
+ }
+ }
+ g_list_free (children);
+ }
+
+ wbs->wb = wb;
+
+ g_object_notify (G_OBJECT (wbs), "workbook");
+}
+
+Workbook *
+gnm_workbook_sel_get_workbook (GnmWorkbookSel *wbs)
+{
+ g_return_val_if_fail (GNM_IS_WORKBOOK_SEL (wbs), NULL);
+ return wbs->wb;
+}
+
+static void
+cb_changed (GOOptionMenu *om, GnmWorkbookSel *wbs)
+{
+ GtkWidget *item = go_option_menu_get_history (om);
+ Workbook *wb = g_object_get_data (G_OBJECT (item), WB_KEY);
+ gnm_workbook_sel_set_workbook (wbs, wb);
+}
+
+static void
+gnm_workbook_sel_init (GnmWorkbookSel *wbs)
+{
+ GtkMenu *menu;
+ GList *l, *wb_list;
+
+ menu = GTK_MENU (gtk_menu_new ());
+
+ wb_list = gnm_app_workbook_list ();
+ for (l = wb_list; l; l = l->next) {
+ Workbook *wb = l->data;
+ GtkWidget *item, *child;
+ const char *uri;
+ char *markup, *shortname, *filename, *dirname, *longname, *duri;
+
+ uri = go_doc_get_uri (GO_DOC (wb));
+ filename = go_filename_from_uri (uri);
+ if (filename) {
+ shortname = g_filename_display_basename (filename);
+ } else {
+ shortname = g_filename_display_basename (uri);
+ }
+
+ dirname = g_path_get_dirname (filename);
+ duri = g_uri_unescape_string (dirname, NULL);
+ longname = duri
+ ? g_filename_display_name (duri)
+ : g_strdup (uri);
+
+ markup = g_markup_printf_escaped
+ (_("%s\n<small>%s</small>"),
+ shortname, longname);
+
+ item = gtk_check_menu_item_new_with_label ("");
+ gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
+ child = gtk_bin_get_child (GTK_BIN (item));
+ gtk_label_set_markup (GTK_LABEL (child), markup);
+ gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_MIDDLE);
+
+ g_free (markup);
+ g_free (shortname);
+ g_free (dirname);
+ g_free (longname);
+ g_free (duri);
+ g_free (filename);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ g_object_set_data (G_OBJECT (item), WB_KEY, wb);
+ }
+
+ gtk_widget_show_all (GTK_WIDGET (menu));
+ go_option_menu_set_menu (&wbs->parent, GTK_WIDGET (menu));
+
+ if (wb_list)
+ gnm_workbook_sel_set_workbook (wbs, wb_list->data);
+
+ g_signal_connect (G_OBJECT (&wbs->parent), "changed",
+ G_CALLBACK (cb_changed), wbs);
+}
+
+static void
+gnm_workbook_sel_set_property (GObject *object, guint property_id,
+ const GValue *value, GParamSpec *pspec)
+{
+ GnmWorkbookSel *wbs = (GnmWorkbookSel *)object;
+
+ switch (property_id) {
+ case PROP_WORKBOOK:
+ gnm_workbook_sel_set_workbook (wbs, g_value_get_object (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gnm_workbook_sel_get_property (GObject *object, guint property_id,
+ GValue *value, GParamSpec *pspec)
+{
+ GnmWorkbookSel *wbs = (GnmWorkbookSel *)object;
+
+ switch (property_id) {
+ case PROP_WORKBOOK:
+ g_value_set_object (value, wbs->wb);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gnm_workbook_sel_class_init (GObjectClass *klass)
+{
+ gnm_workbook_sel_parent_class = g_type_class_peek (GO_TYPE_OPTION_MENU);
+
+ klass->set_property = gnm_workbook_sel_set_property;
+ klass->get_property = gnm_workbook_sel_get_property;
+
+ g_object_class_install_property
+ (klass, PROP_WORKBOOK,
+ g_param_spec_object ("workbook",
+ P_("Workbook"),
+ P_("The current workbook"),
+ GNM_WORKBOOK_TYPE,
+ GSF_PARAM_STATIC | G_PARAM_READWRITE));
+}
+
+
+GSF_CLASS (GnmWorkbookSel, gnm_workbook_sel,
+ gnm_workbook_sel_class_init, gnm_workbook_sel_init,
+ GO_TYPE_OPTION_MENU)
+
+GtkWidget *
+gnm_workbook_sel_new (void)
+{
+ return g_object_new (GNM_TYPE_WORKBOOK_SEL, NULL);
+}
diff --git a/src/widgets/gnm-workbook-sel.h b/src/widgets/gnm-workbook-sel.h
new file mode 100644
index 0000000..e7e3338
--- /dev/null
+++ b/src/widgets/gnm-workbook-sel.h
@@ -0,0 +1,43 @@
+/**
+ * gnm-workbook-sel.h: A selector for workbooks.
+ *
+ * Copyright (c) 2018 Morten Welinder
+ *
+ * This program 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 program 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 <https://www.gnu.org/licenses/>.
+ **/
+
+#ifndef GNM_WORKBOOK_SEL_H
+#define GNM_WORKBOOK_SEL_H
+
+#include "gnumeric.h"
+#include <goffice/goffice.h>
+
+G_BEGIN_DECLS
+
+GType gnm_workbook_sel_get_type (void);
+
+#define GNM_TYPE_WORKBOOK_SEL (gnm_workbook_sel_get_type ())
+#define GNM_WORKBOOK_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_TYPE_WORKBOOK_SEL,
GnmWorkbookSel))
+#define GNM_IS_WORKBOOK_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNM_TYPE_WORKBOOK_SEL))
+
+typedef struct GnmWorkbookSel_ GnmWorkbookSel;
+
+GtkWidget *gnm_workbook_sel_new (void);
+
+void gnm_workbook_sel_set_workbook (GnmWorkbookSel *wbs, Workbook *wb);
+Workbook *gnm_workbook_sel_get_workbook (GnmWorkbookSel *wbs);
+
+G_END_DECLS
+
+#endif /* GNM_WORKBOOK_SEL_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
