From 5074bb82df6c0c4d78ac61c289f5c4166a08c555 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Sat, 30 Aug 2008 01:14:18 -0500
Subject: [PATCH] Removed use-default-font preference

---
 moo.mprj                                     |  6 ++
 moo/mooedit/glade/mooeditprefs-general.glade | 65 ++++++++------------
 moo/mooedit/mooeditprefs.c                   |  9 +--
 moo/mooedit/mooeditprefs.h                   |  1 -
 4 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/moo.mprj b/moo.mprj
index ba85861d..7e7773f9 100644
--- a/moo.mprj
+++ b/moo.mprj
@@ -9,6 +9,12 @@
    <build_dir>build/debug</build_dir>
    <configure>
     <args>--enable-debug --enable-all-warnings --enable-project --prefix=${PREFIX:-/usr/local}</args>
+    <vars>
+     <var name="CC">gcc-4.2</var>
+     <var name="CFLAGS">-g</var>
+     <var name="CXX">g++-4.2</var>
+     <var name="CXXFLAGS">-g</var>
+    </vars>
    </configure>
   </debug>
   <gtk-2.6>
diff --git a/moo/mooedit/glade/mooeditprefs-general.glade b/moo/mooedit/glade/mooeditprefs-general.glade
index 640a7f18..fe9a21cc 100644
--- a/moo/mooedit/glade/mooeditprefs-general.glade
+++ b/moo/mooedit/glade/mooeditprefs-general.glade
@@ -122,31 +122,13 @@
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkSpinButton" id="indent_width">
-                            <property name="visible">True</property>
-                            <property name="moo_prefs_key">indent_width</property>
-                            <property name="adjustment">4 1 100 1 10 10</property>
-                            <property name="climb_rate">1</property>
-                            <property name="numeric">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label32">
+                          <widget class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Indent width:</property>
-                            <property name="mnemonic_widget">indent_width</property>
+                            <property name="label" translatable="yes">Tab width:</property>
+                            <property name="mnemonic_widget">tab_width</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
@@ -166,16 +148,34 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label1">
+                          <widget class="GtkLabel" id="label32">
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Tab width:</property>
-                            <property name="mnemonic_widget">tab_width</property>
+                            <property name="label" translatable="yes">Indent width:</property>
+                            <property name="mnemonic_widget">indent_width</property>
                           </widget>
                           <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkSpinButton" id="indent_width">
+                            <property name="visible">True</property>
+                            <property name="moo_prefs_key">indent_width</property>
+                            <property name="adjustment">4 1 100 1 10 10</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                       <packing>
                         <property name="position">5</property>
@@ -269,20 +269,6 @@
                   <widget class="GtkVBox" id="vbox8">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
-                    <child>
-                      <widget class="GtkCheckButton" id="use_default_font">
-                        <property name="visible">True</property>
-                        <property name="moo_prefs_key">use_default_font</property>
-                        <property name="label" translatable="yes">Use default theme font</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
                     <child>
                       <widget class="GtkTable" id="table2">
                         <property name="visible">True</property>
@@ -293,7 +279,6 @@
                         <child>
                           <widget class="GtkLabel" id="label99">
                             <property name="visible">True</property>
-                            <property name="moo_sensitive">!use_default_font</property>
                             <property name="xalign">1</property>
                             <property name="label" translatable="yes">Font:</property>
                           </widget>
@@ -332,7 +317,6 @@
                           <widget class="GtkFontButton" id="fontbutton:MooFontButton">
                             <property name="visible">True</property>
                             <property name="moo_prefs_key">font</property>
-                            <property name="moo_sensitive">!use_default_font</property>
                             <property name="response_id">0</property>
                             <property name="use_font">True</property>
                             <property name="use_size">True</property>
@@ -346,7 +330,6 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
diff --git a/moo/mooedit/mooeditprefs.c b/moo/mooedit/mooeditprefs.c
index 6ad7de6d..8081bb06 100644
--- a/moo/mooedit/mooeditprefs.c
+++ b/moo/mooedit/mooeditprefs.c
@@ -127,7 +127,6 @@ _moo_edit_init_prefs (void)
     NEW_KEY_BOOL (MOO_EDIT_PREFS_SHOW_LINE_NUMBERS, FALSE);
     NEW_KEY_BOOL (MOO_EDIT_PREFS_SHOW_TABS, FALSE);
     NEW_KEY_BOOL (MOO_EDIT_PREFS_SHOW_TRAILING_SPACES, FALSE);
-    NEW_KEY_BOOL (MOO_EDIT_PREFS_USE_DEFAULT_FONT, FALSE);
     NEW_KEY_STRING (MOO_EDIT_PREFS_FONT, "Monospace");
     NEW_KEY_FLAGS (MOO_EDIT_PREFS_QUICK_SEARCH_FLAGS,
                    MOO_TYPE_TEXT_SEARCH_FLAGS,
@@ -210,12 +209,8 @@ _moo_edit_apply_prefs (MooEdit *edit)
                   "backspace-indents", get_bool (MOO_EDIT_PREFS_BACKSPACE_INDENTS),
                   NULL);
 
-    if (get_bool (MOO_EDIT_PREFS_USE_DEFAULT_FONT))
-        moo_text_view_set_font_from_string (MOO_TEXT_VIEW (edit), NULL);
-    else
-        moo_text_view_set_font_from_string (MOO_TEXT_VIEW (edit),
-                                            get_string (MOO_EDIT_PREFS_FONT));
-
+    moo_text_view_set_font_from_string (MOO_TEXT_VIEW (edit),
+                                        get_string (MOO_EDIT_PREFS_FONT));
     _moo_text_view_set_line_numbers_font (MOO_TEXT_VIEW (edit),
                                           get_string (MOO_EDIT_PREFS_LINE_NUMBERS_FONT));
 
diff --git a/moo/mooedit/mooeditprefs.h b/moo/mooedit/mooeditprefs.h
index 78ca13b1..379e3490 100644
--- a/moo/mooedit/mooeditprefs.h
+++ b/moo/mooedit/mooeditprefs.h
@@ -61,7 +61,6 @@ const char *moo_edit_setting                (const char     *setting_name);
 #define MOO_EDIT_PREFS_SHOW_LINE_NUMBERS        "show_line_numbers"
 #define MOO_EDIT_PREFS_SHOW_TABS                "show_tabs"
 #define MOO_EDIT_PREFS_SHOW_TRAILING_SPACES     "show_trailing_spaces"
-#define MOO_EDIT_PREFS_USE_DEFAULT_FONT         "use_default_font"
 #define MOO_EDIT_PREFS_FONT                     "font"
 #define MOO_EDIT_PREFS_LINE_NUMBERS_FONT        "line_numbers_font"