mathed31.diff

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index de20292b77e46a6430769de8343984ea538cf468..6003d6368069507dc6275ac9f7d3f5d877e9d2b0 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <cstdlib>
+#include <clocale>
 
 #ifdef __GNUG__
 #pragma implementation
@@ -26,7 +27,6 @@
 #include "print_form.h"
 #include "tex-strings.h"
 #include "lyx_main.h"
-#include "log_form.h"
 #include "debug.h"
 #include "version.h"
 #include "LyXView.h"
@@ -35,23 +35,22 @@
 #include "lyxrc.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 #include "bufferlist.h"
 #include "language.h"
 #include "ColorHandler.h"
+#include "frontends/Dialogs.h"
 #include "frontends/GUIRunTime.h"
-#include "frontends/xforms/Color.h"
+#include "frontends/xforms/xform_helpers.h" // for XformColor
 
 using std::endl;
 
-FD_form_title * fd_form_title;
 FD_form_character * fd_form_character;
 FD_form_preamble * fd_form_preamble;
 FD_form_sendto * fd_form_sendto;
 FD_form_figure * fd_form_figure;
-FD_LaTeXLog * fd_latex_log; // from log_form.h
 Combox * combo_language;
 Combox * combo_language2;
 
@@ -108,7 +107,10 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        
        static const int num_res = sizeof(res)/sizeof(FL_resource);
        fl_initialize(argc, argv, "LyX", cmdopt, num_res);
-       fl_get_app_resources(res, num_res);
+       // It appears that, in xforms >=0.89.5, fl_initialize()
+       // calls setlocale() and ruins our LC_NUMERIC setting.
+       setlocale(LC_NUMERIC, "C");
+       fl_get_app_resources(res, num_res);
 
        static const int geometryBitmask =
                XParseGeometry( geometry,
@@ -167,7 +169,7 @@ LyXGUI::~LyXGUI()
        delete lyxserver;
        lyxserver = 0;
        delete lyxViews;
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        CloseLyXLookup();
 #endif
 }
@@ -277,32 +279,6 @@ void LyXGUI::create_forms()
        // Create forms
        //
 
-       // the title form
-       string banner_file = LibFileSearch("images", "banner", "xpm");
-       if (lyxrc.show_banner && !banner_file.empty()) {
-               fd_form_title = create_form_form_title();
-               fl_set_form_dblbuffer(fd_form_title->form_title, 1); // use dbl buffer
-               fl_set_form_atclose(fd_form_title->form_title, CancelCloseBoxCB, 0);
-               fl_addto_form(fd_form_title->form_title);
-               FL_OBJECT *obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 0, 0, 425, 290, "");
-               fl_set_pixmapbutton_file(obj, banner_file.c_str());
-               
-               fl_set_pixmapbutton_focus_outline(obj, 3);
-               fl_set_button_shortcut(obj, "^M ^[", 1);
-               fl_set_object_boxtype(obj, FL_NO_BOX);
-               fl_set_object_callback(obj, TimerCB, 0);
-               
-               obj = fl_add_text(FL_NORMAL_TEXT, 248, 265, 170, 16, LYX_VERSION);
-               fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-               fl_mapcolor(FL_FREE_COL2, 0x05, 0x2e, 0x4c);
-               fl_mapcolor(FL_FREE_COL3, 0xe1, 0xd2, 0x9b);
-               fl_set_object_color(obj, FL_FREE_COL2, FL_FREE_COL2);
-               fl_set_object_lcol(obj, FL_FREE_COL3);
-               fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-               fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-               fl_end_form();
-       }
-
        // the character form
        fd_form_character = create_form_form_character();
        fl_set_form_atclose(fd_form_character->form_character,
@@ -365,46 +341,25 @@ void LyXGUI::create_forms()
                            CancelCloseBoxCB, 0);
        fl_set_button(fd_form_figure->radio_postscript, 1);
 
-       // the latex log form
-       fd_latex_log = create_form_LaTeXLog();
-       fl_set_form_atclose(fd_latex_log->LaTeXLog,
-                           CancelCloseBoxCB, 0);
-
        // This is probably as good a time as any to map the xform colours,
        // should a mapping exist.
        {
-               string filename = user_lyxdir + "/preferences.xform";
+               string filename = AddName(user_lyxdir, "preferences.xform");
                XformColor::read( filename );
        }
        
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
-       int title_placement = FL_PLACE_CENTER;
        // Did we get a valid position?
        if (xpos >= 0 && ypos >= 0) {
                lyxViews->setPosition(xpos, ypos);
-               if (lyxrc.show_banner) {
-                       // show the title form in the middle of the main form
-                       fl_set_form_position(fd_form_title->form_title,
-                                            abs(xpos + (width/2) - (370 / 2)),
-                                            abs(ypos + (height/2) - (290 / 2)));
-                       title_placement = FL_PLACE_GEOMETRY;
-                       // The use of abs() above is a trick to ensure
-                       // valid positions
-               }
-                       main_placement = FL_PLACE_POSITION;
+               main_placement = FL_PLACE_POSITION;
        }
+
        lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
-       if (lyxrc.show_banner) {
-               fl_show_form(fd_form_title->form_title, 
-                            title_placement, FL_NOBORDER, 
-                            _("LyX Banner"));
-               fl_redraw_form(fd_form_title->form_title);
-               fl_raise_form(fd_form_title->form_title);
-
-               // Show the title form at most 7 secs (lowered from 10 secs)
-               fl_set_timer(fd_form_title->timer_title, 7);
-       }
+
+       if (lyxrc.show_banner)
+               lyxViews->getDialogs()->showSplash();
 }