From 0a3caf6b320e62c60de16ece2fb4d813b0e5fcd4 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Mon, 5 Jul 2004 21:27:49 +0000 Subject: symbol list font --- mixgtk/mixgtk.glade | 39 ++++++++++++++++++++++++--------------- mixgtk/mixgtk_fontsel.c | 8 ++++---- mixgtk/mixgtk_fontsel.h | 3 ++- mixgtk/mixgtk_mixal.c | 21 ++++++++++++++------- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade index 0f8b6bc..1663a67 100644 --- a/mixgtk/mixgtk.glade +++ b/mixgtk/mixgtk.glade @@ -49,7 +49,7 @@ - + True gtk-open 1 @@ -72,7 +72,7 @@ - + True gtk-justify-fill 1 @@ -95,7 +95,7 @@ - + True gtk-execute 1 @@ -124,7 +124,7 @@ - + True gtk-quit 1 @@ -160,7 +160,7 @@ - + True gtk-go-forward 1 @@ -183,7 +183,7 @@ - + True gtk-goto-last 1 @@ -206,7 +206,7 @@ - + True gtk-clear 1 @@ -229,7 +229,7 @@ - + True gtk-index 1 @@ -271,7 +271,7 @@ True - + True gtk-dnd-multiple 1 @@ -336,7 +336,7 @@ True - + True gtk-select-font 1 @@ -395,6 +395,15 @@ + + + True + Symbol _list + True + + + + True @@ -424,7 +433,7 @@ - + True gtk-zoom-100 1 @@ -445,7 +454,7 @@ - + True gtk-home 1 @@ -466,7 +475,7 @@ - + True gtk-preferences 1 @@ -494,7 +503,7 @@ - + True gtk-save 1 @@ -539,7 +548,7 @@ - + True gtk-help 1 diff --git a/mixgtk/mixgtk_fontsel.c b/mixgtk/mixgtk_fontsel.c index 37cc9c8..4a4753f 100644 --- a/mixgtk/mixgtk_fontsel.c +++ b/mixgtk/mixgtk_fontsel.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_fontsel.c : * Implementation of the functions declared in mixgtk_fontsel.h * ------------------------------------------------------------------ - * $Id: mixgtk_fontsel.c,v 1.17 2004/07/04 22:34:15 jao Exp $ + * $Id: mixgtk_fontsel.c,v 1.18 2004/07/05 21:27:54 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2004 Free Software Foundation, Inc. * @@ -34,7 +34,7 @@ static GtkFontSelectionDialog *fontsel_dialog_ = NULL; static const gchar *keys_[MIX_FONT_NO] = { "MIX.font", "Prompt.font", "Log.font", "MIXAL.font", "Devices.font", - "Default.font" + "Symbols.font", "Default.font" }; @@ -59,7 +59,7 @@ mixgtk_fontsel_set_font (mixgtk_font_t f, GtkWidget *w) font = mixgtk_config_get (keys_[f]); if (!font) { - mixgtk_config_update (keys_[f], "Monospace"); + mixgtk_config_update (keys_[f], "Monospace 10"); font = mixgtk_config_get (keys_[f]); g_assert (font); } @@ -89,7 +89,7 @@ mixgtk_fontsel_query_font (mixgtk_font_t f, GtkWidget **w, size_t no) current = mixgtk_config_get (keys_[f]); gtk_font_selection_dialog_set_font_name (fontsel_dialog_, - current? current : "Monospace"); + current? current : "Monospace 10"); while (result == GTK_RESPONSE_APPLY) { diff --git a/mixgtk/mixgtk_fontsel.h b/mixgtk/mixgtk_fontsel.h index df2a040..1f3c615 100644 --- a/mixgtk/mixgtk_fontsel.h +++ b/mixgtk/mixgtk_fontsel.h @@ -1,7 +1,7 @@ /* -*-c-*- ---------------- mixgtk_fontsel.h : * Functions for handling font selection. * ------------------------------------------------------------------ - * $Id: mixgtk_fontsel.h,v 1.6 2004/07/04 22:34:15 jao Exp $ + * $Id: mixgtk_fontsel.h,v 1.7 2004/07/05 21:27:56 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2004 Free Software Foundation, Inc. * @@ -34,6 +34,7 @@ typedef enum { MIX_FONT_PROMPT, MIX_FONT_MIXAL, MIX_FONT_DEVICES, + MIX_FONT_SYMBOLS, MIX_FONT_DEFAULT, MIX_FONT_NO } mixgtk_font_t; diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c index 3b2d42d..0d9c4df 100644 --- a/mixgtk/mixgtk_mixal.c +++ b/mixgtk/mixgtk_mixal.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_mixal.c : * Implementation of the functions declared in mixgtk_mixal.h * ------------------------------------------------------------------ - * $Id: mixgtk_mixal.c,v 1.20 2004/07/04 22:34:15 jao Exp $ + * $Id: mixgtk_mixal.c,v 1.21 2004/07/05 21:29:16 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. * @@ -83,7 +83,7 @@ init_symbols_ (void) (MIXGTK_SYMBOLS_DIALOG, SYMBOLS_VIEW_NAME_)); g_assert (symbols_view_); - mixgtk_fontsel_set_font (MIX_FONT_DEFAULT, GTK_WIDGET (symbols_view_)); + mixgtk_fontsel_set_font (MIX_FONT_SYMBOLS, GTK_WIDGET (symbols_view_)); symbols_store_ = gtk_list_store_new (SYMBOLS_COL_NO, G_TYPE_STRING, @@ -211,8 +211,6 @@ init_clist_ (void) mixgtk_fontsel_set_font (MIX_FONT_MIXAL, GTK_WIDGET (clist_)); - g_object_ref (clist_); - gtk_widget_show (GTK_WIDGET (clist_)); } @@ -246,7 +244,7 @@ void mixgtk_mixal_update_fonts (void) { mixgtk_fontsel_set_font (MIX_FONT_MIXAL, GTK_WIDGET (clist_)); - mixgtk_fontsel_set_font (MIX_FONT_DEFAULT, GTK_WIDGET (symbols_view_)); + mixgtk_fontsel_set_font (MIX_FONT_SYMBOLS, GTK_WIDGET (symbols_view_)); } void @@ -569,5 +567,14 @@ on_mixal_font_activate () mixgtk_fontsel_query_font (MIX_FONT_MIXAL, w, 1); } - - +void +on_symbols_font_activate () +{ + if (symbols_view_ != NULL) + { + GtkWidget *w[] = { GTK_WIDGET (symbols_view_) }; + mixgtk_fontsel_query_font (MIX_FONT_SYMBOLS, w, 1); + } + else + mixgtk_fontsel_query_font (MIX_FONT_SYMBOLS, NULL, 0); +} -- cgit v1.2.3