Refactored glPrefsModel; Added Units module to libglabels

[glabels] / src / font-combo-menu.c

diff --git a/src/font-combo-menu.c b/src/font-combo-menu.c
index 34c939794adbdebfaa27d43e186574b2529a18ee..6df363af8251769bfe4c13970e292d600ebd9754 100644 (file)
--- a/src/font-combo-menu.c
+++ b/src/font-combo-menu.c
@@ -27,6 +27,7 @@
 
 #include "font-combo-menu-item.h"
 #include "font-util.h"
+#include "font-history.h"
 #include "marshal.h"
 
 
@@ -41,7 +42,10 @@
 
 struct _glFontComboMenuPrivate {
 
-        gchar *font_family;
+        gchar     *font_family;
+
+        GtkWidget *recent_menu_item;
+        GtkWidget *recent_sub_menu;
 
 };
 
@@ -63,10 +67,16 @@ static guint signals[LAST_SIGNAL] = {0};
 /* Local function prototypes                 */
 /*===========================================*/
 
-static void gl_font_combo_menu_finalize (GObject        *object);
+static void       gl_font_combo_menu_finalize (GObject             *object);
+
+static void       menu_item_activate_cb       (glFontComboMenuItem *item,
+                                               glFontComboMenu     *this);
+
+static GtkWidget *new_font_sub_menu           (glFontComboMenu     *this,
+                                               const GList         *list);
+
+static void       font_history_changed_cb     (glFontComboMenu     *this);
 
-static void menu_item_activate_cb (glFontComboMenuItem *item,
-                                   glFontComboMenu     *this);
 
 
 /****************************************************************************/
@@ -104,11 +114,10 @@ gl_font_combo_menu_class_init (glFontComboMenuClass *class)
 static void
 gl_font_combo_menu_init (glFontComboMenu *this)
 {
-        gint         i;
-        GtkWidget   *menu_item;
-        GtkWidget   *sub_menu;
-        const GList *list;
-        GList       *p;
+        gint          i;
+        GtkWidget    *menu_item;
+        GtkWidget    *sub_menu;
+        const GList  *list;
 
        this->priv = g_new0 (glFontComboMenuPrivate, 1);
 
@@ -124,50 +133,52 @@ gl_font_combo_menu_init (glFontComboMenu *this)
         menu_item = gtk_separator_menu_item_new ();
         gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
 
-        menu_item = gtk_menu_item_new_with_label (_("Proportional fonts"));
+
+        menu_item = gtk_menu_item_new_with_label (_("Recent fonts"));
         gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
 
-        sub_menu = gtk_menu_new ();
+        list = gl_font_history_model_get_family_list (gl_font_history);
+        sub_menu = new_font_sub_menu (this, list);
         gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
+        gtk_widget_set_sensitive (menu_item, list != NULL);
 
-        list = gl_font_util_get_proportional_families ();
-        for ( p = (GList *)list; p != NULL; p = p->next )
-        {
-                menu_item = gl_font_combo_menu_item_new (p->data);
-                gtk_menu_shell_append (GTK_MENU_SHELL (sub_menu), menu_item);
-                g_signal_connect (menu_item, "activate",
-                                  G_CALLBACK (menu_item_activate_cb), this);
-        }
+        this->priv->recent_menu_item = menu_item;
+        this->priv->recent_sub_menu  = sub_menu;
 
-        menu_item = gtk_menu_item_new_with_label (_("Fixed-width fonts"));
+        menu_item = gtk_separator_menu_item_new ();
+        gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
+
+
+        menu_item = gtk_menu_item_new_with_label (_("Proportional fonts"));
         gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
 
-        sub_menu = gtk_menu_new ();
+        list = gl_font_util_get_proportional_families ();
+        sub_menu = new_font_sub_menu (this, list);
         gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
+        gtk_widget_set_sensitive (menu_item, list != NULL);
+
+        menu_item = gtk_menu_item_new_with_label (_("Fixed-width fonts"));
+        gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
 
         list = gl_font_util_get_fixed_width_families ();
-        for ( p = (GList *)list; p != NULL; p = p->next )
-        {
-                menu_item = gl_font_combo_menu_item_new (p->data);
-                gtk_menu_shell_append (GTK_MENU_SHELL (sub_menu), menu_item);
-                g_signal_connect (menu_item, "activate",
-                                  G_CALLBACK (menu_item_activate_cb), this);
-        }
+        sub_menu = new_font_sub_menu (this, list);
+        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
+        gtk_widget_set_sensitive (menu_item, list != NULL);
 
         menu_item = gtk_menu_item_new_with_label (_("All fonts"));
         gtk_menu_shell_append (GTK_MENU_SHELL (this), menu_item);
 
-        sub_menu = gtk_menu_new ();
+        list = gl_font_util_get_all_families ();
+        sub_menu = new_font_sub_menu (this, list);
         gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
+        gtk_widget_set_sensitive (menu_item, list != NULL);
+
+
+        gtk_widget_show_all (GTK_WIDGET (this));
 
-        list = gl_font_util_get_all_families ();
-        for ( p = (GList *)list; p != NULL; p = p->next )
-        {
-                menu_item = gl_font_combo_menu_item_new (p->data);
-                gtk_menu_shell_append (GTK_MENU_SHELL (sub_menu), menu_item);
-                g_signal_connect (menu_item, "activate",
-                                  G_CALLBACK (menu_item_activate_cb), this);
-        }
+
+        g_signal_connect_swapped (gl_font_history, "changed",
+                                  G_CALLBACK (font_history_changed_cb), this);
 
 }
 
@@ -227,6 +238,64 @@ gl_font_combo_menu_get_family (glFontComboMenu *this)
 }
 
 
+/*****************************************************************************/
+/* Create a new font sub menu from font list.                                */
+/*****************************************************************************/
+static GtkWidget *
+new_font_sub_menu (glFontComboMenu *this,
+                   const GList     *list)
+{
+        GtkWidget   *menu;
+        GtkWidget   *menu_item;
+        GList       *p;
+
+        menu = gtk_menu_new ();
+
+        for ( p = (GList *)list; p != NULL; p = p->next )
+        {
+                menu_item = gl_font_combo_menu_item_new (p->data);
+                gtk_widget_show_all (menu_item);
+                gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+                g_signal_connect (menu_item, "activate",
+                                  G_CALLBACK (menu_item_activate_cb), this);
+        }
+
+        gtk_widget_show (menu);
+        return menu;
+}
+
+
+/*****************************************************************************/
+/* Font history changed callback.                                            */
+/*****************************************************************************/
+static void
+font_history_changed_cb (glFontComboMenu     *this)
+{
+        GList *list;
+
+        /*
+         * Remove old sub menu
+         */
+        gtk_menu_item_set_submenu (GTK_MENU_ITEM (this->priv->recent_menu_item),
+                                   NULL);
+
+        /*
+         * Build new sub menu
+         */
+        list = gl_font_history_model_get_family_list (gl_font_history);
+        this->priv->recent_sub_menu = new_font_sub_menu (this, list);
+
+        /*
+         * Attach to top-level menu item
+         */
+        gtk_menu_item_set_submenu (GTK_MENU_ITEM (this->priv->recent_menu_item),
+                                   this->priv->recent_sub_menu);
+        gtk_widget_set_sensitive (this->priv->recent_menu_item, list != NULL);
+
+        gl_font_history_model_free_family_list (list);
+}
+
+
 
 
 /*