diff options
Diffstat (limited to 'mixgtk')
-rw-r--r-- | mixgtk/mixgtk.glade | 39 | ||||
-rw-r--r-- | mixgtk/mixgtk_fontsel.c | 8 | ||||
-rw-r--r-- | mixgtk/mixgtk_fontsel.h | 3 | ||||
-rw-r--r-- | 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 @@ <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image376"> + <widget class="GtkImage" id="image432"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -72,7 +72,7 @@ <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image377"> + <widget class="GtkImage" id="image433"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> @@ -95,7 +95,7 @@ <accelerator key="B" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image378"> + <widget class="GtkImage" id="image434"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon_size">1</property> @@ -124,7 +124,7 @@ <accelerator key="Q" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image379"> + <widget class="GtkImage" id="image435"> <property name="visible">True</property> <property name="stock">gtk-quit</property> <property name="icon_size">1</property> @@ -160,7 +160,7 @@ <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image380"> + <widget class="GtkImage" id="image436"> <property name="visible">True</property> <property name="stock">gtk-go-forward</property> <property name="icon_size">1</property> @@ -183,7 +183,7 @@ <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image381"> + <widget class="GtkImage" id="image437"> <property name="visible">True</property> <property name="stock">gtk-goto-last</property> <property name="icon_size">1</property> @@ -206,7 +206,7 @@ <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image382"> + <widget class="GtkImage" id="image438"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> @@ -229,7 +229,7 @@ <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image383"> + <widget class="GtkImage" id="image439"> <property name="visible">True</property> <property name="stock">gtk-index</property> <property name="icon_size">1</property> @@ -271,7 +271,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image384"> + <widget class="GtkImage" id="image440"> <property name="visible">True</property> <property name="stock">gtk-dnd-multiple</property> <property name="icon_size">1</property> @@ -336,7 +336,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image385"> + <widget class="GtkImage" id="image441"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -396,6 +396,15 @@ </child> <child> + <widget class="GtkMenuItem" id="symbol_list"> + <property name="visible">True</property> + <property name="label" translatable="yes">Symbol _list</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_symbols_font_activate" last_modification_time="Sun, 04 Jul 2004 23:03:55 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator4"> <property name="visible">True</property> </widget> @@ -424,7 +433,7 @@ <signal name="activate" handler="on_devform_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image386"> + <widget class="GtkImage" id="image442"> <property name="visible">True</property> <property name="stock">gtk-zoom-100</property> <property name="icon_size">1</property> @@ -445,7 +454,7 @@ <signal name="activate" handler="on_devdir_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image387"> + <widget class="GtkImage" id="image443"> <property name="visible">True</property> <property name="stock">gtk-home</property> <property name="icon_size">1</property> @@ -466,7 +475,7 @@ <signal name="activate" handler="on_external_programs_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image388"> + <widget class="GtkImage" id="image444"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -494,7 +503,7 @@ <signal name="activate" handler="on_save_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image389"> + <widget class="GtkImage" id="image445"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -539,7 +548,7 @@ <signal name="activate" handler="on_about_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image390"> + <widget class="GtkImage" id="image446"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> 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); +} |