#include <config.h>
#include <cstdlib>
+#include <clocale>
#ifdef __GNUG__
#pragma implementation
#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"
#include "lyxrc.h"
#include "gettext.h"
#include "lyx_gui_misc.h"
+#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/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;
extern bool finished; // flag, that we are quitting the program
extern BufferList bufferlist;
extern GUIRunTime guiruntime;
+extern string user_lyxdir;
FL_CMD_OPT cmdopt[] =
{
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,
if (height < 400) height = 400;
// If width is not set by geometry, check it against monitor width
- if ( !(geometryBitmask & 4) ) {
+ if (!(geometryBitmask & 4)) {
Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
if (WidthOfScreen(scr) - 8 < width)
width = WidthOfScreen(scr) - 8;
}
// If height is not set by geometry, check it against monitor height
- if ( !(geometryBitmask & 8) ) {
+ if (!(geometryBitmask & 8)) {
Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
if (HeightOfScreen(scr) - 24 < height)
height = HeightOfScreen(scr) - 24;
delete lyxserver;
lyxserver = 0;
delete lyxViews;
-
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
CloseLyXLookup();
+#endif
}
if (lyxrc.font_norm_menu.empty())
lyxrc.font_norm_menu = lyxrc.font_norm;
// Set the font name for popups and menus
- string menufontname = lyxrc.menu_font_name
+ string boldfontname = lyxrc.menu_font_name
+ "-*-*-*-?-*-*-*-*-"
+ lyxrc.font_norm_menu;
// "?" means "scale that font"
- string popupfontname = lyxrc.popup_font_name
+ string fontname = lyxrc.popup_font_name
+ "-*-*-*-?-*-*-*-*-"
+ lyxrc.font_norm_menu;
- int bold = fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str());
- int normal = fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str());
+ int bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
+ int normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
if (bold < 0)
lyxerr << "Could not set menu font to "
- << menufontname << endl;
+ << boldfontname << endl;
if (normal < 0)
lyxerr << "Could not set popup font to "
- << popupfontname << endl;
+ << fontname << endl;
if (bold < 0 && normal < 0) {
lyxerr << "Using 'helvetica' font for menus" << endl;
- bold = fl_set_font_name(FL_BOLD_STYLE,
- "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1");
- normal = fl_set_font_name(FL_NORMAL_STYLE,
- "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1");
+ boldfontname = "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1";
+ fontname = "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1";
+ bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
+ normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
+
if (bold < 0 && normal < 0) {
lyxerr << "Could not find helvetica font. Using 'fixed'." << endl;
- normal = fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+ fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+ normal = bold = 0;
}
}
+ if (bold < 0)
+ fl_set_font_name(FL_BOLD_STYLE, fontname.c_str());
+ else if (normal < 0)
+ fl_set_font_name(FL_NORMAL_STYLE, boldfontname.c_str());
// put here (after fl_initialize) to avoid segfault. Cannot be done
// in setDefaults() (Matthias 140496)
// 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,
fl_addto_choice(fd_form_character->choice_color,
_(" No change %l| No color | Black | White | Red | Green "
"| Blue | Cyan | Magenta | Yellow %l| Reset "));
+ // Appears to need initialising to avoid seg fault when dialog is
+ // launched. Over-written by combo_language2, below
+ fl_addto_choice(fd_form_character->choice_language,
+ _(" English %l| German | French "));
fl_set_form_minsize(fd_form_character->form_character,
fd_form_character->form_character->w,
fd_form_character->form_character->h);
lyxerr[Debug::INIT] << "Initializing form_character...done" << endl;
// build up the combox entries
- combo_language2->addto(_("No change"));
- combo_language2->addto(_("Reset"));
- for(Languages::const_iterator cit = languages.begin();
+ combo_language2->addline(_("No change"));
+ combo_language2->addline(_("Reset"));
+ for (Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) {
#ifdef DO_USE_DEFAULT_LANGUAGE
if ((*cit).second.lang() != "default")
#endif
combo_language2->addto((*cit).second.lang());
}
- combo_language2->select_text(_("No change"));
// the preamble form
fd_form_preamble = create_form_form_preamble();
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 = 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();
}
projects / lyx.git / blobdiff