-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
+/**
+ * \file FormPreferences.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
*
- *======================================================*/
-/* FormPreferences.C
- * FormPreferences Interface Class Implementation
+ * \author Angus Leeming, a.leeming@ic.ac.uk
*/
#include <config.h>
-#include <utility>
-#include <iomanip>
-#include <X11/Xlib.h>
-
-#include FORMS_H_LOCATION
-
#ifdef __GNUG_
#pragma implementation
#endif
-#include "Color.h"
-#include "LColor.h"
-#include "Lsstream.h"
#include "FormPreferences.h"
#include "form_preferences.h"
-#include "input_validators.h"
+#include "ButtonController.tmpl"
+#include "Dialogs.h"
+
+#include "buffer.h"
+#include "converter.h"
+#include "debug.h"
#include "LyXView.h"
#include "language.h"
#include "lyxfunc.h"
-#include "Dialogs.h"
+#include "lyxlex.h"
#include "lyxrc.h"
+#include "LColor.h"
+#include "Lsstream.h"
+
#include "combox.h"
-#include "debug.h"
-#include "support/filetools.h"
-#include "support/LAssert.h"
-#include "lyx_gui_misc.h" // idex, scex
-#include "lyxlex.h"
+#include "Color.h"
#include "input_validators.h"
#include "xforms_helpers.h"
#include "helper_funcs.h"
-#include "converter.h"
+
#include "support/lyxfunctional.h"
#include "support/lyxmanip.h"
+#include "support/filetools.h"
+#include "support/LAssert.h"
+
+#include "graphics/GraphicsCache.h"
+
+#include <utility>
+#include <iomanip>
+#include <X11/Xlib.h>
using std::endl;
using std::pair;
using std::max;
using std::min;
using std::vector;
+using std::setw;
+using std::setfill;
+
using SigC::slot;
extern string system_lyxdir;
FormPreferences::FormPreferences(LyXView * lv, Dialogs * d)
: FormBaseBI(lv, d, _("Preferences"), false),
- warningPosted(false),
colors_(*this), converters_(*this), inputs_misc_(*this),
- formats_(*this), interface_(*this), language_(*this),
+ formats_(*this), interface_(*this), language_(*this),
lnf_misc_(*this), outputs_misc_(*this), paths_(*this),
printer_(*this), screen_fonts_(*this), spelloptions_(*this)
{
FL_FORM * form3 = 0;
if (form2 == converters_tab_->form)
- form3 = fl_get_active_folder(converters_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(converters_tab_->tabfolder_inner);
else if (form2 == look_n_feel_tab_->form)
- form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_inner);
else if (form2 == inputs_tab_->form)
- form3 = fl_get_active_folder(inputs_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(inputs_tab_->tabfolder_inner);
else if (form2 == outputs_tab_->form)
- form3 = fl_get_active_folder(outputs_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(outputs_tab_->tabfolder_inner);
else if (form2 == lang_opts_tab_->form)
- form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_inner);
if (form3 && form3->visible)
fl_redraw_form(form3);
{
show();
fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form);
- fl_set_folder(lang_opts_tab_->tabfolder_outer, spelloptions_.dialog()->form);
+ fl_set_folder(lang_opts_tab_->tabfolder_inner, spelloptions_.dialog()->form);
}
AddName(user_lyxdir, "preferences.xform");
colors_.modifiedXformsPrefs = !XformsColor::write(filename);
}
-
+
lv_->getLyXFunc()->dispatch(LFUN_SAVEPREFERENCES);
}
{
// We need to hide the active tabfolder otherwise we get a
// BadDrawable error from X window and LyX crashes without saving.
- FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
- if (outer_form
- && outer_form->visible) {
- fl_hide_form(outer_form);
+ FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs);
+ if (inner_form
+ && inner_form->visible) {
+ fl_hide_form(inner_form);
}
FormBaseDeprecated::hide();
}
// Manage the restore, save, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
- bc().setCancel(dialog_->button_cancel);
+ bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
+ // Allow the base class to control messages
+ setMessageWidget(dialog_->text_warning);
+
// build the tab folders
- converters_tab_.reset(build_outer_tab());
- look_n_feel_tab_.reset(build_outer_tab());
- inputs_tab_.reset(build_outer_tab());
- outputs_tab_.reset(build_outer_tab());
- lang_opts_tab_.reset(build_outer_tab());
+ converters_tab_.reset(build_inner_tab());
+ look_n_feel_tab_.reset(build_inner_tab());
+ inputs_tab_.reset(build_inner_tab());
+ outputs_tab_.reset(build_inner_tab());
+ lang_opts_tab_.reset(build_inner_tab());
// build actual tabfolder contents
// these will become nested tabfolders
_("Lang Opts"),
lang_opts_tab_->form);
fl_addto_tabfolder(dialog_->tabfolder_prefs,
- _("Converters"),
+ _("Conversion"),
converters_tab_->form);
fl_addto_tabfolder(dialog_->tabfolder_prefs,
_("Inputs"),
// now build the nested tabfolders
// Starting with look and feel
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Screen Fonts"),
screen_fonts_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Interface"),
interface_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Colors"),
colors_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Misc"),
lnf_misc_.dialog()->form);
// then build converters
- fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+ fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Formats"),
formats_.dialog()->form);
- fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+ fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Converters"),
converters_.dialog()->form);
// then build inputs
- // Paths should probably go in a few outer_tab called Files
- fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+ // Paths should probably go in a few inner_tab called Files
+ fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Paths"),
paths_.dialog()->form);
- fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Misc"),
inputs_misc_.dialog()->form);
// then building outputs
- fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Printer"),
printer_.dialog()->form);
- fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Misc"),
outputs_misc_.dialog()->form);
// then building usage
- fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Spell checker"),
spelloptions_.dialog()->form);
- fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Language"),
language_.dialog()->form);
}
}
-void FormPreferences::feedback(FL_OBJECT * ob)
+string const FormPreferences::getFeedback(FL_OBJECT * ob)
{
lyx::Assert(ob);
str = spelloptions_.feedback(ob);
}
- str = formatted(_(str), dialog_->text_warning->w-10, FL_SMALL_SIZE);
-
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
bool FormPreferences::input(FL_OBJECT * ob, long)
{
lyx::Assert(ob);
-
+
// whatever checks you need to ensure the user hasn't entered
// some totally ridiculous value somewhere. Change activate to suit.
// comments before each test describe what is _valid_
void FormPreferences::update()
{
if (!dialog_.get()) return;
-
+
// read lyxrc entries
colors_.update();
formats_.update(); // Must be before converters_.update()
if (modifiedXformsPrefs) {
for (vector<XformsColor>::const_iterator cit =
- xformsColorDB.begin();
+ xformsColorDB.begin();
cit != xformsColorDB.end(); ++cit) {
fl_mapcolor(cit->colorID, cit->r, cit->g, cit->b);
if (cit->colorID == GUI_COLOR_CURSOR) {
fl_mapcolor(GUI_COLOR_CURSOR,
cit->r, cit->g, cit->b);
- fl_set_cursor_color(FL_DEFAULT_CURSOR,
- GUI_COLOR_CURSOR, FL_WHITE);
+ setCursorColor(GUI_COLOR_CURSOR);
}
}
Dialogs::redrawGUI();
// Create a valid X11 name of the form "#rrggbb"
string const hexname = X11hexname(cit->color());
-
+
if (lcolor.getX11Name(lc) != hexname) {
lyxerr[Debug::GUI]
<< "FormPreferences::Colors::apply: "
fl_set_slider_bounds(dialog_->slider_value, 0.0, 1.0);
fl_set_slider_step(dialog_->slider_value, 0.01);
fl_set_slider_return(dialog_->slider_value, FL_RETURN_CHANGED);
-
+
fl_set_slider_bounds(dialog_->slider_red, 0.0, 255.0);
fl_set_slider_step(dialog_->slider_red, 1.0);
fl_set_slider_return(dialog_->slider_red, FL_RETURN_CHANGED);
-
+
fl_set_slider_bounds(dialog_->slider_green, 0.0, 255.0);
fl_set_slider_step(dialog_->slider_green, 1.0);
fl_set_slider_return(dialog_->slider_green, FL_RETURN_CHANGED);
-
+
fl_set_slider_bounds(dialog_->slider_blue, 0.0, 255.0);
fl_set_slider_step(dialog_->slider_blue, 1.0);
fl_set_slider_return(dialog_->slider_blue, FL_RETURN_CHANGED);
-
+
// set up the feedback mechanism
- setPreHandler(dialog_->browser_lyx_objs);
- setPreHandler(dialog_->button_color);
- setPreHandler(dialog_->button_modify);
- setPreHandler(dialog_->dial_hue);
- setPreHandler(dialog_->slider_saturation);
- setPreHandler(dialog_->slider_value);
- setPreHandler(dialog_->slider_red);
- setPreHandler(dialog_->slider_green);
- setPreHandler(dialog_->slider_blue);
- setPreHandler(dialog_->radio_rgb);
- setPreHandler(dialog_->radio_hsv);
+ setPrehandler(dialog_->browser_lyx_objs);
+ setPrehandler(dialog_->button_color);
+ setPrehandler(dialog_->button_modify);
+ setPrehandler(dialog_->dial_hue);
+ setPrehandler(dialog_->slider_saturation);
+ setPrehandler(dialog_->slider_value);
+ setPrehandler(dialog_->slider_red);
+ setPrehandler(dialog_->slider_green);
+ setPrehandler(dialog_->slider_blue);
+ setPrehandler(dialog_->radio_rgb);
+ setPrehandler(dialog_->radio_hsv);
}
string const
{
if (ob == dialog_->browser_lyx_objs) {
InputBrowserLyX();
-
+
} else if (ob == dialog_->dial_hue ||
ob == dialog_->slider_saturation ||
ob == dialog_->slider_value) {
HSVColor hsv(rgb);
hsv.v += addVal;
- hsv.v = min( 1.0, max(0.0, hsv.v) );
+ hsv.v = min(1.0, max(0.0, hsv.v));
rgb = RGBColor(hsv);
fl_mapcolor(colAdjust, rgb.r, rgb.g, rgb.b);
// Is the choice an Xforms color...
RGBColor col;
- if( selLyX-1 < xformsColorDB.size() ) {
+ if (selLyX - 1 < xformsColorDB.size()) {
vector<XformsColor>::size_type const i = selLyX - 1;
col = xformsColorDB[i].color();
}
// Display either RGB or HSV but not both!
SwitchColorSpace();
-
+
// Deactivate the modify button to begin with...
setEnabled(dialog_->button_modify, false);
-
+
fl_unfreeze_form(dialog_->form);
}
int const h = int(hue);
int const s = int(100.0 * sat);
int const v = int(100.0 * val);
-
+
string const label = tostr(h) + string(", ") + tostr(s) + string(", ") +
tostr(v);
fl_set_object_label(dialog_->text_color_values, label.c_str());
RGBColor col = HSVColor(hue, sat, val);
-
+
fl_freeze_form(dialog_->form);
fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
fl_unfreeze_form(dialog_->form);
if (selLyX < 1) return;
-
+
fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
bool modify = false;
-
+
// Is the choice an Xforms color...
- if( selLyX-1 < xformsColorDB.size() ) {
+ if (selLyX - 1 < xformsColorDB.size()) {
vector<XformsColor>::size_type const i = selLyX - 1;
modify = (xformsColorDB[i].color() != col);
}
string const label = tostr(red) + string(", ") + tostr(green) +
string(", ") + tostr(blue);
fl_set_object_label(dialog_->text_color_values, label.c_str());
-
+
fl_freeze_form(dialog_->form);
RGBColor col = RGBColor(red, green, blue);
fl_unfreeze_form(dialog_->form);
if (selLyX < 1) return;
-
+
bool modify = false;
-
+
// Is the choice an Xforms color...
- if( selLyX-1 < xformsColorDB.size() ) {
+ if (selLyX - 1 < xformsColorDB.size()) {
vector<XformsColor>::size_type const i = selLyX - 1;
modify = (xformsColorDB[i].color() != col);
}
xcol.colorID = FL_BLACK;
fl_getmcolor(FL_BLACK, &xcol.r, &xcol.g, &xcol.b);
- fl_mapcolor(GUI_COLOR_CURSOR, xcol.r, xcol.g, xcol.b);
- fl_set_cursor_color(FL_DEFAULT_CURSOR, GUI_COLOR_CURSOR, FL_WHITE);
-
xformsColorDB.push_back(xcol);
xcol.name = _("GUI selection");
fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
// Is the choice an Xforms color...
- if( selLyX-1 < xformsColorDB.size() ) {
+ if (selLyX - 1 < xformsColorDB.size()) {
vector<XformsColor>::size_type const i = selLyX - 1;
xformsColorDB[i].r = col.r;
xformsColorDB[i].g = col.g;
}
fl_freeze_form(dialog_->form);
- setEnabled(dialog_->button_modify, false);
+ setEnabled(dialog_->button_modify, false);
fl_unfreeze_form(dialog_->form);
}
HSVColor hsv = HSVColor(col);
hsv.h = max(hsv.h, 0.0);
-
+
fl_set_dial_value(dialog_->dial_hue, hsv.h);
fl_set_slider_value(dialog_->slider_saturation, hsv.s);
fl_set_slider_value(dialog_->slider_value, hsv.v);
string const label = tostr(h) + string(", ") + tostr(s) +
string(", ") + tostr(v);
fl_set_object_label(dialog_->text_color_values, label.c_str());
-
+
} else {
fl_show_object(dialog_->slider_red);
fl_show_object(dialog_->slider_blue);
string(", ") + tostr(b);
fl_set_object_label(dialog_->text_color_values, label.c_str());
}
-
+
fl_unfreeze_form(dialog_->form);
}
{
ostringstream ostr;
- ostr << "#" << std::setbase(16) << std::setfill('0')
- << std::setw(2) << col.r
- << std::setw(2) << col.g
- << std::setw(2) << col.b;
+ ostr << "#" << std::setbase(16) << setfill('0')
+ << setw(2) << col.r
+ << setw(2) << col.g
+ << setw(2) << col.b;
return ostr.str().c_str();
}
fl_set_input_return(dialog_->input_flags, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->browser_all);
- setPreHandler(dialog_->button_delete);
- setPreHandler(dialog_->button_add);
- setPreHandler(dialog_->input_converter);
- setPreHandler(dialog_->choice_from);
- setPreHandler(dialog_->choice_to);
- setPreHandler(dialog_->input_flags);
+ setPrehandler(dialog_->browser_all);
+ setPrehandler(dialog_->button_delete);
+ setPrehandler(dialog_->button_add);
+ setPrehandler(dialog_->input_converter);
+ setPrehandler(dialog_->choice_from);
+ setPrehandler(dialog_->choice_to);
+ setPrehandler(dialog_->input_flags);
}
}
-bool FormPreferences::Converters::Browser()
+bool FormPreferences::Converters::Browser()
{
int const i = fl_get_browser(dialog_->browser_all);
if (i <= 0) return false;
setEnabled(dialog_->button_add, false);
setEnabled(dialog_->button_delete, true);
-
+
fl_unfreeze_form(dialog_->form);
return false;
}
string const from = GetFrom();
string const to = GetTo();
int const sel = local_converters.getNumber(from, to);
-
+
fl_freeze_form(dialog_->form);
if (sel < 0) {
fl_set_object_label(dialog_->button_add, idex(_("Add|#A")));
- fl_set_button_shortcut(dialog_->button_add,
+ fl_set_button_shortcut(dialog_->button_add,
scex(_("Add|#A")), 1);
fl_deselect_browser(dialog_->browser_all);
} else {
fl_set_object_label(dialog_->button_add, idex(_("Modify|#M")));
fl_set_button_shortcut(dialog_->button_add,
- scex(_("Modify|#M")), 1);
-
+ scex(_("Modify|#M")), 1);
+
int top = max(sel-5, 0);
fl_set_browser_topline(dialog_->browser_all, top);
fl_select_browser_line(dialog_->browser_all, sel+1);
}
-FormPreferences::Formats::Formats( FormPreferences & p )
+FormPreferences::Formats::Formats(FormPreferences & p)
: parent_(p)
{}
fl_set_input_filter(dialog_->input_format, fl_lowercase_filter);
// set up the feedback mechanism
- setPreHandler(dialog_->browser_all);
- setPreHandler(dialog_->input_format);
- setPreHandler(dialog_->input_gui_name);
- setPreHandler(dialog_->button_delete);
- setPreHandler(dialog_->button_add);
- setPreHandler(dialog_->input_extension);
- setPreHandler(dialog_->input_viewer);
- setPreHandler(dialog_->input_shrtcut);
+ setPrehandler(dialog_->browser_all);
+ setPrehandler(dialog_->input_format);
+ setPrehandler(dialog_->input_gui_name);
+ setPrehandler(dialog_->button_delete);
+ setPrehandler(dialog_->button_add);
+ setPrehandler(dialog_->input_extension);
+ setPrehandler(dialog_->input_viewer);
+ setPrehandler(dialog_->input_shrtcut);
}
}
-bool FormPreferences::Formats::Browser()
+bool FormPreferences::Formats::Browser()
{
int const i = fl_get_browser(dialog_->browser_all);
if (i <= 0) return false;
setEnabled(dialog_->button_add, false);
setEnabled(dialog_->button_delete, true);
-
+
fl_unfreeze_form(dialog_->form);
return false;
}
string const name = fl_get_input(dialog_->input_format);
if (local_converters.formatIsUsed(name)) {
- parent_.printWarning(_("Cannot remove a Format used by a Converter. Remove the converter first."));
+ parent_.postWarning(_("Cannot remove a Format used by a Converter. Remove the converter first."));
setEnabled(dialog_->button_delete, false);
return false;
}
if (sel < 0) {
fl_set_object_label(dialog_->button_add,
- idex(_("Add|#A")));
+ idex(_("Add|#A")));
fl_set_button_shortcut(dialog_->button_add,
- scex(_("Add|#A")), 1);
+ scex(_("Add|#A")), 1);
fl_deselect_browser(dialog_->browser_all);
setEnabled(dialog_->button_delete, false);
} else {
fl_set_object_label(dialog_->button_add,
- idex(_("Modify|#M")));
+ idex(_("Modify|#M")));
fl_set_button_shortcut(dialog_->button_add,
- scex(_("Modify|#M")), 1);
+ scex(_("Modify|#M")), 1);
int const top = max(sel-5, 0);
fl_set_browser_topline(dialog_->browser_all, top);
}
-FormPreferences::InputsMisc::InputsMisc( FormPreferences & p )
+FormPreferences::InputsMisc::InputsMisc(FormPreferences & p)
: parent_(p)
{}
fl_set_input_return(dialog_->input_date_format, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->input_date_format);
+ setPrehandler(dialog_->input_date_format);
}
}
-FormPreferences::Interface::Interface( FormPreferences & p )
+FormPreferences::Interface::Interface(FormPreferences & p)
: parent_(p)
{}
void FormPreferences::Interface::apply() const
{
- lyxrc.popup_font_name =
- fl_get_input(dialog_->input_popup_font);
- lyxrc.menu_font_name = fl_get_input(dialog_->input_menu_font);
- lyxrc.font_norm_menu =
- fl_get_input(dialog_->input_popup_encoding);
+ lyxrc.popup_normal_font =
+ fl_get_input(dialog_->input_popup_normal_font);
+ lyxrc.popup_bold_font = fl_get_input(dialog_->input_popup_bold_font);
+ lyxrc.popup_font_encoding =
+ fl_get_input(dialog_->input_popup_font_encoding);
lyxrc.bind_file = fl_get_input(dialog_->input_bind_file);
lyxrc.ui_file = fl_get_input(dialog_->input_ui_file);
lyxrc.override_x_deadkeys =
{
dialog_.reset(parent_.build_interface());
- fl_set_input_return(dialog_->input_popup_font, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_menu_font, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_popup_encoding, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_popup_normal_font, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_popup_bold_font, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_popup_font_encoding, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_bind_file, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_ui_file, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->input_popup_font);
- setPreHandler(dialog_->input_menu_font);
- setPreHandler(dialog_->input_popup_encoding);
- setPreHandler(dialog_->input_bind_file);
- setPreHandler(dialog_->button_bind_file_browse);
- setPreHandler(dialog_->input_ui_file);
- setPreHandler(dialog_->button_ui_file_browse);
- setPreHandler(dialog_->check_override_x_dead_keys);
+ setPrehandler(dialog_->input_popup_normal_font);
+ setPrehandler(dialog_->input_popup_bold_font);
+ setPrehandler(dialog_->input_popup_font_encoding);
+ setPrehandler(dialog_->input_bind_file);
+ setPrehandler(dialog_->button_bind_file_browse);
+ setPrehandler(dialog_->input_ui_file);
+ setPrehandler(dialog_->button_ui_file_browse);
+ setPrehandler(dialog_->check_override_x_dead_keys);
}
{
string str;
- if (ob == dialog_->input_popup_font)
- str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_POPUP);
- else if (ob == dialog_->input_menu_font)
- str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_MENU);
- else if (ob == dialog_->input_popup_encoding)
- str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ENCODING_MENU);
+ if (ob == dialog_->input_popup_normal_font)
+ str = lyxrc.getDescription(LyXRC::RC_POPUP_NORMAL_FONT);
+ else if (ob == dialog_->input_popup_bold_font)
+ str = lyxrc.getDescription(LyXRC::RC_POPUP_BOLD_FONT);
+ else if (ob == dialog_->input_popup_font_encoding)
+ str = lyxrc.getDescription(LyXRC::RC_POPUP_FONT_ENCODING);
else if (ob == dialog_->input_bind_file)
str = lyxrc.getDescription(LyXRC::RC_BINDFILE);
else if (ob == dialog_->input_ui_file)
{
if (ob == dialog_->button_bind_file_browse) {
string dir = AddName(system_lyxdir, "bind");
- string name = N_("Sys Bind");
+ string name = N_("Sys Bind|#S#s");
pair<string,string> dir1(name, dir);
dir = AddName(user_lyxdir, "bind");
- name = N_("User Bind");
+ name = N_("User Bind|#U#u");
pair<string,string> dir2(name, dir);
parent_.browse(dialog_->input_bind_file,
N_("Bind file"), "*.bind", dir1, dir2);
-
+
} else if (ob == dialog_->button_ui_file_browse) {
string dir = AddName(system_lyxdir, "ui");
- string name = N_("Sys UI");
+ string name = N_("Sys UI|#S#s");
pair<string,string> dir1(name, dir);
dir = AddName(user_lyxdir, "ui");
- name = N_("User UI");
+ name = N_("User UI|#U#u");
pair<string,string> dir2(name, dir);
parent_.browse(dialog_->input_ui_file,
N_("UI file"), "*.ui", dir1, dir2);
}
-
+
return true;
}
void FormPreferences::Interface::update()
{
- fl_set_input(dialog_->input_popup_font,
- lyxrc.popup_font_name.c_str());
- fl_set_input(dialog_->input_menu_font,
- lyxrc.menu_font_name.c_str());
- fl_set_input(dialog_->input_popup_encoding,
- lyxrc.font_norm_menu.c_str());
+ fl_set_input(dialog_->input_popup_normal_font,
+ lyxrc.popup_normal_font.c_str());
+ fl_set_input(dialog_->input_popup_bold_font,
+ lyxrc.popup_bold_font.c_str());
+ fl_set_input(dialog_->input_popup_font_encoding,
+ lyxrc.popup_font_encoding.c_str());
fl_set_input(dialog_->input_bind_file,
lyxrc.bind_file.c_str());
fl_set_input(dialog_->input_ui_file,
}
-FormPreferences::Language::Language( FormPreferences & p )
+FormPreferences::Language::Language(FormPreferences & p)
: parent_(p)
{}
lyxrc.primary_kbmap = name_1;
lyxrc.secondary_kbmap = name_2;
}
-
+
button = fl_get_button(dialog_->check_rtl_support);
lyxrc.rtl_support = static_cast<bool>(button);
fl_deactivate_object(dialog_->choice_default_lang);
combo_default_lang.reset(new Combox(FL_COMBOX_DROPLIST));
combo_default_lang->add(obj->x, obj->y, obj->w, obj->h, 400,
- parent_.lang_opts_tab_->tabfolder_outer,
+ parent_.lang_opts_tab_->tabfolder_inner,
parent_.dialog_->tabfolder_prefs);
combo_default_lang->shortcut("#L",1);
combo_default_lang->setcallback(ComboCB, &parent_);
for (Languages::const_iterator cit = languages.begin();
- cit != languages.end(); ++cit) {
+ cit != languages.end(); ++cit) {
combo_default_lang->addto(cit->second.lang());
}
fl_unfreeze_form(dialog_->form);
// set up the feedback mechanism
- setPreHandler(dialog_->input_package);
- setPreHandler(dialog_->check_use_kbmap);
+ setPrehandler(dialog_->input_package);
+ setPrehandler(dialog_->check_use_kbmap);
// This is safe, as nothing is done to the pointer, other than
// to use its address in a block-if statement.
// No it's not! Leads to crash.
- // setPreHandler(
- // reinterpret_cast<FL_OBJECT *>(combo_default_lang),
+ // setPrehandler(
+ // reinterpret_cast<FL_OBJECT *>(combo_default_lang),
// C_FormPreferencesFeedbackCB);
- setPreHandler(dialog_->input_kbmap1);
- setPreHandler(dialog_->input_kbmap2);
- setPreHandler(dialog_->check_rtl_support);
- setPreHandler(dialog_->check_mark_foreign);
- setPreHandler(dialog_->check_auto_begin);
- setPreHandler(dialog_->check_auto_end);
- setPreHandler(dialog_->check_use_babel);
- setPreHandler(dialog_->check_global_options);
- setPreHandler(dialog_->input_command_begin);
- setPreHandler(dialog_->input_command_end);
+ setPrehandler(dialog_->input_kbmap1);
+ setPrehandler(dialog_->input_kbmap2);
+ setPrehandler(dialog_->check_rtl_support);
+ setPrehandler(dialog_->check_mark_foreign);
+ setPrehandler(dialog_->check_auto_begin);
+ setPrehandler(dialog_->check_auto_end);
+ setPrehandler(dialog_->check_use_babel);
+ setPrehandler(dialog_->check_global_options);
+ setPrehandler(dialog_->input_command_begin);
+ setPrehandler(dialog_->input_command_end);
// Activate/Deactivate the input fields dependent on the state of the
// buttons.
if (ob == dialog_->button_kbmap1_browse) {
string const dir = AddName(system_lyxdir, "kbd");
- string const name = N_("Key maps");
+ string const name = N_("Key maps|#K#k");
pair<string, string> dir1(name, dir);
parent_.browse(dialog_->input_kbmap1,
- N_("Keyboard map"), "*.kmap", dir1,
- make_pair(string(), string()));
+ N_("Keyboard map"), "*.kmap", dir1);
} else if (ob == dialog_->button_kbmap2_browse) {
string const dir = AddName(system_lyxdir, "kbd");
- string const name = N_("Key maps");
+ string const name = N_("Key maps|#K#k");
pair<string, string> dir1(name, dir);
parent_.browse(dialog_->input_kbmap2,
- N_("Keyboard map"), "*.kmap", dir1,
- make_pair(string(), string()));
+ N_("Keyboard map"), "*.kmap", dir1);
}
return activate;
fl_set_input(dialog_->input_kbmap1, "");
fl_set_input(dialog_->input_kbmap2, "");
}
-
+
fl_set_button(dialog_->check_rtl_support, lyxrc.rtl_support);
fl_set_button(dialog_->check_mark_foreign,
lyxrc.mark_foreign_language);
void FormPreferences::Language::ComboCB(int, void * v, Combox * combox)
{
- FormPreferences * pre = static_cast<FormPreferences*>(v);
- // This is safe, as nothing is done to the pointer, other than
- // to use its address in a block-if statement.
- pre->bc().valid(pre->input(reinterpret_cast<FL_OBJECT *>(combox), 0));
+ FormPreferences * pre = static_cast<FormPreferences*>(v);
+ // This is safe, as nothing is done to the pointer, other than
+ // to use its address in a block-if statement.
+ pre->bc().valid(pre->input(reinterpret_cast<FL_OBJECT *>(combox), 0));
}
-FormPreferences::LnFmisc::LnFmisc( FormPreferences & p )
+FormPreferences::LnFmisc::LnFmisc(FormPreferences & p)
: parent_(p)
{}
lyxrc.wheel_jump = static_cast<unsigned int>
(fl_get_counter_value(dialog_->counter_wm_jump));
+ string const old_value = lyxrc.display_graphics;
if (fl_get_button(dialog_->radio_display_monochrome)) {
lyxrc.display_graphics = "mono";
} else if (fl_get_button(dialog_->radio_display_grayscale)) {
} else {
lyxrc.display_graphics = "no";
}
+ if (old_value != lyxrc.display_graphics) {
+ grfx::GCache & gc = grfx::GCache::get();
+ gc.changeDisplay();
+ }
}
fl_set_counter_return(dialog_->counter_wm_jump, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->check_banner);
- setPreHandler(dialog_->check_auto_region_delete);
- setPreHandler(dialog_->check_exit_confirm);
- setPreHandler(dialog_->check_display_shrtcuts);
- setPreHandler(dialog_->counter_autosave);
- setPreHandler(dialog_->check_ask_new_file);
- setPreHandler(dialog_->check_cursor_follows_scrollbar);
- setPreHandler(dialog_->check_dialogs_iconify_with_main);
- setPreHandler(dialog_->counter_wm_jump);
- setPreHandler(dialog_->radio_display_monochrome);
- setPreHandler(dialog_->radio_display_grayscale);
- setPreHandler(dialog_->radio_display_color);
- setPreHandler(dialog_->radio_no_display);
+ setPrehandler(dialog_->check_banner);
+ setPrehandler(dialog_->check_auto_region_delete);
+ setPrehandler(dialog_->check_exit_confirm);
+ setPrehandler(dialog_->check_display_shrtcuts);
+ setPrehandler(dialog_->counter_autosave);
+ setPrehandler(dialog_->check_ask_new_file);
+ setPrehandler(dialog_->check_cursor_follows_scrollbar);
+ setPrehandler(dialog_->check_dialogs_iconify_with_main);
+ setPrehandler(dialog_->counter_wm_jump);
+ setPrehandler(dialog_->radio_display_monochrome);
+ setPrehandler(dialog_->radio_display_grayscale);
+ setPrehandler(dialog_->radio_display_color);
+ setPrehandler(dialog_->radio_no_display);
}
void FormPreferences::LnFmisc::update()
{
fl_set_button(dialog_->check_banner, lyxrc.show_banner);
- fl_set_button(dialog_->check_auto_region_delete,
+ fl_set_button(dialog_->check_auto_region_delete,
lyxrc.auto_region_delete);
fl_set_button(dialog_->check_exit_confirm, lyxrc.exit_confirmation);
fl_set_button(dialog_->check_display_shrtcuts, lyxrc.display_shortcuts);
}
-FormPreferences::OutputsMisc::OutputsMisc( FormPreferences & p )
+FormPreferences::OutputsMisc::OutputsMisc(FormPreferences & p)
: parent_(p)
{}
_(" default | US letter | legal | executive | A3 | A4 | A5 | B5 "));
// set up the feedback mechanism
- setPreHandler(dialog_->counter_line_len);
- setPreHandler(dialog_->input_tex_encoding);
- setPreHandler(dialog_->choice_default_papersize);
- setPreHandler(dialog_->input_ascii_roff);
- setPreHandler(dialog_->input_checktex);
- setPreHandler(dialog_->input_paperoption);
- setPreHandler(dialog_->check_autoreset_classopt);
+ setPrehandler(dialog_->counter_line_len);
+ setPrehandler(dialog_->input_tex_encoding);
+ setPrehandler(dialog_->choice_default_papersize);
+ setPrehandler(dialog_->input_ascii_roff);
+ setPrehandler(dialog_->input_checktex);
+ setPrehandler(dialog_->input_paperoption);
+ setPrehandler(dialog_->check_autoreset_classopt);
}
fl_set_input(dialog_->input_checktex,
lyxrc.chktex_command.c_str());
fl_set_input(dialog_->input_paperoption,
- lyxrc.view_dvi_paper_option.c_str());
+ lyxrc.view_dvi_paper_option.c_str());
fl_set_button(dialog_->check_autoreset_classopt,
- lyxrc.auto_reset_options);
+ lyxrc.auto_reset_options);
}
-FormPreferences::Paths::Paths( FormPreferences & p )
+FormPreferences::Paths::Paths(FormPreferences & p)
: parent_(p)
{}
button = fl_get_button(dialog_->check_last_files);
str = fl_get_input(dialog_->input_lastfiles);
if (!button) str.erase();
-
+
lyxrc.check_lastfiles = button;
lyxrc.lastfiles = str;
lyxrc.num_lastfiles = static_cast<unsigned int>
fl_set_input_return(dialog_->input_serverpipe, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->input_default_path);
- setPreHandler(dialog_->counter_lastfiles);
- setPreHandler(dialog_->input_template_path);
- setPreHandler(dialog_->check_last_files);
- setPreHandler(dialog_->input_lastfiles);
- setPreHandler(dialog_->check_make_backups);
- setPreHandler(dialog_->input_backup_path);
- setPreHandler(dialog_->input_serverpipe);
- setPreHandler(dialog_->input_temp_dir);
- setPreHandler(dialog_->check_use_temp_dir);
+ setPrehandler(dialog_->input_default_path);
+ setPrehandler(dialog_->counter_lastfiles);
+ setPrehandler(dialog_->input_template_path);
+ setPrehandler(dialog_->check_last_files);
+ setPrehandler(dialog_->input_lastfiles);
+ setPrehandler(dialog_->check_make_backups);
+ setPrehandler(dialog_->input_backup_path);
+ setPrehandler(dialog_->input_serverpipe);
+ setPrehandler(dialog_->input_temp_dir);
+ setPrehandler(dialog_->check_use_temp_dir);
}
bool FormPreferences::Paths::input(FL_OBJECT const * const ob)
{
bool activate = true;
-
+
// !ob if function is called from Paths::update() to de/activate
// objects,
// otherwise the function is called by an xforms CB via input().
if (!ob || ob == dialog_->input_default_path) {
string const name = fl_get_input(dialog_->input_default_path);
- if (!RWInfo::WriteableDir(name)) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ if (!name.empty() && !RWInfo::WriteableDir(name)) {
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_template_path) {
string const name = fl_get_input(dialog_->input_template_path);
- if (!RWInfo::ReadableDir(name)) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ if (!name.empty() && !RWInfo::ReadableDir(name)) {
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
if (fl_get_button(dialog_->check_make_backups)
&& !name.empty()
&& !RWInfo::WriteableDir(name)) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
if (fl_get_button(dialog_->check_make_backups)
&& !name.empty()
&& !RWInfo::WriteableDir(name)) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
if (fl_get_button(dialog_->check_last_files)
&& !name.empty()
&& !RWInfo::WriteableFile(name)) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
// strip off the extension
string const str = ChangeExtension(name, "");
if (!RWInfo::WriteableFile(str + ".in")) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
if (!RWInfo::WriteableFile(str + ".out")) {
- parent_.printWarning(RWInfo::ErrorMessage());
+ parent_.postWarning(RWInfo::ErrorMessage());
return false;
}
}
if (ob == dialog_->button_default_path_browse) {
parent_.browse(dialog_->input_default_path,
- N_("Default path"), string(),
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("Default path"), string());
} else if (ob == dialog_->button_template_path_browse) {
parent_.browse(dialog_->input_template_path,
- N_("Template path"), string(),
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("Template path"), string());
} else if (ob == dialog_->button_temp_dir_browse) {
parent_.browse(dialog_->input_temp_dir,
- N_("Temp dir"), string(),
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("Temp dir"), string());
} else if (ob == dialog_->button_lastfiles_browse) {
- pair<string, string> dir(_("User"), user_lyxdir);
+ pair<string, string> dir(_("User|#U#u"), user_lyxdir);
parent_.browse(dialog_->input_lastfiles,
- N_("Lastfiles"), string(), dir,
- make_pair(string(), string()));
+ N_("Lastfiles"), string(), dir);
} else if (ob == dialog_->button_backup_path_browse) {
parent_.browse(dialog_->input_backup_path,
- N_("Backup path"), string(),
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("Backup path"), string());
} else if (ob == dialog_->button_serverpipe_browse) {
parent_.browse(dialog_->input_serverpipe,
- N_("LyX Server pipes"), string(),
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("LyX Server pipes"), string());
}
-
+
return activate;
}
if (lyxrc.check_lastfiles) str = lyxrc.lastfiles;
fl_set_button(dialog_->check_last_files,
- lyxrc.check_lastfiles);
+ lyxrc.check_lastfiles);
fl_set_input(dialog_->input_lastfiles, str.c_str());
fl_set_counter_value(dialog_->counter_lastfiles,
lyxrc.num_lastfiles);
fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->input_command);
- setPreHandler(dialog_->input_page_range);
- setPreHandler(dialog_->input_copies);
- setPreHandler(dialog_->input_reverse);
- setPreHandler(dialog_->input_to_printer);
- setPreHandler(dialog_->input_file_extension);
- setPreHandler(dialog_->input_spool_command);
- setPreHandler(dialog_->input_paper_type);
- setPreHandler(dialog_->input_even_pages);
- setPreHandler(dialog_->input_odd_pages);
- setPreHandler(dialog_->input_collated);
- setPreHandler(dialog_->input_landscape);
- setPreHandler(dialog_->input_to_file);
- setPreHandler(dialog_->input_extra_options);
- setPreHandler(dialog_->input_spool_prefix);
- setPreHandler(dialog_->input_paper_size);
- setPreHandler(dialog_->input_name);
- setPreHandler(dialog_->check_adapt_output);
+ setPrehandler(dialog_->input_command);
+ setPrehandler(dialog_->input_page_range);
+ setPrehandler(dialog_->input_copies);
+ setPrehandler(dialog_->input_reverse);
+ setPrehandler(dialog_->input_to_printer);
+ setPrehandler(dialog_->input_file_extension);
+ setPrehandler(dialog_->input_spool_command);
+ setPrehandler(dialog_->input_paper_type);
+ setPrehandler(dialog_->input_even_pages);
+ setPrehandler(dialog_->input_odd_pages);
+ setPrehandler(dialog_->input_collated);
+ setPrehandler(dialog_->input_landscape);
+ setPrehandler(dialog_->input_to_file);
+ setPrehandler(dialog_->input_extra_options);
+ setPrehandler(dialog_->input_spool_prefix);
+ setPrehandler(dialog_->input_paper_size);
+ setPrehandler(dialog_->input_name);
+ setPrehandler(dialog_->check_adapt_output);
}
}
-FormPreferences::ScreenFonts::ScreenFonts( FormPreferences & p )
+FormPreferences::ScreenFonts::ScreenFonts(FormPreferences & p)
: parent_(p)
{}
changed = true;
lyxrc.dpi = ivalue;
}
-
+
double dvalue = strToDbl(fl_get_input(dialog_->input_tiny));
if (lyxrc.font_sizes[LyXFont::SIZE_TINY] != dvalue) {
changed = true;
fl_set_input_filter(dialog_->input_huger, fl_unsigned_float_filter);
// set up the feedback mechanism
- setPreHandler(dialog_->input_roman);
- setPreHandler(dialog_->input_sans);
- setPreHandler(dialog_->input_typewriter);
- setPreHandler(dialog_->counter_zoom);
- setPreHandler(dialog_->counter_dpi);
- setPreHandler(dialog_->check_scalable);
- setPreHandler(dialog_->input_screen_encoding);
- setPreHandler(dialog_->input_tiny);
- setPreHandler(dialog_->input_script);
- setPreHandler(dialog_->input_footnote);
- setPreHandler(dialog_->input_small);
- setPreHandler(dialog_->input_large);
- setPreHandler(dialog_->input_larger);
- setPreHandler(dialog_->input_largest);
- setPreHandler(dialog_->input_normal);
- setPreHandler(dialog_->input_huge);
- setPreHandler(dialog_->input_huger);
-}
-
-
+ setPrehandler(dialog_->input_roman);
+ setPrehandler(dialog_->input_sans);
+ setPrehandler(dialog_->input_typewriter);
+ setPrehandler(dialog_->counter_zoom);
+ setPrehandler(dialog_->counter_dpi);
+ setPrehandler(dialog_->check_scalable);
+ setPrehandler(dialog_->input_screen_encoding);
+ setPrehandler(dialog_->input_tiny);
+ setPrehandler(dialog_->input_script);
+ setPrehandler(dialog_->input_footnote);
+ setPrehandler(dialog_->input_small);
+ setPrehandler(dialog_->input_large);
+ setPrehandler(dialog_->input_larger);
+ setPrehandler(dialog_->input_largest);
+ setPrehandler(dialog_->input_normal);
+ setPrehandler(dialog_->input_huge);
+ setPrehandler(dialog_->input_huger);
+}
+
+
string const
FormPreferences::ScreenFonts::feedback(FL_OBJECT const * const ob) const
{
str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ENCODING);
else if (ob == dialog_->counter_zoom)
str = lyxrc.getDescription(LyXRC::RC_SCREEN_ZOOM);
- else if (ob == dialog_->counter_dpi)
+ else if (ob == dialog_->counter_dpi)
str = lyxrc.getDescription(LyXRC::RC_SCREEN_DPI);
else if (ob == dialog_->input_tiny
|| ob == dialog_->input_script
activate = false;
str = N_("Fonts must be positive!");
- // Fontsizes -- tiny < script < footnote etc.
} else if (strToDbl(fl_get_input(dialog_->input_tiny)) >
+ // Fontsizes -- tiny < script < footnote etc.
strToDbl(fl_get_input(dialog_->input_script)) ||
strToDbl(fl_get_input(dialog_->input_script)) >
strToDbl(fl_get_input(dialog_->input_footnote)) ||
}
if (!activate)
- parent_.printWarning(str);
-
+ parent_.postWarning(str);
+
return activate;
}
-FormPreferences::SpellOptions::SpellOptions( FormPreferences & p )
+FormPreferences::SpellOptions::SpellOptions(FormPreferences & p)
: parent_(p)
{}
string choice = fl_get_choice_text(dialog_->choice_spell_command);
choice = strip(frontStrip(choice));
-
+
lyxrc.isp_command = choice;
#if 0
choice = fl_get_input(dialog_->input_escape_chars);
if (button && choice.empty()) button = 0;
if (!button) choice.erase();
-
+
lyxrc.isp_use_esc_chars = static_cast<bool>(button);
lyxrc.isp_esc_chars = choice;
dialog_.reset(parent_.build_spelloptions());
fl_addto_choice(dialog_->choice_spell_command,
-#if 0
- _(" none | ispell | aspell "));
-#else
_(" ispell | aspell "));
-#endif
fl_set_input_return(dialog_->input_alt_lang, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_escape_chars, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED);
// set up the feedback mechanism
- setPreHandler(dialog_->choice_spell_command);
- setPreHandler(dialog_->check_alt_lang);
- setPreHandler(dialog_->input_alt_lang);
- setPreHandler(dialog_->check_escape_chars);
- setPreHandler(dialog_->input_escape_chars);
- setPreHandler(dialog_->check_personal_dict);
- setPreHandler(dialog_->input_personal_dict);
- setPreHandler(dialog_->button_personal_dict);
- setPreHandler(dialog_->check_compound_words);
- setPreHandler(dialog_->check_input_enc);
+ setPrehandler(dialog_->choice_spell_command);
+ setPrehandler(dialog_->check_alt_lang);
+ setPrehandler(dialog_->input_alt_lang);
+ setPrehandler(dialog_->check_escape_chars);
+ setPrehandler(dialog_->input_escape_chars);
+ setPrehandler(dialog_->check_personal_dict);
+ setPrehandler(dialog_->input_personal_dict);
+ setPrehandler(dialog_->button_personal_dict);
+ setPrehandler(dialog_->check_compound_words);
+ setPrehandler(dialog_->check_input_enc);
}
if (ob == dialog_->button_personal_dict) {
parent_.browse(dialog_->input_personal_dict,
- N_("Personal dictionary"), "*.ispell",
- make_pair(string(), string()),
- make_pair(string(), string()));
+ N_("Personal dictionary"), "*.ispell");
}
-
+
return true; // All input is valid!
}
choice = 2;
#endif
fl_set_choice(dialog_->choice_spell_command, choice);
-
+
string str;
if (lyxrc.isp_use_alt_lang) str = lyxrc.isp_alt_lang;
fl_set_button(dialog_->check_alt_lang,
lyxrc.isp_use_alt_lang);
fl_set_input(dialog_->input_alt_lang, str.c_str());
-
+
str.erase();
if (lyxrc.isp_use_esc_chars) str = lyxrc.isp_esc_chars;
}
-void FormPreferences::printWarning(string const & warning)
-{
- warningPosted = true;
-
- string str = _("WARNING!") + string(" ") + warning;
- str = formatted(str, dialog_->text_warning->w-10, FL_SMALL_SIZE);
-
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
-}
-
-
void FormPreferences::browse(FL_OBJECT * inpt,
string const & title,
- string const & pattern,
+ string const & pattern,
pair<string,string> const & dir1,
pair<string,string> const & dir2)
{
input(inpt, 0);
}
}
-
-
-// C function wrapper, required by xforms.
-extern "C" {
-
- static
- int C_FormPreferencesFeedbackCB(FL_OBJECT * ob, int event,
- FL_Coord mx, FL_Coord my,
- int key, void * xev)
- {
- return FormPreferences::FeedbackCB(ob, event,
- mx, my, key, xev);
- }
-
-}
-
-
-int FormPreferences::FeedbackCB(FL_OBJECT * ob, int event,
- FL_Coord, FL_Coord, int, void *)
-{
- // Note that the return value is important in the pre-emptive handler.
- // Don't return anything other than 0.
-
- lyx::Assert(ob);
- // Don't Assert this one, as it can happen quite reasonably when things
- // are being deleted in the d-tor.
- //Assert(ob->form);
- if (!ob->form) return 0;
-
- FormPreferences * pre =
- static_cast<FormPreferences*>(ob->form->u_vdata);
- pre->Feedback(ob, event);
- return 0;
-}
-
-
-// preemptive handler for feedback messages
-void FormPreferences::Feedback(FL_OBJECT * ob, int event)
-{
- lyx::Assert(ob);
-
- switch (event) {
- case FL_ENTER:
- warningPosted = false;
- feedback(ob);
- break;
-
- case FL_LEAVE:
- if (!warningPosted)
- fl_set_object_label(dialog_->text_warning, "");
- break;
-
- default:
- break;
- }
-}
-
-
-void FormPreferences::setPreHandler(FL_OBJECT * ob)
-{
- lyx::Assert(ob);
- fl_set_object_prehandler(ob, C_FormPreferencesFeedbackCB);
-}
projects / lyx.git / blobdiff