GNOME.org
 

[gedit] Rename StatusComboBox to StatusMenuButton

commit 992bbf4536000ef1b46067abae5486394606777f
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Apr 28 17:13:30 2013 +0200

    Rename StatusComboBox to StatusMenuButton

 gedit/Makefile.am                                  |    4 +-
 gedit/gedit-status-combo-box.h                     |   68 -----------------
 ...atus-combo-box.c => gedit-status-menu-button.c} |   78 +++++++++----------
 gedit/gedit-status-menu-button.h                   |   65 ++++++++++++++++
 gedit/gedit-window.c                               |    6 +-
 5 files changed, 107 insertions(+), 114 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 0b06442..16f1d57 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -119,7 +119,7 @@ NOINST_H_FILES =                    \
        gedit-print-preview.h           \
        gedit-replace-dialog.h          \
        gedit-settings.h                \
-       gedit-status-combo-box.h        \
+       gedit-status-menu-button.h      \
        gedit-tab-label.h               \
        gedittextregion.h               \
        gedit-ui.h                      \
@@ -205,7 +205,7 @@ libgedit_c_files =                  \
        gedit-replace-dialog.c          \
        gedit-settings.c                \
        gedit-statusbar.c               \
-       gedit-status-combo-box.c        \
+       gedit-status-menu-button.c      \
        gedit-tab.c                     \
        gedit-tab-label.c               \
        gedit-utils.c                   \
diff --git a/gedit/gedit-status-combo-box.c b/gedit/gedit-status-menu-button.c
similarity index 61%
rename from gedit/gedit-status-combo-box.c
rename to gedit/gedit-status-menu-button.c
index efecd2e..929a84f 100644
--- a/gedit/gedit-status-combo-box.c
+++ b/gedit/gedit-status-menu-button.c
@@ -1,5 +1,5 @@
 /*
- * gedit-status-combo-box.c
+ * gedit-status-menu-button.c
  * This file is part of gedit
  *
  * Copyright (C) 2008 - Jesse van den Kieboom
@@ -20,13 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gedit-status-combo-box.h"
+#include "gedit-status-menu-button.h"
 
-#define COMBO_BOX_TEXT_DATA "GeditStatusComboBoxTextData"
-
-#define GEDIT_STATUS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_STATUS_COMBO_BOX, GeditStatusComboBoxPrivate))
-
-struct _GeditStatusComboBoxPrivate
+struct _GeditStatusMenuButtonPrivate
 {
        GtkWidget *hbox;
        GtkWidget *label;
@@ -34,7 +30,7 @@ struct _GeditStatusComboBoxPrivate
        GtkWidget *arrow;
 };
 
-struct _GeditStatusComboBoxClassPrivate
+struct _GeditStatusMenuButtonClassPrivate
 {
        GtkCssProvider *css;
 };
@@ -46,40 +42,40 @@ enum
        PROP_LABEL
 };
 
-G_DEFINE_TYPE_WITH_CODE (GeditStatusComboBox, gedit_status_combo_box, GTK_TYPE_MENU_BUTTON,
-                         g_type_add_class_private (g_define_type_id, sizeof 
(GeditStatusComboBoxClassPrivate)))
+G_DEFINE_TYPE_WITH_CODE (GeditStatusMenuButton, gedit_status_menu_button, GTK_TYPE_MENU_BUTTON,
+                         g_type_add_class_private (g_define_type_id, sizeof 
(GeditStatusMenuButtonClassPrivate)))
 
 static void
-gedit_status_combo_box_finalize (GObject *object)
+gedit_status_menu_button_finalize (GObject *object)
 {
-       G_OBJECT_CLASS (gedit_status_combo_box_parent_class)->finalize (object);
+       G_OBJECT_CLASS (gedit_status_menu_button_parent_class)->finalize (object);
 }
 
 static void
-gedit_status_combo_box_set_label (GeditStatusComboBox *combo,
-                                 const gchar         *label)
+gedit_status_menu_button_set_label (GeditStatusMenuButton *button,
+                                   const gchar         *label)
 {
-       gtk_label_set_markup (GTK_LABEL (combo->priv->label), label);
+       gtk_label_set_markup (GTK_LABEL (button->priv->label), label);
 }
 
 static const gchar *
-gedit_status_combo_box_get_label (GeditStatusComboBox *combo)
+gedit_status_menu_button_get_label (GeditStatusMenuButton *button)
 {
-       return gtk_label_get_label (GTK_LABEL (combo->priv->label));
+       return gtk_label_get_label (GTK_LABEL (button->priv->label));
 }
 
 static void
-gedit_status_combo_box_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
+gedit_status_menu_button_get_property (GObject    *object,
+                                      guint       prop_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
 {
-       GeditStatusComboBox *obj = GEDIT_STATUS_COMBO_BOX (object);
+       GeditStatusMenuButton *obj = GEDIT_STATUS_MENU_BUTTON (object);
 
        switch (prop_id)
        {
                case PROP_LABEL:
-                       g_value_set_string (value, gedit_status_combo_box_get_label (obj));
+                       g_value_set_string (value, gedit_status_menu_button_get_label (obj));
                        break;
                default:
                        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -88,17 +84,17 @@ gedit_status_combo_box_get_property (GObject    *object,
 }
 
 static void
-gedit_status_combo_box_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
+gedit_status_menu_button_set_property (GObject      *object,
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
 {
-       GeditStatusComboBox *obj = GEDIT_STATUS_COMBO_BOX (object);
+       GeditStatusMenuButton *obj = GEDIT_STATUS_MENU_BUTTON (object);
 
        switch (prop_id)
        {
                case PROP_LABEL:
-                       gedit_status_combo_box_set_label (obj, g_value_get_string (value));
+                       gedit_status_menu_button_set_label (obj, g_value_get_string (value));
                        break;
                default:
                        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -107,7 +103,7 @@ gedit_status_combo_box_set_property (GObject      *object,
 }
 
 static void
-gedit_status_combo_box_class_init (GeditStatusComboBoxClass *klass)
+gedit_status_menu_button_class_init (GeditStatusMenuButtonClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
        static const gchar style[] =
@@ -120,26 +116,26 @@ gedit_status_combo_box_class_init (GeditStatusComboBoxClass *klass)
                  "padding: 1px 8px 2px 4px;\n"
                "}";
 
-       object_class->finalize = gedit_status_combo_box_finalize;
-       object_class->get_property = gedit_status_combo_box_get_property;
-       object_class->set_property = gedit_status_combo_box_set_property;
+       object_class->finalize = gedit_status_menu_button_finalize;
+       object_class->get_property = gedit_status_menu_button_get_property;
+       object_class->set_property = gedit_status_menu_button_set_property;
 
        g_object_class_override_property (object_class, PROP_LABEL, "label");
 
-       g_type_class_add_private (object_class, sizeof (GeditStatusComboBoxPrivate));
+       g_type_class_add_private (object_class, sizeof (GeditStatusMenuButtonPrivate));
 
-       klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, GEDIT_TYPE_STATUS_COMBO_BOX, 
GeditStatusComboBoxClassPrivate);
+       klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, GEDIT_TYPE_STATUS_MENU_BUTTON, 
GeditStatusMenuButtonClassPrivate);
 
        klass->priv->css = gtk_css_provider_new ();
        gtk_css_provider_load_from_data (klass->priv->css, style, -1, NULL);
 }
 
 static void
-gedit_status_combo_box_init (GeditStatusComboBox *self)
+gedit_status_menu_button_init (GeditStatusMenuButton *self)
 {
        GtkStyleContext *context;
 
-       self->priv = GEDIT_STATUS_COMBO_BOX_GET_PRIVATE (self);
+       self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, GEDIT_TYPE_STATUS_MENU_BUTTON, 
GeditStatusMenuButtonPrivate);
 
        gtk_button_set_relief (GTK_BUTTON (self), GTK_RELIEF_NONE);
        gtk_menu_button_set_direction (GTK_MENU_BUTTON (self), GTK_ARROW_UP);
@@ -172,18 +168,18 @@ gedit_status_combo_box_init (GeditStatusComboBox *self)
        /* make it as small as possible */
        context = gtk_widget_get_style_context (GTK_WIDGET (self));
        gtk_style_context_add_provider (context,
-                                       GTK_STYLE_PROVIDER (GEDIT_STATUS_COMBO_BOX_GET_CLASS 
(self)->priv->css),
+                                       GTK_STYLE_PROVIDER (GEDIT_STATUS_MENU_BUTTON_GET_CLASS 
(self)->priv->css),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 /**
- * gedit_status_combo_box_new:
+ * gedit_status_menu_button_new:
  * @label: (allow-none):
  */
 GtkWidget *
-gedit_status_combo_box_new (const gchar *label)
+gedit_status_menu_button_new (void)
 {
-       return g_object_new (GEDIT_TYPE_STATUS_COMBO_BOX, "label", label, NULL);
+       return g_object_new (GEDIT_TYPE_STATUS_MENU_BUTTON, NULL);
 }
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-status-menu-button.h b/gedit/gedit-status-menu-button.h
new file mode 100644
index 0000000..d66bb85
--- /dev/null
+++ b/gedit/gedit-status-menu-button.h
@@ -0,0 +1,65 @@
+/*
+ * gedit-status-menu-button.h
+ * This file is part of gedit
+ *
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GEDIT_STATUS_MENU_BUTTON_H__
+#define __GEDIT_STATUS_MENU_BUTTON_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GEDIT_TYPE_STATUS_MENU_BUTTON                  (gedit_status_menu_button_get_type ())
+#define GEDIT_STATUS_MENU_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButton))
+#define GEDIT_STATUS_MENU_BUTTON_CONST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButton const))
+#define GEDIT_STATUS_MENU_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), 
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButtonClass))
+#define GEDIT_IS_STATUS_MENU_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GEDIT_TYPE_STATUS_MENU_BUTTON))
+#define GEDIT_IS_STATUS_MENU_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GEDIT_TYPE_STATUS_MENU_BUTTON))
+#define GEDIT_STATUS_MENU_BUTTON_GET_CLASS(obj)                (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButtonClass))
+
+typedef struct _GeditStatusMenuButton                  GeditStatusMenuButton;
+typedef struct _GeditStatusMenuButtonPrivate           GeditStatusMenuButtonPrivate;
+typedef struct _GeditStatusMenuButtonClass             GeditStatusMenuButtonClass;
+typedef struct _GeditStatusMenuButtonClassPrivate      GeditStatusMenuButtonClassPrivate;
+
+struct _GeditStatusMenuButton
+{
+       GtkMenuButton parent;
+
+       GeditStatusMenuButtonPrivate *priv;
+};
+
+struct _GeditStatusMenuButtonClass
+{
+       GtkMenuButtonClass parent_class;
+
+       GeditStatusMenuButtonClassPrivate *priv;
+};
+
+GType gedit_status_menu_button_get_type        (void) G_GNUC_CONST;
+
+GtkWidget *gedit_status_menu_button_new                (void);
+
+G_END_DECLS
+
+#endif /* __GEDIT_STATUS_MENU_BUTTON_H__ */
+
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 6f5c593..a5fe832 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -59,7 +59,7 @@
 #include "gedit-window-activatable.h"
 #include "gedit-enum-types.h"
 #include "gedit-dirs.h"
-#include "gedit-status-combo-box.h"
+#include "gedit-status-menu-button.h"
 #include "gedit-settings.h"
 #include "gedit-marshal.h"
 
@@ -2001,7 +2001,7 @@ create_tab_width_combo (GeditWindow *window)
        guint i = 0;
        GtkWidget *item;
 
-       window->priv->tab_width_combo = gedit_status_combo_box_new (_("Tab Width:"));
+       window->priv->tab_width_combo = gedit_status_menu_button_new ();
        window->priv->tab_width_combo_menu = gtk_menu_new ();
        gtk_menu_button_set_popup (GTK_MENU_BUTTON (window->priv->tab_width_combo),
                                   window->priv->tab_width_combo_menu);
@@ -2081,7 +2081,7 @@ create_language_combo (GeditWindow *window)
        GtkWidget *item;
        gint i;
 
-       window->priv->language_combo = gedit_status_combo_box_new (NULL);
+       window->priv->language_combo = gedit_status_menu_button_new ();
        window->priv->language_combo_menu = gtk_menu_new ();
        gtk_menu_button_set_popup (GTK_MENU_BUTTON (window->priv->language_combo),
                                   window->priv->language_combo_menu);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]