-// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
*======================================================*/
/* FormPreferences.C
#include <config.h>
#include <utility>
+#include <iomanip>
+#include <X11/Xlib.h>
#include FORMS_H_LOCATION
#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 "input_validators.h"
-#include "xform_helpers.h"
-#include "xform_macros.h"
+#include "xforms_helpers.h"
+#include "helper_funcs.h"
#include "converter.h"
#include "support/lyxfunctional.h"
#include "support/lyxmanip.h"
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::slot;
-#endif
-
using std::endl;
-using std::find;
-using std::find_if;
using std::pair;
+using std::make_pair;
using std::max;
-using std::sort;
+using std::min;
using std::vector;
-using std::make_pair;
+using SigC::slot;
extern string system_lyxdir;
extern string user_lyxdir;
extern Languages languages;
-static string const colorFile("/usr/lib/X11/rgb.txt");
-static Formats local_formats;
-static Converters local_converters;
+namespace {
+
+// These should probably go inside the class definition...
+Formats local_formats;
+Converters local_converters;
-static vector<NamedColor> fullColorDB;
-static vector<NamedColor> lyxColorDB;
-vector<NamedColor> FormPreferences::Colors::colorDB;
-vector<XformColor> FormPreferences::Colors::xformColorDB;
+} // namespace anon
FormPreferences::FormPreferences(LyXView * lv, Dialogs * d)
- : FormBaseBI(lv, d, _("Preferences"), new PreferencesPolicy),
- dialog_(0),
- converters_tab_(0), inputs_tab_(0), look_n_feel_tab_(0),
- outputs_tab_(0), usage_tab_(0),
+ : FormBaseBI(lv, d, _("Preferences"), false),
warningPosted(false),
colors_(*this), converters_(*this), inputs_misc_(*this),
formats_(*this), interface_(*this), language_(*this),
lnf_misc_(*this), outputs_misc_(*this), paths_(*this),
- printer_(*this), screen_fonts_(*this), spellchecker_(*this)
+ printer_(*this), screen_fonts_(*this), spelloptions_(*this)
{
// let the dialog be shown
// This is a permanent connection so we won't bother
// storing a copy because we won't be disconnecting.
d->showPreferences.connect(slot(this, &FormPreferences::show));
-}
-
-
-FormPreferences::~FormPreferences()
-{
- delete converters_tab_;
- delete inputs_tab_;
- delete look_n_feel_tab_;
- delete outputs_tab_;
- delete usage_tab_;
-
- delete dialog_;
+ d->showSpellcheckerPreferences.connect(slot(this, &FormPreferences::showSpellPref));
}
else if (form2 == outputs_tab_->form)
form3 = fl_get_active_folder(outputs_tab_->tabfolder_outer);
- else if (form2 == usage_tab_->form)
- form3 = fl_get_active_folder(usage_tab_->tabfolder_outer);
+ else if (form2 == lang_opts_tab_->form)
+ form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_outer);
if (form3 && form3->visible)
- fl_redraw_form( form3 );
+ fl_redraw_form(form3);
}
FL_FORM * FormPreferences::form() const
{
- if (dialog_) return dialog_->form;
+ if (dialog_.get()) return dialog_->form;
return 0;
}
+void FormPreferences::showSpellPref()
+{
+ show();
+ fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form);
+ fl_set_folder(lang_opts_tab_->tabfolder_outer, spelloptions_.dialog()->form);
+}
+
+
void FormPreferences::ok()
{
- FormBase::ok();
+ FormBaseDeprecated::ok();
- if (colors_.modifiedXformPrefs) {
- string filename = AddName(user_lyxdir, "preferences.xform");
- colors_.modifiedXformPrefs = ! XformColor::write(filename);
+ if (colors_.modifiedXformsPrefs) {
+ string const filename =
+ AddName(user_lyxdir, "preferences.xform");
+ colors_.modifiedXformsPrefs = !XformsColor::write(filename);
}
- lv_->getLyXFunc()->Dispatch(LFUN_SAVEPREFERENCES);
+ lv_->getLyXFunc()->dispatch(LFUN_SAVEPREFERENCES);
}
&& outer_form->visible) {
fl_hide_form(outer_form);
}
- FormBase::hide();
+ FormBaseDeprecated::hide();
}
void FormPreferences::build()
{
- dialog_ = build_preferences();
-
- // 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_.setUndoAll(dialog_->button_restore);
- bc_.refresh();
+ dialog_.reset(build_preferences());
- // Workaround dumb xforms sizing bug
- minw_ = form()->w;
- minh_ = form()->h;
+ // 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().setRestore(dialog_->button_restore);
// build the tab folders
- converters_tab_ = build_outer_tab();
- look_n_feel_tab_ = build_outer_tab();
- inputs_tab_ = build_outer_tab();
- outputs_tab_ = build_outer_tab();
- usage_tab_ = build_outer_tab();
+ 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());
// build actual tabfolder contents
// these will become nested tabfolders
paths_.build();
printer_.build();
screen_fonts_.build();
- spellchecker_.build();
+ spelloptions_.build();
// Now add them to the tabfolder
fl_addto_tabfolder(dialog_->tabfolder_prefs,
- _("Look and Feel"),
+ _("Look & Feel"),
look_n_feel_tab_->form);
fl_addto_tabfolder(dialog_->tabfolder_prefs,
- _("Usage"),
- usage_tab_->form);
+ _("Lang Opts"),
+ lang_opts_tab_->form);
fl_addto_tabfolder(dialog_->tabfolder_prefs,
_("Converters"),
converters_tab_->form);
outputs_misc_.dialog()->form);
// then building usage
- fl_addto_tabfolder(usage_tab_->tabfolder_outer,
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
_("Spell checker"),
- spellchecker_.dialog()->form);
- fl_addto_tabfolder(usage_tab_->tabfolder_outer,
+ spelloptions_.dialog()->form);
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
_("Language"),
language_.dialog()->form);
}
paths_.apply();
printer_.apply();
screen_fonts_.apply();
- spellchecker_.apply();
+ spelloptions_.apply();
}
-void FormPreferences::feedback( FL_OBJECT * ob )
+void FormPreferences::feedback(FL_OBJECT * ob)
{
- Assert(ob);
+ lyx::Assert(ob);
string str;
if (ob->form->fdui == colors_.dialog()) {
- str = colors_.feedback( ob );
+ str = colors_.feedback(ob);
} else if (ob->form->fdui == converters_.dialog()) {
- str = converters_.feedback( ob );
+ str = converters_.feedback(ob);
} else if (ob->form->fdui == formats_.dialog()) {
- str = formats_.feedback( ob );
+ str = formats_.feedback(ob);
} else if (ob->form->fdui == inputs_misc_.dialog()) {
- str = inputs_misc_.feedback( ob );
+ str = inputs_misc_.feedback(ob);
} else if (ob->form->fdui == interface_.dialog()) {
- str = interface_.feedback( ob );
+ str = interface_.feedback(ob);
} else if (ob->form->fdui == language_.dialog()) {
- str = language_.feedback( ob );
+ str = language_.feedback(ob);
} else if (ob->form->fdui == lnf_misc_.dialog()) {
- str = lnf_misc_.feedback( ob );
+ str = lnf_misc_.feedback(ob);
} else if (ob->form->fdui == outputs_misc_.dialog()) {
- str = outputs_misc_.feedback( ob );
+ str = outputs_misc_.feedback(ob);
} else if (ob->form->fdui == paths_.dialog()) {
- str = paths_.feedback( ob );
+ str = paths_.feedback(ob);
} else if (ob->form->fdui == printer_.dialog()) {
- str = printer_.feedback( ob );
+ str = printer_.feedback(ob);
} else if (ob->form->fdui == screen_fonts_.dialog()) {
- str = screen_fonts_.feedback( ob );
- } else if (ob->form->fdui == spellchecker_.dialog()) {
- str = spellchecker_.feedback( ob );
+ str = screen_fonts_.feedback(ob);
+ } else if (ob->form->fdui == spelloptions_.dialog()) {
+ str = spelloptions_.feedback(ob);
}
- str = formatted( str, dialog_->text_warning->w-10,
- FL_SMALL_SIZE, FL_NORMAL_STYLE );
+ 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);
bool FormPreferences::input(FL_OBJECT * ob, long)
{
- Assert(ob);
+ 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_
- if (ob->form->fdui == colors_.dialog())
- return colors_.input(ob);
- else if (ob->form->fdui == converters_.dialog())
+ if (ob->form->fdui == colors_.dialog()) {
+ colors_.input(ob);
+ return true;
+ } else if (ob->form->fdui == converters_.dialog())
return converters_.input(ob);
else if (ob->form->fdui == formats_.dialog())
return formats_.input(ob);
return paths_.input(ob);
else if (ob->form->fdui == screen_fonts_.dialog())
return screen_fonts_.input();
- else if (ob->form->fdui == spellchecker_.dialog())
- return spellchecker_.input(ob);
+ else if (ob->form->fdui == spelloptions_.dialog())
+ return spelloptions_.input(ob);
return true;
}
void FormPreferences::update()
{
- if (!dialog_) return;
+ if (!dialog_.get()) return;
// read lyxrc entries
colors_.update();
paths_.update();
printer_.update();
screen_fonts_.update();
- spellchecker_.update();
+ spelloptions_.update();
}
-FormPreferences::Colors::~Colors()
+FormPreferences::Colors::Colors(FormPreferences & p)
+ : modifiedXformsPrefs(false), parent_(p)
+{}
+
+
+FD_form_colors const * FormPreferences::Colors::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
bool modifiedText = false;
bool modifiedBackground = false;
- for( vector<XformColor>::const_iterator cit = xformColorDB.begin();
- cit != xformColorDB.end(); ++cit ) {
+ for (vector<XformsColor>::const_iterator cit = xformsColorDB.begin();
+ cit != xformsColorDB.end(); ++cit) {
RGBColor col;
- fl_getmcolor((*cit).colorID, &col.r, &col.g, &col.b);
- if( col != (*cit).color() ) {
- modifiedXformPrefs = true;
- if( (*cit).colorID == FL_BLACK )
+ fl_getmcolor(cit->colorID, &col.r, &col.g, &col.b);
+ if (col != cit->color()) {
+ modifiedXformsPrefs = true;
+ if (cit->colorID == FL_BLACK)
modifiedText = true;
- if( (*cit).colorID == FL_COL1 )
+ if (cit->colorID == FL_COL1)
modifiedBackground = true;
}
}
- if( modifiedXformPrefs ) {
- for( vector<XformColor>::const_iterator cit =
- xformColorDB.begin();
- cit != xformColorDB.end(); ++cit ) {
- fl_mapcolor((*cit).colorID,
- (*cit).r, (*cit).g, (*cit).b);
+ if (modifiedXformsPrefs) {
+ for (vector<XformsColor>::const_iterator cit =
+ xformsColorDB.begin();
+ cit != xformsColorDB.end(); ++cit) {
+ fl_mapcolor(cit->colorID, cit->r, cit->g, cit->b);
- if( modifiedText && (*cit).colorID == FL_BLACK ) {
- AdjustVal( FL_INACTIVE, FL_BLACK, 0.5 );
+ if (modifiedText && cit->colorID == FL_BLACK) {
+ AdjustVal(FL_INACTIVE, FL_BLACK, 0.5);
}
- if( modifiedBackground && (*cit).colorID == FL_COL1 ) {
- AdjustVal( FL_MCOL, FL_COL1, 0.1 );
- AdjustVal( FL_TOP_BCOL, FL_COL1, 0.1 );
- AdjustVal( FL_LEFT_BCOL, FL_COL1, 0.1 );
+ if (modifiedBackground && cit->colorID == FL_COL1) {
+ AdjustVal(FL_MCOL, FL_COL1, 0.1);
+ AdjustVal(FL_TOP_BCOL, FL_COL1, 0.1);
+ AdjustVal(FL_LEFT_BCOL, FL_COL1, 0.1);
- AdjustVal( FL_RIGHT_BCOL, FL_COL1, -0.5);
- AdjustVal( FL_BOTTOM_BCOL, FL_COL1, -0.5);
- }
+ AdjustVal(FL_RIGHT_BCOL, FL_COL1, -0.5);
+ AdjustVal(FL_BOTTOM_BCOL, FL_COL1, -0.5);
+ }
+
+ 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);
+ }
}
Dialogs::redrawGUI();
}
// Now do the same for the LyX LColors...
- for( vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
- cit != lyxColorDB.end(); ++cit ) {
- LColor::color lc = lcolor.getFromGUIName((*cit).getname());
- if( lc == LColor::ignore ) continue;
-
- // Ascertain the X11 name
- RGBColor col = (*cit).color();
- vector<NamedColor>::const_iterator cit2 =
- find_if(colorDB.begin(), colorDB.end(),
- compare_memfun(&NamedColor::color, col));
- if( cit2 == colorDB.end() ) continue;
-
- if( lcolor.getX11Name(lc) != (*cit2).getname() ) {
- lyxerr << "FormPreferences::Colors::apply: "
- << "resetting LColor " << lcolor.getGUIName(lc)
- << " from \"" << lcolor.getX11Name(lc)
- << "\" to \"" << (*cit2).getname() << "\"."
- << endl;
- string arg = lcolor.getLyXName(lc) + string(" ") +
- (*cit2).getname();
-
- parent_.lv_->getLyXFunc()->
- Dispatch(LFUN_SET_COLOR, arg);
+ for (vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
+ cit != lyxColorDB.end(); ++cit) {
+ LColor::color lc = lcolor.getFromGUIName(cit->getname());
+ if (lc == LColor::inherit) continue;
+
+ // 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: "
+ << "resetting LColor " << lcolor.getGUIName(lc)
+ << " from \"" << lcolor.getX11Name(lc)
+ << "\" to \"" << hexname << "\"."
+ << endl;
+
+ string const s = lcolor.getLyXName(lc) + string(" ") +
+ hexname;
+ parent_.lv_->getLyXFunc()->dispatch(LFUN_SET_COLOR, s);
}
}
-
}
void FormPreferences::Colors::build()
{
- dialog_ = parent_.build_colors();
-
- FL_OBJECT * obj = dialog_->valslider_red;
- fl_set_slider_bounds(obj, 0, 255);
- fl_set_slider_precision(obj, 0);
- fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
-
- obj = dialog_->valslider_green;
- fl_set_slider_bounds(obj, 0, 255);
- fl_set_slider_precision(obj, 0);
- fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
-
- obj = dialog_->valslider_blue;
- fl_set_slider_bounds(obj, 0, 255);
- fl_set_slider_precision(obj, 0);
- fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
+ dialog_.reset(parent_.build_colors());
fl_set_object_color(dialog_->button_color,
- FL_FREE_COL4, FL_FREE_COL4);
-
- fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
+ GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
- // set up the feedback mechanism
- setPreHandler( dialog_->browser_x11 );
- setPreHandler( dialog_->input_name );
- setPreHandler( dialog_->button_browse );
- setPreHandler( dialog_->button_color );
- setPreHandler( dialog_->valslider_red );
- setPreHandler( dialog_->valslider_green );
- setPreHandler( dialog_->valslider_blue );
- setPreHandler( dialog_->browser_lyx_objs );
- setPreHandler( dialog_->button_modify );
- setPreHandler( dialog_->button_modify );
-
- // Load the X11 color data base
- if (LoadBrowserX11(colorFile) )
- fl_set_input(dialog_->input_name, colorFile.c_str());
- else {
- fl_set_input(dialog_->input_name, N_("No file found"));
- return;
- }
-
- // The LyX LColors may have names in the fullColorDB but not in the
- // reduced colorDB shown in the browser (which has one name only for
- // each RGB entry). If so, replace them with the colorDB name.
+ fl_set_object_color(dialog_->dial_hue, GUI_COLOR_HUE_DIAL, FL_BLACK);
+ fl_set_dial_bounds(dialog_->dial_hue, 0.0, 360.0);
+ fl_set_dial_step(dialog_->dial_hue, 1.0);
+ fl_set_dial_return(dialog_->dial_hue, FL_RETURN_CHANGED);
- // This can go here and not in update() because we only need to do it
- // once.
- for( int i=0; i<LColor::ignore; ++i ) {
- LColor::color lc = static_cast<LColor::color>(i);
-
- string name = lowercase(lcolor.getX11Name(lc));
-
- // Find the RGBColor associated with this X11 name.
- vector<NamedColor>::const_iterator cit =
- find_if(fullColorDB.begin(), fullColorDB.end(),
- compare_memfun(&NamedColor::getname, name));
-
- bool error = ( cit == fullColorDB.end() );
-
- // Find the "appropriate" X11 name for this color.
- if( !error) {
- RGBColor col = (*cit).color();
- cit = find_if(colorDB.begin(), colorDB.end(),
- compare_memfun(&NamedColor::color, col));
+ fl_set_slider_bounds(dialog_->slider_saturation, 0.0, 1.0);
+ fl_set_slider_step(dialog_->slider_saturation, 0.01);
+ fl_set_slider_return(dialog_->slider_saturation, FL_RETURN_CHANGED);
- error = ( cit == colorDB.end() );
- }
-
- // Unable to match name to RGBColor. Reset color to black.
- if( error ) {
- lyxerr << "FormPreferences::Colors::build: "
- << "LColor " << lcolor.getLyXName(lc)
- << ": can't find color \"" << name
- << "\". Set to \"black\"!" << endl;
- string arg = lcolor.getLyXName(lc) + string(" black");
- parent_.lv_->getLyXFunc()->
- Dispatch(LFUN_SET_COLOR, arg);
- continue;
- }
-
- // Change the LColor X11name. Don't want to trigger a redraw,
- // as we're just changing the name to an equivalent one
- // (same RGBColor). Also reset the system_lcolor names, so
- // that we don't output unnecessary changes.
- if( lcolor.getX11Name(lc) != (*cit).getname() ) {
- lcolor.setColor(lc, (*cit).getname());
- system_lcolor.setColor(lc, (*cit).getname());
- }
- }
+ 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_->button_colorspace);
}
-
string const
FormPreferences::Colors::feedback(FL_OBJECT const * const ob) const
{
string str;
- if (ob == dialog_->browser_x11 ) {
- str = N_("The colors listed in the X11 database.");
- } else if (ob == dialog_->browser_lyx_objs ) {
+ if (ob == dialog_->browser_lyx_objs) {
str = N_("LyX objects that can be assigned a color.");
- } else if (ob == dialog_->input_name ) {
- str = N_("The file containing the X11 color database.");
- } else if (ob == dialog_->button_color ) {
- str = N_("You will only be able to modify the LyX object if the sliders and X11 browser agree. Force this by clicking on the highlighted browser name.");
- } else if (ob == dialog_->valslider_red
- || ob == dialog_->valslider_green
- || ob == dialog_->valslider_blue ) {
- str = N_("Find a new color. The name highlighted in the X11 database is the closest match to this.");
- } else if (ob == dialog_->button_modify ) {
- str = N_("Modify the color of the LyX object.");
+
+ } else if (ob == dialog_->button_modify) {
+ str = N_("Modify the LyX object's color. Note: you must then \"Apply\" the change.");
+
+ } else if (ob == dialog_->dial_hue ||
+ ob == dialog_->slider_saturation ||
+ ob == dialog_->slider_value ||
+ ob == dialog_->slider_red ||
+ ob == dialog_->slider_green ||
+ ob == dialog_->slider_blue) {
+ str = N_("Find a new color.");
+
+ } else if (ob == dialog_->button_colorspace) {
+ str = N_("Toggle between RGB and HSV color spaces.");
}
return str;
}
-bool FormPreferences::Colors::input( FL_OBJECT const * const ob )
+void FormPreferences::Colors::input(FL_OBJECT const * const ob)
{
- if (ob == dialog_->browser_x11) {
- return BrowserX11();
+ if (ob == dialog_->browser_lyx_objs) {
+ InputBrowserLyX();
+
+ } else if (ob == dialog_->dial_hue ||
+ ob == dialog_->slider_saturation ||
+ ob == dialog_->slider_value) {
+ InputHSV();
- } else if (ob == dialog_->valslider_red
- || ob == dialog_->valslider_green
- || ob == dialog_->valslider_blue) {
- return RGB();
+ } else if (ob == dialog_->slider_red ||
+ ob == dialog_->slider_green ||
+ ob == dialog_->slider_blue) {
+ InputRGB();
- } else if (ob == dialog_->input_name) {
- return Database();
+ } else if (ob == dialog_->button_colorspace) {
+ SwitchColorSpace();
- } else if (ob == dialog_->button_browse) {
- parent_.browse(dialog_->input_name,
- _("X11 color database"), "*.txt",
- make_pair(string(), string()),
- make_pair(string(), string()));
- return true;
-
- } else if (ob == dialog_->browser_lyx_objs) {
- return BrowserLyX();
-
} else if (ob == dialog_->button_modify) {
- return Modify();
+ Modify();
}
-
- return true;
}
-void FormPreferences::Colors::update()
-{
- LoadBrowserLyX();
-}
-
-
-void FormPreferences::Colors::AdjustVal( int colAdjust, int colParent,
- double addVal ) const
+void FormPreferences::Colors::AdjustVal(int colAdjust, int colParent,
+ double addVal) const
{
RGBColor rgb;
- fl_getmcolor( colParent, &rgb.r, &rgb.g, &rgb.b);
+ fl_getmcolor(colParent, &rgb.r, &rgb.g, &rgb.b);
- HSVColor hsv = HSVColor( rgb );
+ HSVColor hsv(rgb);
hsv.v += addVal;
- if( hsv.v > 1.0 )
- hsv.v = 1.0;
- else if( hsv.v < 0.0 )
- hsv.v = 0.0;
+ hsv.v = min( 1.0, max(0.0, hsv.v) );
- rgb = RGBColor( hsv );
- fl_mapcolor( colAdjust, rgb.r, rgb.g, rgb.b );
+ rgb = RGBColor(hsv);
+ fl_mapcolor(colAdjust, rgb.r, rgb.g, rgb.b);
}
-bool FormPreferences::Colors::BrowserLyX() const
+void FormPreferences::Colors::InputBrowserLyX() const
{
- int i = fl_get_browser( dialog_->browser_lyx_objs );
- if (i < 1)
- return true;
-
- string name = fl_get_browser_line( dialog_->browser_lyx_objs, i );
+ vector<NamedColor>::size_type const selLyX =
+ fl_get_browser(dialog_->browser_lyx_objs);
+ if (selLyX < 1) return;
// Is the choice an Xforms color...
- int choice = 0;
-
- vector<NamedColor>::const_iterator cit =
- find_if(xformColorDB.begin(), xformColorDB.end(),
- compare_memfun(&NamedColor::getname, name));
+ RGBColor col;
- if( cit != xformColorDB.end() ) choice = 1;
-
+ if( selLyX-1 < xformsColorDB.size() ) {
+ vector<XformsColor>::size_type const i = selLyX - 1;
+ col = xformsColorDB[i].color();
+ }
// or a LyX Logical color?
- if( choice == 0 ) {
- cit = find_if(lyxColorDB.begin(), lyxColorDB.end(),
- compare_memfun(&NamedColor::getname, name));
-
- if( cit != colorDB.end() ) choice = 2;
+ else {
+ vector<NamedColor>::size_type const i = selLyX - 1 -
+ xformsColorDB.size();
+ col = lyxColorDB[i].color();
}
-
- if( choice != 0 ) {
- fl_freeze_form( dialog_->form );
- fl_set_slider_value( dialog_->valslider_red, (*cit).r );
- fl_set_slider_value( dialog_->valslider_green, (*cit).g );
- fl_set_slider_value( dialog_->valslider_blue, (*cit).b );
- RGB();
-
- fl_unfreeze_form( dialog_->form );
+ fl_freeze_form(dialog_->form);
- fl_deactivate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_INACTIVE );
- }
+ fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->button_color);
+
+ // Display either RGB or HSV but not both!
+ SwitchColorSpace();
- return true;
+ // Deactivate the modify button to begin with...
+ setEnabled(dialog_->button_modify, false);
+
+ fl_unfreeze_form(dialog_->form);
}
-bool FormPreferences::Colors::BrowserX11() const
+void FormPreferences::Colors::InputHSV()
{
- int i = fl_get_browser(dialog_->browser_x11);
- if (i < 1)
- return true;
+ double const hue = fl_get_dial_value(dialog_->dial_hue);
+ double const sat = fl_get_slider_value(dialog_->slider_saturation);
+ double const val = fl_get_slider_value(dialog_->slider_value);
- fl_freeze_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 = colorDB[i-1].color();
-
- fl_mapcolor( FL_FREE_COL4 + i, col.r, col.g, col.b );
- fl_mapcolor( FL_FREE_COL4, col.r, col.g, col.b );
- fl_set_slider_value( dialog_->valslider_red, col.r );
- fl_set_slider_value( dialog_->valslider_green, col.g );
- fl_set_slider_value( dialog_->valslider_blue, col.b );
- fl_redraw_object( dialog_->button_color );
-
- // Is it valid to activate the "Modify" button?
- int line = fl_get_browser(dialog_->browser_lyx_objs);
- bool isSelected = ( line > 0 );
- if( isSelected )
- if( line > fl_get_browser_maxline(dialog_->browser_lyx_objs) )
- isSelected = false;
-
- if( isSelected && colorDB[i-1].color() == col ) {
- fl_activate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_BLACK );
- }
+ RGBColor col = HSVColor(hue, sat, val);
- fl_unfreeze_form( dialog_->form );
+ fl_freeze_form(dialog_->form);
- return true;
+ fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->button_color);
+
+ col = HSVColor(hue, 1.0, 1.0);
+ col.r = max(col.r, 0);
+ fl_mapcolor(GUI_COLOR_HUE_DIAL, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->dial_hue);
+
+ // Ascertain whether to activate the Modify button.
+ vector<NamedColor>::size_type const selLyX =
+ fl_get_browser(dialog_->browser_lyx_objs);
+
+ 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() ) {
+ vector<XformsColor>::size_type const i = selLyX - 1;
+ modify = (xformsColorDB[i].color() != col);
+ }
+ // or a LyX Logical color?
+ else {
+ vector<NamedColor>::size_type const i = selLyX - 1 -
+ xformsColorDB.size();
+ modify = (lyxColorDB[i].color() != col);
+ }
+
+ setEnabled(dialog_->button_modify, modify);
}
-bool FormPreferences::Colors::Database()
+void FormPreferences::Colors::InputRGB()
{
- string err;
- string file = fl_get_input(dialog_->input_name);
- if( !ReadableFile(file, err) ) {
- parent_.printWarning( err );
- return false;
- }
+ int const red = int(fl_get_slider_value(dialog_->slider_red));
+ int const green = int(fl_get_slider_value(dialog_->slider_green));
+ int const blue = int(fl_get_slider_value(dialog_->slider_blue));
- if (LoadBrowserX11(file) )
- return true;
+ 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);
- return false;
+ RGBColor col = RGBColor(red, green, blue);
+ fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->button_color);
+
+ // Ascertain whether to activate the Modify button.
+ vector<NamedColor>::size_type const selLyX =
+ fl_get_browser(dialog_->browser_lyx_objs);
+
+ fl_unfreeze_form(dialog_->form);
+ if (selLyX < 1) return;
+
+ bool modify = false;
+
+ // Is the choice an Xforms color...
+ if( selLyX-1 < xformsColorDB.size() ) {
+ vector<XformsColor>::size_type const i = selLyX - 1;
+ modify = (xformsColorDB[i].color() != col);
+ }
+ // or a LyX Logical color?
+ else {
+ vector<NamedColor>::size_type const i = selLyX - 1 -
+ xformsColorDB.size();
+ modify = (lyxColorDB[i].color() != col);
+ }
+
+ setEnabled(dialog_->button_modify, modify);
}
void FormPreferences::Colors::LoadBrowserLyX()
{
- // First, define the modifiable xform colors
- XformColor xcol;
+ if (!dialog_->browser_lyx_objs->visible) return;
+
+ // First, define the modifiable xforms colors
+ xformsColorDB.clear();
+ XformsColor xcol;
- xcol.name = "GUI background";
+ xcol.name = _("GUI background");
xcol.colorID = FL_COL1;
fl_getmcolor(FL_COL1, &xcol.r, &xcol.g, &xcol.b);
- xformColorDB.push_back( xcol );
+ xformsColorDB.push_back(xcol);
- xcol.name = "GUI text";
+ xcol.name = _("GUI text");
xcol.colorID = FL_BLACK;
fl_getmcolor(FL_BLACK, &xcol.r, &xcol.g, &xcol.b);
- xformColorDB.push_back( xcol );
+ fl_mapcolor(GUI_COLOR_CURSOR, xcol.r, xcol.g, xcol.b);
+ fl_set_cursor_color(FL_DEFAULT_CURSOR, GUI_COLOR_CURSOR, FL_WHITE);
- // FL_LIGHTER_COL1 does not exist in xforms 0.88
- // xcol.name = "GUI active tab";
- // xcol.colorID = FL_LIGHTER_COL1;
- // fl_getmcolor(FL_LIGHTER_COL1, &xcol.r, &xcol.g, &xcol.b);
- //
- // xformColorDB.push_back( xcol );
+ xformsColorDB.push_back(xcol);
- xcol.name = "GUI push button";
+ xcol.name = _("GUI selection");
xcol.colorID = FL_YELLOW;
fl_getmcolor(FL_YELLOW, &xcol.r, &xcol.g, &xcol.b);
- xformColorDB.push_back( xcol );
+ xformsColorDB.push_back(xcol);
+
+ xcol.name = _("GUI pointer");
+ xcol.colorID = GUI_COLOR_CURSOR;
+ fl_getmcolor(GUI_COLOR_CURSOR, &xcol.r, &xcol.g, &xcol.b);
+
+ xformsColorDB.push_back(xcol);
// Now create the the LyX LColors database
- for( int i=0; i<LColor::ignore; ++i ) {
+ lyxColorDB.clear();
+ for (int i=0; i<LColor::ignore; ++i) {
LColor::color lc = static_cast<LColor::color>(i);
- if( lc == LColor::none
+ if (lc == LColor::none
|| lc == LColor::black
|| lc == LColor::white
|| lc == LColor::red
|| lc == LColor::magenta
|| lc == LColor::yellow
|| lc == LColor::inherit
- || lc == LColor::ignore ) continue;
+ || lc == LColor::ignore) continue;
- string name = lcolor.getX11Name(lc);
+ string const name = lcolor.getX11Name(lc);
+ Display * display = fl_get_display();;
+ Colormap const colormap = fl_state[fl_get_vclass()].colormap;
+ XColor xcol, ccol;
- vector<NamedColor>::const_iterator cit =
- find_if(colorDB.begin(), colorDB.end(),
- compare_memfun(&NamedColor::getname, name));
+ if (XLookupColor(display, colormap, name.c_str(), &xcol, &ccol)
+ == 0) {
+ lyxerr << "FormPreferences::Colors::LoadBrowserLyX:\n"
+ << "LColor " << lcolor.getLyXName(lc)
+ << ": X can't find color \"" << name
+ << "\". Set to \"black\"!" << endl;
- if( cit == colorDB.end() ) {
- lyxerr << "FormPreferences::Colors::LoadBrowserLyX: "
- << "can't find color \"" << name
- << "\". This shouldn't happen!" << endl;
+ string const arg = lcolor.getLyXName(lc) + " black";
+ parent_.lv_->getLyXFunc()->
+ dispatch(LFUN_SET_COLOR, arg);
continue;
}
- NamedColor ncol(lcolor.getGUIName(lc), (*cit).color());
- lyxColorDB.push_back( ncol );
- }
-
- // Finally, construct the browser
- FL_OBJECT * colbr = dialog_->browser_lyx_objs;
- fl_clear_browser( colbr );
- for( vector<XformColor>::const_iterator cit = xformColorDB.begin();
- cit != xformColorDB.end(); ++cit ) {
- fl_addto_browser(colbr, (*cit).getname().c_str() );
- }
- for( vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
- cit != lyxColorDB.end(); ++cit ) {
- fl_addto_browser(colbr, (*cit).getname().c_str() );
- }
-
- // just to be safe...
- fl_set_browser_topline( dialog_->browser_lyx_objs, 1);
- fl_deselect_browser( dialog_->browser_lyx_objs );
- fl_deactivate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_INACTIVE );
-}
-
+ // X has found the color. Now find the "appropriate" X11 name
+ // for this color.
-bool FormPreferences::Colors::LoadBrowserX11(string const & filename) const
-{
- LyXLex lex(0, 0);
- lex.setCommentChar('!');
-
- if (!lex.setFile(filename))
- return true;
-
- //colorDB.erase();
- //fullColorDB.erase();
-
- vector<RGBColor> cols;
- vector<string> names;
-
- while (lex.next()) {
+ // Note that X stores the RGB values in the range 0 - 65535
+ // whilst we require them in the range 0 - 255.
RGBColor col;
- col.r = lex.GetInteger();
- lex.next();
- col.g = lex.GetInteger();
- lex.next();
- col.b = lex.GetInteger();
- lex.EatLine();
- string name = frontStrip(lex.GetString(), " \t");
-
- // remove redundant entries on the fly
- bool add = cols.empty();
- if (!add) {
- vector<RGBColor>::const_iterator cit =
- find( cols.begin(), cols.end(), col );
- add = (cit == cols.end());
- }
-
- if (add) {
- if( col == RGBColor(0,0,0) )
- name = "black";
- else if( col == RGBColor(255,255,255) )
- name = "white";
- else
- name = lowercase( name );
-
- if ( col == RGBColor(0,0,0) ||
- col == RGBColor(255,255,255) ) {
- cols.insert(cols.begin(), col);
- names.insert(names.begin(), name);
- } else {
- cols.push_back(col);
- names.push_back(name);
- }
+ col.r = xcol.red / 256;
+ col.g = xcol.green / 256;
+ col.b = xcol.blue / 256;
+
+ // Create a valid X11 name of the form "#rrggbb" and change the
+ // LColor X11name to this. Don't want to trigger a redraw,
+ // as we're just changing the name not the RGB values.
+ // Also reset the system_lcolor names, so that we don't output
+ // unnecessary changes.
+ string const hexname = X11hexname(col);
+
+ if (lcolor.getX11Name(lc) != hexname) {
+ lcolor.setColor(lc, hexname);
+ system_lcolor.setColor(lc, hexname);
}
- // Also create a list of ALL names, colors
- fullColorDB.push_back( NamedColor(name, col) );
- // if name contains spaces, remove them
- if( contains(name, " ") ) {
- name = subst(name, " ", "");
- fullColorDB.push_back( NamedColor(name, col) );
- }
+ // Finally, push the color onto the database
+ NamedColor ncol(lcolor.getGUIName(lc), col);
+ lyxColorDB.push_back(ncol);
}
-
- FL_OBJECT * colbr = dialog_->browser_x11;
- fl_freeze_form(dialog_->form);
- fl_clear_browser( colbr );
- vector<string>::const_iterator sit = names.begin();
- for (vector<RGBColor>::const_iterator iit = cols.begin();
- iit != cols.end(); ++iit, ++sit) {
- colorDB.push_back( NamedColor(*sit, *iit) );
- fl_addto_browser(colbr, (*sit).c_str());
+ // Now construct the browser
+ FL_OBJECT * colbr = dialog_->browser_lyx_objs;
+ fl_freeze_form(dialog_->form);
+ fl_clear_browser(colbr);
+ for (vector<XformsColor>::const_iterator cit = xformsColorDB.begin();
+ cit != xformsColorDB.end(); ++cit) {
+ fl_addto_browser(colbr, cit->getname().c_str());
}
-
- fl_set_browser_topline(colbr, 1);
- fl_select_browser_line(colbr, 1);
- BrowserX11();
+ for (vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
+ cit != lyxColorDB.end(); ++cit) {
+ fl_addto_browser(colbr, cit->getname().c_str());
+ }
+
+ // just to be safe...
+ fl_set_browser_topline(dialog_->browser_lyx_objs, 1);
+ fl_select_browser_line(dialog_->browser_lyx_objs, 1);
fl_unfreeze_form(dialog_->form);
- return true;
+ InputBrowserLyX();
}
-bool FormPreferences::Colors::Modify() const
+void FormPreferences::Colors::Modify()
{
- int i = fl_get_browser( dialog_->browser_lyx_objs );
- if (i < 1) return true;
+ vector<NamedColor>::size_type const selLyX =
+ fl_get_browser(dialog_->browser_lyx_objs);
+ if (selLyX < 1) return;
- string name = fl_get_browser_line( dialog_->browser_lyx_objs, i );
+ RGBColor col;
+ fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
// Is the choice an Xforms color...
- int choice = 0;
-
- vector<NamedColor>::iterator it = // non-const; it's modified below
- find_if(xformColorDB.begin(), xformColorDB.end(),
- compare_memfun(&NamedColor::getname, name));
-
- if( it != xformColorDB.end() ) choice = 1;
-
+ if( selLyX-1 < xformsColorDB.size() ) {
+ vector<XformsColor>::size_type const i = selLyX - 1;
+ xformsColorDB[i].r = col.r;
+ xformsColorDB[i].g = col.g;
+ xformsColorDB[i].b = col.b;
+ }
// or a LyX Logical color?
- if( choice == 0 ) {
- it = find_if(lyxColorDB.begin(), lyxColorDB.end(),
- compare_memfun(&NamedColor::getname, name));
-
- if( it != colorDB.end() ) choice = 2;
+ else {
+ vector<NamedColor>::size_type const i = selLyX - 1 -
+ xformsColorDB.size();
+ lyxColorDB[i].r = col.r;
+ lyxColorDB[i].g = col.g;
+ lyxColorDB[i].b = col.b;
}
-
- if( choice == 0 ) return true;
- // Ok! Modify the color.
- int j = fl_get_browser( dialog_->browser_x11 );
- if (j < 1) return true;
+ fl_freeze_form(dialog_->form);
+ setEnabled(dialog_->button_modify, false);
+ fl_unfreeze_form(dialog_->form);
+}
- (*it).r = colorDB[j-1].r;
- (*it).g = colorDB[j-1].g;
- (*it).b = colorDB[j-1].b;
- fl_deselect_browser(dialog_->browser_x11);
- fl_deselect_browser(dialog_->browser_lyx_objs);
- fl_deactivate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_INACTIVE );
+void FormPreferences::Colors::SwitchColorSpace() const
+{
+ bool const pressed = fl_get_button(dialog_->button_colorspace);
- return true;
-}
+ RGBColor col;
+ fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
-bool FormPreferences::Colors::RGB() const
-{
fl_freeze_form(dialog_->form);
- RGBColor col;
- col.r = int(fl_get_slider_value(dialog_->valslider_red));
- col.g = int(fl_get_slider_value(dialog_->valslider_green));
- col.b = int(fl_get_slider_value(dialog_->valslider_blue));
-
- fl_mapcolor(FL_FREE_COL4, col.r, col.g, col.b);
- fl_redraw_object(dialog_->button_color);
+ if (pressed) {
+ fl_set_object_label(dialog_->button_colorspace, _("HSV"));
- int const i = SearchEntry( col );
- // change topline only if necessary
- // int top = fl_get_browser_topline(dialog_->browser_x11);
- // if (i < top || i > (top+15))
- fl_set_browser_topline(dialog_->browser_x11, i - 5);
- fl_select_browser_line(dialog_->browser_x11, i + 1);
-
- // Only activate the "Modify" button if the browser and slider colors
- // are the same AND if a LyX object is selected.
- int line = fl_get_browser(dialog_->browser_lyx_objs);
- bool isSelected = ( line > 0 );
- if( isSelected )
- if( line > fl_get_browser_maxline(dialog_->browser_lyx_objs) )
- isSelected = false;
-
- if( isSelected && colorDB[i].color() == col ) {
- fl_activate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_BLACK );
+ fl_hide_object(dialog_->slider_red);
+ fl_hide_object(dialog_->slider_blue);
+ fl_hide_object(dialog_->slider_green);
+ fl_show_object(dialog_->dial_hue);
+ fl_show_object(dialog_->slider_saturation);
+ fl_show_object(dialog_->slider_value);
+
+ 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);
+
+ col = HSVColor(hsv.h, 1.0, 1.0);
+ col.r = max(col.r,0);
+ fl_mapcolor(GUI_COLOR_HUE_DIAL, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->dial_hue);
+
+ // Adjust the label a bit, but not the actual values.
+ // Means that toggling from one space to the other has no
+ // effect on the final color.
+ int const h = int(hsv.h);
+ int const s = int(100*hsv.s);
+ int const v = int(100*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_deactivate_object( dialog_->button_modify );
- fl_set_object_lcol( dialog_->button_modify, FL_INACTIVE );
+ fl_set_object_label(dialog_->button_colorspace, _("RGB"));
+
+ fl_show_object(dialog_->slider_red);
+ fl_show_object(dialog_->slider_blue);
+ fl_show_object(dialog_->slider_green);
+ fl_hide_object(dialog_->dial_hue);
+ fl_hide_object(dialog_->slider_saturation);
+ fl_hide_object(dialog_->slider_value);
+
+ fl_set_slider_value(dialog_->slider_red, col.r);
+ fl_set_slider_value(dialog_->slider_green, col.g);
+ fl_set_slider_value(dialog_->slider_blue, col.b);
+
+ // Adjust the label a bit. Same reasoning as above.
+ int const r = int(col.r);
+ int const g = int(col.g);
+ int const b = int(col.b);
+ string const label = tostr(r) + string(", ") + tostr(g) +
+ string(", ") + tostr(b);
+ fl_set_object_label(dialog_->text_color_values, label.c_str());
}
-
+
fl_unfreeze_form(dialog_->form);
-
- return true;
}
-
-int FormPreferences::Colors::SearchEntry(RGBColor const & col) const
+string const FormPreferences::Colors::X11hexname(RGBColor const & col) const
{
- int mindiff = 0x7fffffff;
- vector<NamedColor>::const_iterator mincit = colorDB.begin();
-
- for (vector<NamedColor>::const_iterator cit = colorDB.begin();
- cit != colorDB.end(); ++cit) {
- RGBColor diff;
- diff.r = col.r - (*cit).r;
- diff.g = col.g - (*cit).g;
- diff.b = col.b - (*cit).b;
+ ostringstream ostr;
- int d = (2 * (diff.r * diff.r) +
- 3 * (diff.g * diff.g) +
- (diff.b * diff.b));
+ ostr << "#" << std::setbase(16) << std::setfill('0')
+ << std::setw(2) << col.r
+ << std::setw(2) << col.g
+ << std::setw(2) << col.b;
- if (mindiff > d) {
- mindiff = d;
- mincit = cit;
- }
- }
- return static_cast<int>(mincit - colorDB.begin());
+ return ostr.str().c_str();
}
-FormPreferences::Converters::~Converters()
+FormPreferences::Converters::Converters(FormPreferences & p)
+ : parent_(p)
+{}
+
+
+FD_form_converters const * FormPreferences::Converters::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
void FormPreferences::Converters::apply() const
{
converters = local_converters;
- converters.Update(formats);
- converters.BuildGraph();
+ converters.update(formats);
+ converters.buildGraph();
}
void FormPreferences::Converters::build()
{
- dialog_ = parent_.build_converters();
+ dialog_.reset(parent_.build_converters());
fl_set_input_return(dialog_->input_converter, FL_RETURN_CHANGED);
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);
}
string const
-FormPreferences::Converters::feedback( FL_OBJECT const * const ob ) const
+FormPreferences::Converters::feedback(FL_OBJECT const * const ob) const
{
string str;
} else if (ob == dialog_->input_flags) {
str = N_("Flags that control the converter behavior");
} else if (ob == dialog_->button_delete) {
- str = N_("Remove the current converter from the list of available converters.");
+ str = N_("Remove the current converter from the list of available converters. Note: you must then \"Apply\" the change.");
} else if (ob == dialog_->button_add) {
- str = N_("Add the current converter to the list of available converters.");
+ if (string(ob->label) == _("Add"))
+ str = N_("Add the current converter to the list of available converters. Note: you must then \"Apply\" the change.");
+ else
+ str = N_("Modify the contents of the current converter. Note: you must then \"Apply\" the change.");
}
return str;
}
-bool FormPreferences::Converters::input( FL_OBJECT const * const ob )
+bool FormPreferences::Converters::input(FL_OBJECT const * const ob)
{
- if( ob == dialog_->browser_all ) {
+ if (ob == dialog_->browser_all) {
return Browser();
} else if (ob == dialog_->choice_from
|| ob == dialog_->choice_to
|| ob == dialog_->input_converter
- || ob == dialog_->input_flags ) {
+ || ob == dialog_->input_flags) {
return Input();
- } else if( ob == dialog_->button_add ) {
+ } else if (ob == dialog_->button_add) {
return Add();
- } else if( ob == dialog_->button_delete ) {
- return Delete();
+ } else if (ob == dialog_->button_delete) {
+ return erase();
}
return true;
void FormPreferences::Converters::update()
{
local_converters = converters;
- local_converters.Update(local_formats);
+ local_converters.update(local_formats);
UpdateBrowser();
}
-struct compare_converter {
- int operator()(Converter const & a, Converter const & b) {
- int i = compare_no_case(a.From->prettyname(),
- b.From->prettyname());
- if (i == 0)
- return compare_no_case(a.To->prettyname(),
- b.To->prettyname()) < 0;
- else
- return i < 0;
- }
-};
-
-
void FormPreferences::Converters::UpdateBrowser()
{
- local_converters.Sort();
+ local_converters.sort();
fl_freeze_form(dialog_->form);
fl_clear_browser(dialog_->browser_all);
for (::Converters::const_iterator cit = local_converters.begin();
cit != local_converters.end(); ++cit) {
- string name = (*cit).From->prettyname() + " -> "
- + (*cit).To->prettyname();
+ string const name = cit->From->prettyname() + " -> "
+ + cit->To->prettyname();
fl_addto_browser(dialog_->browser_all, name.c_str());
}
Input();
bool FormPreferences::Converters::Add()
{
- string from = GetFrom();
- string to = GetTo();
- string command = fl_get_input(dialog_->input_converter);
- string flags = fl_get_input(dialog_->input_flags);
+ string const from = GetFrom();
+ string const to = GetTo();
+ string const command = fl_get_input(dialog_->input_converter);
+ string const flags = fl_get_input(dialog_->input_flags);
- Converter const * old = local_converters.GetConverter(from, to);
- local_converters.Add(from, to, command, flags);
+ Converter const * old = local_converters.getConverter(from, to);
+ local_converters.add(from, to, command, flags);
if (!old) {
- local_converters.UpdateLast(local_formats);
+ local_converters.updateLast(local_formats);
UpdateBrowser();
}
- fl_deactivate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
+ setEnabled(dialog_->button_add, false);
return true;
}
bool FormPreferences::Converters::Browser()
{
- int i = fl_get_browser( dialog_->browser_all );
- if( i <= 0 ) return false;
+ int const i = fl_get_browser(dialog_->browser_all);
+ if (i <= 0) return false;
- fl_freeze_form( dialog_->form );
+ fl_freeze_form(dialog_->form);
- Converter const & c = local_converters.Get(i-1);
- int j = local_formats.GetNumber(c.from);
+ Converter const & c = local_converters.get(i - 1);
+ int j = local_formats.getNumber(c.from);
if (j >= 0)
- fl_set_choice(dialog_->choice_from, j+1);
+ fl_set_choice(dialog_->choice_from, j + 1);
- j = local_formats.GetNumber(c.to);
+ j = local_formats.getNumber(c.to);
if (j >= 0)
- fl_set_choice(dialog_->choice_to, j+1);
+ fl_set_choice(dialog_->choice_to, j + 1);
fl_set_input(dialog_->input_converter, c.command.c_str());
fl_set_input(dialog_->input_flags, c.flags.c_str());
- fl_set_object_label( dialog_->button_add, idex(_("Modify|#M")) );
- fl_set_button_shortcut( dialog_->button_add,
- scex(_("Modify|#M")), 1 );
+ fl_set_object_label(dialog_->button_add, idex(_("Modify|#M")));
+ fl_set_button_shortcut(dialog_->button_add, scex(_("Modify|#M")), 1);
- fl_deactivate_object( dialog_->button_add );
- fl_set_object_lcol( dialog_->button_add, FL_INACTIVE );
-
- fl_activate_object( dialog_->button_delete );
- fl_set_object_lcol( dialog_->button_delete, FL_BLACK );
+ setEnabled(dialog_->button_add, false);
+ setEnabled(dialog_->button_delete, true);
- fl_unfreeze_form( dialog_->form);
+ fl_unfreeze_form(dialog_->form);
return false;
}
-bool FormPreferences::Converters::Delete()
+bool FormPreferences::Converters::erase()
{
- string from = GetFrom();
- string to = GetTo();
+ string const from = GetFrom();
+ string const to = GetTo();
- local_converters.Delete(from, to);
+ local_converters.erase(from, to);
UpdateBrowser();
return true;
}
bool FormPreferences::Converters::Input()
{
- string from = GetFrom();
- string to = GetTo();
- int sel = local_converters.GetNumber(from, to);
+ 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,
- scex(_("Add|#A")), 1);
+ fl_set_object_label(dialog_->button_add, idex(_("Add|#A")));
+ fl_set_button_shortcut(dialog_->button_add,
+ scex(_("Add|#A")), 1);
fl_deselect_browser(dialog_->browser_all);
-
- fl_deactivate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_INACTIVE);
+ setEnabled(dialog_->button_delete, false);
} else {
- fl_set_object_label( dialog_->button_add,
- idex(_("Modify|#M")) );
- fl_set_button_shortcut( dialog_->button_add,
+ fl_set_object_label(dialog_->button_add, idex(_("Modify|#M")));
+ fl_set_button_shortcut(dialog_->button_add,
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);
-
- fl_activate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_BLACK);
+ setEnabled(dialog_->button_delete, true);
}
- string command = fl_get_input(dialog_->input_converter);
- if (command.empty() || from == to) {
- fl_deactivate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
- } else {
- fl_activate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_BLACK);
- }
+ string const command = strip(fl_get_input(dialog_->input_converter));
+ bool const enable = !(command.empty() || from == to);
+ setEnabled(dialog_->button_add, enable);
fl_unfreeze_form(dialog_->form);
return false;
string const FormPreferences::Converters::GetFrom() const
{
- int i = fl_get_choice(dialog_->choice_from);
- if (i > 0)
- return local_formats.Get(i-1).name();
+ ::Formats::FormatList::size_type const i =
+ fl_get_choice(dialog_->choice_from);
+
+ if (i > 0 && i <= local_formats.size())
+ return local_formats.get(i - 1).name();
else {
- lyxerr << "FormPreferences::Converters::GetFrom: No choice!" << endl;
+ lyxerr << "FormPreferences::Converters::GetFrom: No choice!"
+ << endl;
return "???";
}
}
string const FormPreferences::Converters::GetTo() const
{
- int i = fl_get_choice(dialog_->choice_to);
- if (i > 0)
- return local_formats.Get(i-1).name();
+ ::Formats::FormatList::size_type const i =
+ fl_get_choice(dialog_->choice_to);
+
+ if (i > 0 && i <= local_formats.size())
+ return local_formats.get(i - 1).name();
else {
- lyxerr << "FormPreferences::Converters::GetTo: No choice!" << endl;
+ lyxerr << "FormPreferences::Converters::GetTo: No choice!"
+ << endl;
return "???";
}
}
{
string choice;
for (::Formats::const_iterator cit = local_formats.begin();
- cit != local_formats.end(); ++cit ) {
+ cit != local_formats.end(); ++cit) {
if (!choice.empty())
choice += " | ";
else
choice += " ";
- choice += (*cit).prettyname();
+ choice += cit->prettyname();
}
choice += " ";
- fl_clear_choice( dialog_->choice_from );
- fl_addto_choice( dialog_->choice_from, choice.c_str() );
+ fl_clear_choice(dialog_->choice_from);
+ fl_addto_choice(dialog_->choice_from, choice.c_str());
- fl_clear_choice( dialog_->choice_to );
- fl_addto_choice( dialog_->choice_to, choice.c_str() );
+ fl_clear_choice(dialog_->choice_to);
+ fl_addto_choice(dialog_->choice_to, choice.c_str());
}
-FormPreferences::Formats::~Formats()
+FormPreferences::Formats::Formats( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_formats const * FormPreferences::Formats::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
void FormPreferences::Formats::build()
{
- dialog_ = parent_.build_formats();
+ dialog_.reset(parent_.build_formats());
fl_set_input_return(dialog_->input_format, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_viewer, FL_RETURN_CHANGED);
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);
}
string const
-FormPreferences::Formats::feedback( FL_OBJECT const * const ob ) const
+FormPreferences::Formats::feedback(FL_OBJECT const * const ob) const
{
string str;
} else if (ob == dialog_->input_viewer) {
str = N_("The command used to launch the viewer application.");
} else if (ob == dialog_->button_delete) {
- str = N_("Remove the current format from the list of available formats.");
+ str = N_("Remove the current format from the list of available formats. Note: you must then \"Apply\" the change.");
} else if (ob == dialog_->button_add) {
- str = N_("Add the current format to the list of available formats.");
+ if (string(ob->label) == _("Add"))
+ str = N_("Add the current format to the list of available formats. Note: you must then \"Apply\" the change.");
+ else
+ str = N_("Modify the contents of the current format. Note: you must then \"Apply\" the change.");
}
return str;
|| ob == dialog_->input_gui_name
|| ob == dialog_->input_shrtcut
|| ob == dialog_->input_extension
- || ob == dialog_->input_viewer ) {
+ || ob == dialog_->input_viewer) {
return Input();
} else if (ob == dialog_->button_add) {
return Add();
} else if (ob == dialog_->button_delete) {
- return Delete();
+ return erase();
}
return false;
void FormPreferences::Formats::UpdateBrowser()
{
- local_formats.Sort();
+ local_formats.sort();
fl_freeze_form(dialog_->form);
fl_deselect_browser(dialog_->browser_all);
for (::Formats::const_iterator cit = local_formats.begin();
cit != local_formats.end(); ++cit)
fl_addto_browser(dialog_->browser_all,
- (*cit).prettyname().c_str());
+ cit->prettyname().c_str());
Input();
fl_unfreeze_form(dialog_->form);
// Mustn't forget to update the Formats available to the converters_
parent_.converters_.UpdateChoices();
- local_converters.Update(local_formats);
+ local_converters.update(local_formats);
}
bool FormPreferences::Formats::Add()
{
- string name = fl_get_input(dialog_->input_format);
- string prettyname = fl_get_input(dialog_->input_gui_name);
- string extension = fl_get_input(dialog_->input_extension);
- string shortcut = fl_get_input(dialog_->input_shrtcut);
- string viewer = fl_get_input(dialog_->input_viewer);
+ string const name = fl_get_input(dialog_->input_format);
+ string const prettyname = fl_get_input(dialog_->input_gui_name);
+ string const extension = fl_get_input(dialog_->input_extension);
+ string const shortcut = fl_get_input(dialog_->input_shrtcut);
+ string const viewer = fl_get_input(dialog_->input_viewer);
- Format const * old = local_formats.GetFormat(name);
- string old_prettyname = old ? old->prettyname() : string();
- local_formats.Add(name, extension, prettyname, shortcut);
- local_formats.SetViewer(name, viewer);
+ Format const * old = local_formats.getFormat(name);
+ string const old_prettyname = old ? old->prettyname() : string();
+ local_formats.add(name, extension, prettyname, shortcut);
+ local_formats.setViewer(name, viewer);
if (!old || prettyname != old_prettyname) {
UpdateBrowser();
if (old)
parent_.converters_.UpdateBrowser();
}
- fl_deactivate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
+ setEnabled(dialog_->button_add, false);
return true;
}
bool FormPreferences::Formats::Browser()
{
- int i = fl_get_browser(dialog_->browser_all);
- if( i <= 0 ) return false;
+ int const i = fl_get_browser(dialog_->browser_all);
+ if (i <= 0) return false;
fl_freeze_form(dialog_->form);
- Format const & f = local_formats.Get(i-1);
+ Format const & f = local_formats.get(i - 1);
fl_set_input(dialog_->input_format, f.name().c_str());
fl_set_input(dialog_->input_gui_name, f.prettyname().c_str());
fl_set_input(dialog_->input_extension, f.extension().c_str());
fl_set_input(dialog_->input_viewer, f.viewer().c_str());
- fl_set_object_label( dialog_->button_add, idex(_("Modify|#M")) );
- fl_set_button_shortcut( dialog_->button_add, scex(_("Modify|#M")), 1);
-
- fl_deactivate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
+ fl_set_object_label(dialog_->button_add, idex(_("Modify|#M")));
+ fl_set_button_shortcut(dialog_->button_add, scex(_("Modify|#M")), 1);
- fl_activate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_BLACK);
+ setEnabled(dialog_->button_add, false);
+ setEnabled(dialog_->button_delete, true);
fl_unfreeze_form(dialog_->form);
return false;
}
-bool FormPreferences::Formats::Delete()
+bool FormPreferences::Formats::erase()
{
- string name = fl_get_input(dialog_->input_format);
+ string const name = fl_get_input(dialog_->input_format);
- if (local_converters.FormatIsUsed(name)) {
+ if (local_converters.formatIsUsed(name)) {
parent_.printWarning(_("Cannot remove a Format used by a Converter. Remove the converter first."));
- fl_deactivate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_INACTIVE);
+ setEnabled(dialog_->button_delete, false);
return false;
}
- local_formats.Delete(name);
+ local_formats.erase(name);
UpdateBrowser();
return true;
}
bool FormPreferences::Formats::Input()
{
- string name = fl_get_input(dialog_->input_format);
- int sel = local_formats.GetNumber(name);
+ string const name = fl_get_input(dialog_->input_format);
+ int const sel = local_formats.getNumber(name);
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_object_label(dialog_->button_add,
+ idex(_("Add|#A")));
+ fl_set_button_shortcut(dialog_->button_add,
scex(_("Add|#A")), 1);
fl_deselect_browser(dialog_->browser_all);
-
- fl_deactivate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_INACTIVE);
+ setEnabled(dialog_->button_delete, false);
} else {
- fl_set_object_label( dialog_->button_add,
- idex(_("Modify|#M")) );
- fl_set_button_shortcut( dialog_->button_add,
+ fl_set_object_label(dialog_->button_add,
+ idex(_("Modify|#M")));
+ fl_set_button_shortcut(dialog_->button_add,
scex(_("Modify|#M")), 1);
- int top = max(sel-5, 0);
+ int const top = max(sel-5, 0);
fl_set_browser_topline(dialog_->browser_all, top);
fl_select_browser_line(dialog_->browser_all, sel+1);
-
- fl_activate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_BLACK);
- fl_activate_object(dialog_->button_delete);
- fl_set_object_lcol(dialog_->button_delete, FL_BLACK);
+ setEnabled(dialog_->button_add, true);
+ setEnabled(dialog_->button_delete, true);
}
- string prettyname = fl_get_input(dialog_->input_gui_name);
- if (name.empty() || prettyname.empty()) {
- fl_deactivate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
- } else {
- fl_activate_object(dialog_->button_add);
- fl_set_object_lcol(dialog_->button_add, FL_BLACK);
- }
+ string const prettyname = fl_get_input(dialog_->input_gui_name);
+ bool const enable = !(name.empty() || prettyname.empty());
+ setEnabled(dialog_->button_add, enable);
fl_unfreeze_form(dialog_->form);
return false;
}
-FormPreferences::InputsMisc::~InputsMisc()
+FormPreferences::InputsMisc::InputsMisc( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_inputs_misc const * FormPreferences::InputsMisc::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
void FormPreferences::InputsMisc::build()
{
- dialog_ = parent_.build_inputs_misc();
+ dialog_.reset(parent_.build_inputs_misc());
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);
}
{
string str;
- if (ob == dialog_->input_date_format )
- str = lyxrc.getDescription( LyXRC::RC_DATE_INSERT_FORMAT );
+ if (ob == dialog_->input_date_format)
+ str = lyxrc.getDescription(LyXRC::RC_DATE_INSERT_FORMAT);
return str;
}
}
-FormPreferences::Interface::~Interface()
+FormPreferences::Interface::Interface( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_interface const * FormPreferences::Interface::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
void FormPreferences::Interface::build()
{
- dialog_ = parent_.build_interface();
+ 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_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_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);
}
string const
-FormPreferences::Interface::feedback( FL_OBJECT const * const ob ) const
+FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const
{
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 );
- else if (ob == dialog_->input_bind_file )
- str = lyxrc.getDescription( LyXRC::RC_BINDFILE );
- else if (ob == dialog_->input_ui_file )
- str = lyxrc.getDescription( LyXRC::RC_UIFILE );
- else if (ob == dialog_->check_override_x_dead_keys )
- str = lyxrc.getDescription( LyXRC::RC_OVERRIDE_X_DEADKEYS );
+ 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);
+ else if (ob == dialog_->input_bind_file)
+ str = lyxrc.getDescription(LyXRC::RC_BINDFILE);
+ else if (ob == dialog_->input_ui_file)
+ str = lyxrc.getDescription(LyXRC::RC_UIFILE);
+ else if (ob == dialog_->check_override_x_dead_keys)
+ str = lyxrc.getDescription(LyXRC::RC_OVERRIDE_X_DEADKEYS);
return str;
}
-bool FormPreferences::Interface::input( FL_OBJECT const * const ob )
+bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
{
- if( ob == dialog_->button_bind_file_browse ) {
- string dir = system_lyxdir + string("bind");
+ if (ob == dialog_->button_bind_file_browse) {
+ string dir = AddName(system_lyxdir, "bind");
string name = N_("Sys Bind");
pair<string,string> dir1(name, dir);
- dir = user_lyxdir + string("bind");
+ dir = AddName(user_lyxdir, "bind");
name = N_("User Bind");
pair<string,string> dir2(name, dir);
- parent_.browse( dialog_->input_bind_file,
- _("Bind file"), "*.bind", dir1, dir2 );
+ parent_.browse(dialog_->input_bind_file,
+ N_("Bind file"), "*.bind", dir1, dir2);
- } else if ( ob == dialog_->button_ui_file_browse ) {
- string dir = system_lyxdir + string("ui");
+ } else if (ob == dialog_->button_ui_file_browse) {
+ string dir = AddName(system_lyxdir, "ui");
string name = N_("Sys UI");
pair<string,string> dir1(name, dir);
- dir = user_lyxdir + string("ui");
+ dir = AddName(user_lyxdir, "ui");
name = N_("User UI");
pair<string,string> dir2(name, dir);
- parent_.browse( dialog_->input_ui_file,
- _("UI file"), "*.ui", dir1, dir2 );
+ parent_.browse(dialog_->input_ui_file,
+ N_("UI file"), "*.ui", dir1, dir2);
}
return true;
}
-FormPreferences::Language::~Language()
+FormPreferences::Language::Language( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_language const * FormPreferences::Language::dialog()
{
- delete combo_default_lang;
- delete dialog_;
+ return dialog_.get();
}
lyxrc.default_language = combo_default_lang->getline();
int button = fl_get_button(dialog_->check_use_kbmap);
- string name_1 = fl_get_input(dialog_->input_kbmap1);
- string name_2 = fl_get_input(dialog_->input_kbmap2);
- if( button )
- button = ( !name_1.empty() && !name_2.empty() );
+ string const name_1 = fl_get_input(dialog_->input_kbmap1);
+ string const name_2 = fl_get_input(dialog_->input_kbmap2);
+ if (button)
+ button = !(name_1.empty() && name_2.empty());
lyxrc.use_kbmap = static_cast<bool>(button);
if (lyxrc.use_kbmap) {
button = fl_get_button(dialog_->check_rtl_support);
lyxrc.rtl_support = static_cast<bool>(button);
+ button = fl_get_button(dialog_->check_mark_foreign);
+ lyxrc.mark_foreign_language = static_cast<bool>(button);
+
button = fl_get_button(dialog_->check_auto_begin);
lyxrc.language_auto_begin = static_cast<bool>(button);
button = fl_get_button(dialog_->check_auto_end);
lyxrc.language_auto_end = static_cast<bool>(button);
- button = fl_get_button(dialog_->check_mark_foreign);
- lyxrc.mark_foreign_language = static_cast<bool>(button);
+ button = fl_get_button(dialog_->check_use_babel);
+ lyxrc.language_use_babel = static_cast<bool>(button);
+
+ button = fl_get_button(dialog_->check_global_options);
+ lyxrc.language_global_options = static_cast<bool>(button);
lyxrc.language_package = fl_get_input(dialog_->input_package);
lyxrc.language_command_begin = fl_get_input(dialog_->input_command_begin);
void FormPreferences::Language::build()
{
- dialog_ = parent_.build_language();
+ dialog_.reset(parent_.build_language());
fl_set_input_return(dialog_->input_package, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_command_begin, FL_RETURN_CHANGED);
FL_OBJECT * obj = dialog_->choice_default_lang;
fl_deactivate_object(dialog_->choice_default_lang);
- combo_default_lang = new Combox(FL_COMBOX_DROPLIST);
- combo_default_lang->add(obj->x, obj->y, obj->w, obj->h, 400);
+ 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_.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) {
- combo_default_lang->addto((*cit).second.lang());
+ combo_default_lang->addto(cit->second.lang());
}
fl_end_form();
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),
- // 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_->input_command_begin );
- setPreHandler( dialog_->input_command_end );
+ // 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);
// Activate/Deactivate the input fields dependent on the state of the
// buttons.
- input( 0 );
+ input(0);
}
{
string str;
- if (reinterpret_cast<Combox const *>(ob) == combo_default_lang )
- str = lyxrc.getDescription( LyXRC::RC_DEFAULT_LANGUAGE );
- else if (ob == dialog_->check_use_kbmap )
- str = lyxrc.getDescription( LyXRC::RC_KBMAP );
+ if (reinterpret_cast<Combox const *>(ob) == combo_default_lang.get())
+ str = lyxrc.getDescription(LyXRC::RC_DEFAULT_LANGUAGE);
+ else if (ob == dialog_->check_use_kbmap)
+ str = lyxrc.getDescription(LyXRC::RC_KBMAP);
else if (ob == dialog_->input_kbmap1)
- str = lyxrc.getDescription( LyXRC::RC_KBMAP_PRIMARY );
+ str = lyxrc.getDescription(LyXRC::RC_KBMAP_PRIMARY);
else if (ob == dialog_->input_kbmap2)
- str = lyxrc.getDescription( LyXRC::RC_KBMAP_SECONDARY );
- else if (ob == dialog_->check_rtl_support )
- str = lyxrc.getDescription( LyXRC::RC_RTL_SUPPORT );
- else if (ob == dialog_->check_auto_begin )
- str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_AUTO_BEGIN );
- else if (ob == dialog_->check_auto_end )
- str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_AUTO_END );
- else if (ob == dialog_->check_mark_foreign )
- str = lyxrc.getDescription( LyXRC::RC_MARK_FOREIGN_LANGUAGE );
- else if (ob == dialog_->input_package )
- str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_PACKAGE );
- else if (ob == dialog_->input_command_begin )
- str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_COMMAND_BEGIN );
- else if (ob == dialog_->input_command_end )
- str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_COMMAND_END );
+ str = lyxrc.getDescription(LyXRC::RC_KBMAP_SECONDARY);
+ else if (ob == dialog_->check_rtl_support)
+ str = lyxrc.getDescription(LyXRC::RC_RTL_SUPPORT);
+ else if (ob == dialog_->check_mark_foreign)
+ str = lyxrc.getDescription(LyXRC::RC_MARK_FOREIGN_LANGUAGE);
+ else if (ob == dialog_->check_auto_begin)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_AUTO_BEGIN);
+ else if (ob == dialog_->check_auto_end)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_AUTO_END);
+ else if (ob == dialog_->check_use_babel)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_USE_BABEL);
+ else if (ob == dialog_->check_global_options)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS);
+ else if (ob == dialog_->input_package)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_PACKAGE);
+ else if (ob == dialog_->input_command_begin)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_COMMAND_BEGIN);
+ else if (ob == dialog_->input_command_end)
+ str = lyxrc.getDescription(LyXRC::RC_LANGUAGE_COMMAND_END);
return str;
}
-bool FormPreferences::Language::input( FL_OBJECT const * const ob )
+bool FormPreferences::Language::input(FL_OBJECT const * const ob)
{
bool activate = true;
// objects,
// otherwise the function is called by an xforms CB via input().
if (!ob || ob == dialog_->check_use_kbmap) {
- if (fl_get_button(dialog_->check_use_kbmap)) {
- fl_activate_object(dialog_->button_kbmap1_browse);
- fl_set_object_lcol(dialog_->button_kbmap1_browse,
- FL_BLACK);
-
- fl_activate_object(dialog_->button_kbmap2_browse);
- fl_set_object_lcol(dialog_->button_kbmap2_browse,
- FL_BLACK);
-
- fl_activate_object(dialog_->input_kbmap1);
- fl_set_object_lcol(dialog_->input_kbmap1, FL_BLACK);
- fl_activate_object(dialog_->input_kbmap2);
- fl_set_object_lcol(dialog_->input_kbmap2, FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->button_kbmap1_browse);
- fl_set_object_lcol(dialog_->button_kbmap1_browse,
- FL_INACTIVE);
-
- fl_deactivate_object(dialog_->button_kbmap2_browse);
- fl_set_object_lcol(dialog_->button_kbmap2_browse,
- FL_INACTIVE);
-
- fl_deactivate_object(dialog_->input_kbmap1);
- fl_set_object_lcol(dialog_->input_kbmap1,
- FL_INACTIVE);
- fl_deactivate_object(dialog_->input_kbmap2);
- fl_set_object_lcol(dialog_->input_kbmap2,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_use_kbmap);
+ setEnabled(dialog_->button_kbmap1_browse, enable);
+ setEnabled(dialog_->button_kbmap2_browse, enable);
+ setEnabled(dialog_->input_kbmap1, enable);
+ setEnabled(dialog_->input_kbmap2, enable);
}
if (ob == dialog_->button_kbmap1_browse) {
- string dir = system_lyxdir + string("kbd");
- string name = N_("Key maps");
+ string const dir = AddName(system_lyxdir, "kbd");
+ string const name = N_("Key maps");
pair<string, string> dir1(name, dir);
parent_.browse(dialog_->input_kbmap1,
- _("Keyboard map"), "*.kmap", dir1,
- pair<string, string>());
+ N_("Keyboard map"), "*.kmap", dir1,
+ make_pair(string(), string()));
} else if (ob == dialog_->button_kbmap2_browse) {
- string dir = system_lyxdir + string("kbd");
- string name = N_("Key maps");
+ string const dir = AddName(system_lyxdir, "kbd");
+ string const name = N_("Key maps");
pair<string, string> dir1(name, dir);
parent_.browse(dialog_->input_kbmap2,
- _("Keyboard map"), "*.kmap", dir1,
- pair<string, string>());
+ N_("Keyboard map"), "*.kmap", dir1,
+ make_pair(string(), string()));
}
return activate;
fl_set_button(dialog_->check_use_kbmap,
lyxrc.use_kbmap);
- combo_default_lang->select_text( lyxrc.default_language );
+ combo_default_lang->select(lyxrc.default_language);
if (lyxrc.use_kbmap) {
fl_set_input(dialog_->input_kbmap1,
}
fl_set_button(dialog_->check_rtl_support, lyxrc.rtl_support);
- fl_set_button(dialog_->check_auto_begin, lyxrc.language_auto_begin);
- fl_set_button(dialog_->check_auto_end, lyxrc.language_auto_end);
fl_set_button(dialog_->check_mark_foreign,
lyxrc.mark_foreign_language);
+ fl_set_button(dialog_->check_auto_begin, lyxrc.language_auto_begin);
+ fl_set_button(dialog_->check_auto_end, lyxrc.language_auto_end);
+ fl_set_button(dialog_->check_use_babel, lyxrc.language_use_babel);
+ fl_set_button(dialog_->check_global_options,
+ lyxrc.language_global_options);
fl_set_input(dialog_->input_package,
lyxrc.language_package.c_str());
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));
+ pre->bc().valid(pre->input(reinterpret_cast<FL_OBJECT *>(combox), 0));
}
-FormPreferences::LnFmisc::~LnFmisc()
+FormPreferences::LnFmisc::LnFmisc( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_lnf_misc const * FormPreferences::LnFmisc::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
lyxrc.new_ask_filename = fl_get_button(dialog_->check_ask_new_file);
lyxrc.cursor_follows_scrollbar =
fl_get_button(dialog_->check_cursor_follows_scrollbar);
+ lyxrc.dialogs_iconify_with_main =
+ fl_get_button(dialog_->check_dialogs_iconify_with_main);
lyxrc.autosave = static_cast<unsigned int>
(fl_get_counter_value(dialog_->counter_autosave));
lyxrc.wheel_jump = static_cast<unsigned int>
void FormPreferences::LnFmisc::build()
{
- dialog_ = parent_.build_lnf_misc();
+ dialog_.reset(parent_.build_lnf_misc());
+
+ fl_set_counter_step(dialog_->counter_autosave, 1, 10);
+ fl_set_counter_step(dialog_->counter_wm_jump, 1, 10);
fl_set_counter_return(dialog_->counter_autosave, FL_RETURN_CHANGED);
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_->counter_wm_jump );
+ 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);
}
str = lyxrc.getDescription(LyXRC::RC_NEW_ASK_FILENAME);
else if (ob == dialog_->check_cursor_follows_scrollbar)
str = lyxrc.getDescription(LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR);
+ else if (ob == dialog_->check_dialogs_iconify_with_main)
+ str = lyxrc.getDescription(LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN);
else if (ob == dialog_->counter_autosave)
str = lyxrc.getDescription(LyXRC::RC_AUTOSAVE);
else if (ob == dialog_->counter_wm_jump)
fl_set_button(dialog_->check_ask_new_file, lyxrc.new_ask_filename);
fl_set_button(dialog_->check_cursor_follows_scrollbar,
lyxrc.cursor_follows_scrollbar);
+ fl_set_button(dialog_->check_dialogs_iconify_with_main,
+ lyxrc.dialogs_iconify_with_main);
fl_set_counter_value(dialog_->counter_autosave, lyxrc.autosave);
fl_set_counter_value(dialog_->counter_wm_jump, lyxrc.wheel_jump);
}
-FormPreferences::OutputsMisc::~OutputsMisc()
+FormPreferences::OutputsMisc::OutputsMisc( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_outputs_misc const * FormPreferences::OutputsMisc::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
lyxrc.ascii_roff_command = fl_get_input(dialog_->input_ascii_roff);
lyxrc.chktex_command = fl_get_input(dialog_->input_checktex);
+ lyxrc.view_dvi_paper_option = fl_get_input(dialog_->input_paperoption);
}
void FormPreferences::OutputsMisc::build()
{
- dialog_ = parent_.build_outputs_misc();
+ dialog_.reset(parent_.build_outputs_misc());
+
+ fl_set_counter_step(dialog_->counter_line_len, 1, 10);
+
+ fl_set_counter_return(dialog_->counter_line_len, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_tex_encoding, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_ascii_roff, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_checktex, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_paperoption, FL_RETURN_CHANGED);
- fl_set_counter_return(dialog_->counter_line_len,
- FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_tex_encoding,
- FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_ascii_roff,
- FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_checktex,
- FL_RETURN_CHANGED);
fl_addto_choice(dialog_->choice_default_papersize,
_(" 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_->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);
}
str = lyxrc.getDescription(LyXRC::RC_CHKTEX_COMMAND);
else if (ob == dialog_->choice_default_papersize)
str = lyxrc.getDescription(LyXRC::RC_DEFAULT_PAPERSIZE);
+ else if (ob == dialog_->input_paperoption)
+ str = lyxrc.getDescription(LyXRC::RC_VIEWDVI_PAPEROPTION);
return str;
}
lyxrc.ascii_roff_command.c_str());
fl_set_input(dialog_->input_checktex,
lyxrc.chktex_command.c_str());
+ fl_set_input(dialog_->input_paperoption,
+ lyxrc.view_dvi_paper_option.c_str());
}
-FormPreferences::Paths::~Paths()
+FormPreferences::Paths::Paths( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_paths const * FormPreferences::Paths::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
int button = fl_get_button(dialog_->check_use_temp_dir);
string str = fl_get_input(dialog_->input_temp_dir);
- if (!button ) str.erase();
+ if (!button) str.erase();
lyxrc.use_tempdir = button;
lyxrc.tempdir_path = str;
button = fl_get_button(dialog_->check_last_files);
str = fl_get_input(dialog_->input_lastfiles);
- if (!button ) str.erase();
+ if (!button) str.erase();
lyxrc.check_lastfiles = button;
lyxrc.lastfiles = str;
button = fl_get_button(dialog_->check_make_backups);
str = fl_get_input(dialog_->input_backup_path);
- if (!button ) str.erase();
+ if (!button) str.erase();
lyxrc.make_backup = button;
lyxrc.backupdir_path = str;
void FormPreferences::Paths::build()
{
- dialog_ = parent_.build_paths();
+ dialog_.reset(parent_.build_paths());
fl_set_input_return(dialog_->input_default_path, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_template_path, FL_RETURN_CHANGED);
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);
}
str = lyxrc.getDescription(LyXRC::RC_DOCUMENTPATH);
else if (ob == dialog_->input_template_path)
str = lyxrc.getDescription(LyXRC::RC_TEMPLATEPATH);
- else if (ob == dialog_->check_use_temp_dir )
+ else if (ob == dialog_->check_use_temp_dir)
str = lyxrc.getDescription(LyXRC::RC_USETEMPDIR);
else if (ob == dialog_->input_temp_dir)
str = lyxrc.getDescription(LyXRC::RC_TEMPDIRPATH);
str = lyxrc.getDescription(LyXRC::RC_CHECKLASTFILES);
else if (ob == dialog_->input_lastfiles)
str = lyxrc.getDescription(LyXRC::RC_LASTFILES);
- else if (ob == dialog_->counter_lastfiles )
- str = lyxrc.getDescription( LyXRC::RC_NUMLASTFILES );
- else if (ob == dialog_->check_make_backups )
- str = lyxrc.getDescription( LyXRC::RC_MAKE_BACKUP );
- else if (ob == dialog_->input_backup_path )
- str = lyxrc.getDescription( LyXRC::RC_BACKUPDIR_PATH );
- else if (ob == dialog_->input_serverpipe ) {
- str = lyxrc.getDescription( LyXRC::RC_SERVERPIPE );
- str += " Enter either the input pipe, xxx.in, or the output pipe, xxx.out.";
+ else if (ob == dialog_->counter_lastfiles)
+ str = lyxrc.getDescription(LyXRC::RC_NUMLASTFILES);
+ else if (ob == dialog_->check_make_backups)
+ str = lyxrc.getDescription(LyXRC::RC_MAKE_BACKUP);
+ else if (ob == dialog_->input_backup_path)
+ str = lyxrc.getDescription(LyXRC::RC_BACKUPDIR_PATH);
+ else if (ob == dialog_->input_serverpipe) {
+ str = lyxrc.getDescription(LyXRC::RC_SERVERPIPE);
}
-
return str;
}
// objects,
// otherwise the function is called by an xforms CB via input().
if (!ob || ob == dialog_->check_use_temp_dir) {
- if (fl_get_button(dialog_->check_use_temp_dir)) {
- fl_activate_object(dialog_->input_temp_dir);
- fl_set_object_lcol(dialog_->input_temp_dir,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_temp_dir);
- fl_set_object_lcol(dialog_->input_temp_dir,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_use_temp_dir);
+ setEnabled(dialog_->input_temp_dir, enable);
}
if (!ob || ob == dialog_->check_last_files) {
- if (fl_get_button(dialog_->check_last_files)) {
- fl_activate_object(dialog_->input_lastfiles);
- fl_set_object_lcol(dialog_->input_lastfiles,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_lastfiles);
- fl_set_object_lcol(dialog_->input_lastfiles,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_last_files);
+ setEnabled(dialog_->input_lastfiles, enable);
}
if (!ob || ob == dialog_->check_make_backups) {
- if (fl_get_button(dialog_->check_make_backups)) {
- fl_activate_object(dialog_->input_backup_path);
- fl_set_object_lcol(dialog_->input_backup_path,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_backup_path);
- fl_set_object_lcol(dialog_->input_backup_path,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_make_backups);
+ setEnabled(dialog_->input_backup_path, enable);
}
if (!ob || ob == dialog_->input_default_path) {
- string err;
- string name = fl_get_input(dialog_->input_default_path);
- if (!WriteableDir(name, err) ) {
- parent_.printWarning( err );
+ string const name = fl_get_input(dialog_->input_default_path);
+ if (!RWInfo::WriteableDir(name)) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_template_path) {
- string err;
- string name = fl_get_input(dialog_->input_template_path);
- if (!ReadableDir(name, err) ) {
- parent_.printWarning( err );
+ string const name = fl_get_input(dialog_->input_template_path);
+ if (!RWInfo::ReadableDir(name)) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_temp_dir) {
- string err;
- string name = fl_get_input(dialog_->input_temp_dir);
+ string const name = fl_get_input(dialog_->input_temp_dir);
if (fl_get_button(dialog_->check_make_backups)
&& !name.empty()
- && !WriteableDir(name, err) ) {
- parent_.printWarning( err );
+ && !RWInfo::WriteableDir(name)) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_backup_path) {
- string err;
- string name = fl_get_input(dialog_->input_backup_path);
+ string const name = fl_get_input(dialog_->input_backup_path);
if (fl_get_button(dialog_->check_make_backups)
&& !name.empty()
- && !WriteableDir(name, err) ) {
- parent_.printWarning( err );
+ && !RWInfo::WriteableDir(name)) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_lastfiles) {
- string err;
- string name = fl_get_input(dialog_->input_lastfiles);
+ string const name = fl_get_input(dialog_->input_lastfiles);
if (fl_get_button(dialog_->check_last_files)
&& !name.empty()
- && !WriteableFile(name, err) ) {
- parent_.printWarning( err );
+ && !RWInfo::WriteableFile(name)) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (!ob || ob == dialog_->input_serverpipe) {
- string err;
- string name = fl_get_input(dialog_->input_serverpipe);
+ string const name = fl_get_input(dialog_->input_serverpipe);
if (!name.empty()) {
- // strip of the extension
- string str = ChangeExtension(name, "");
- if (!WriteableFile( str + ".in", err)) {
- parent_.printWarning( err );
+ // strip off the extension
+ string const str = ChangeExtension(name, "");
+ if (!RWInfo::WriteableFile(str + ".in")) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
- if (!WriteableFile( str + ".out", err)) {
- parent_.printWarning( err );
+ if (!RWInfo::WriteableFile(str + ".out")) {
+ parent_.printWarning(RWInfo::ErrorMessage());
return false;
}
}
if (ob == dialog_->button_default_path_browse) {
parent_.browse(dialog_->input_default_path,
- _("Default path"), string(),
- pair<string, string>(),
- pair<string, string>());
+ N_("Default path"), string(),
+ make_pair(string(), string()),
+ make_pair(string(), string()));
} else if (ob == dialog_->button_template_path_browse) {
parent_.browse(dialog_->input_template_path,
- _("Template path"), string(),
- pair<string, string>(),
- pair<string, string>());
+ N_("Template path"), string(),
+ make_pair(string(), string()),
+ make_pair(string(), string()));
} else if (ob == dialog_->button_temp_dir_browse) {
parent_.browse(dialog_->input_temp_dir,
- _("Temp dir"), string(),
- pair<string, string>(),
- pair<string, string>());
+ N_("Temp dir"), string(),
+ make_pair(string(), string()),
+ make_pair(string(), string()));
} else if (ob == dialog_->button_lastfiles_browse) {
pair<string, string> dir(_("User"), user_lyxdir);
parent_.browse(dialog_->input_lastfiles,
- _("Lastfiles"), string(), dir,
- pair<string, string>());
+ N_("Lastfiles"), string(), dir,
+ make_pair(string(), string()));
} else if (ob == dialog_->button_backup_path_browse) {
- parent_.browse( dialog_->input_backup_path,
- _("Backup path"), string(),
- pair<string, string>(),
- pair<string, string>());
+ parent_.browse(dialog_->input_backup_path,
+ N_("Backup path"), string(),
+ make_pair(string(), string()),
+ make_pair(string(), string()));
} else if (ob == dialog_->button_serverpipe_browse) {
- // Not sure how to do this!!!
+ parent_.browse(dialog_->input_serverpipe,
+ N_("LyX Server pipes"), string(),
+ make_pair(string(), string()),
+ make_pair(string(), string()));
}
return activate;
// Activate/Deactivate the input fields dependent on the state of the
// buttons.
- input( 0 );
+ input(0);
}
-FormPreferences::Printer::~Printer()
+FormPreferences::Printer::Printer(FormPreferences & p)
+ : parent_(p)
+{}
+
+
+FD_form_printer const * FormPreferences::Printer::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
{
string str;
- if (ob == dialog_->input_command )
- str = lyxrc.getDescription( LyXRC::RC_PRINT_COMMAND );
- else if (ob == dialog_->check_adapt_output )
- str = lyxrc.getDescription( LyXRC::RC_PRINT_ADAPTOUTPUT );
- else if (ob == dialog_->input_to_printer )
- str = lyxrc.getDescription( LyXRC::RC_PRINTTOPRINTER );
- else if (ob == dialog_->input_to_file )
- str = lyxrc.getDescription( LyXRC::RC_PRINTTOFILE );
- else if (ob == dialog_->input_file_extension )
- str = lyxrc.getDescription( LyXRC::RC_PRINTFILEEXTENSION );
- else if (ob == dialog_->input_extra_options )
- str = lyxrc.getDescription( LyXRC::RC_PRINTEXSTRAOPTIONS );
- else if (ob == dialog_->input_spool_command )
- str = lyxrc.getDescription( LyXRC::RC_PRINTSPOOL_COMMAND );
- else if (ob == dialog_->input_spool_prefix )
- str = lyxrc.getDescription( LyXRC::RC_PRINTSPOOL_PRINTERPREFIX );
- else if (ob == dialog_->input_name )
- str = lyxrc.getDescription( LyXRC::RC_PRINTER );
- else if (ob == dialog_->input_even_pages )
- str = lyxrc.getDescription( LyXRC::RC_PRINTEVENPAGEFLAG );
- else if (ob == dialog_->input_odd_pages )
- str = lyxrc.getDescription( LyXRC::RC_PRINTODDPAGEFLAG );
- else if (ob == dialog_->input_page_range )
- str = lyxrc.getDescription( LyXRC::RC_PRINTPAGERANGEFLAG );
- else if (ob == dialog_->input_reverse )
- str = lyxrc.getDescription( LyXRC::RC_PRINTREVERSEFLAG );
- else if (ob == dialog_->input_landscape )
- str = lyxrc.getDescription( LyXRC::RC_PRINTLANDSCAPEFLAG );
- else if (ob == dialog_->input_copies )
- str = lyxrc.getDescription( LyXRC::RC_PRINTCOLLCOPIESFLAG );
- else if (ob == dialog_->input_collated )
- str = lyxrc.getDescription( LyXRC::RC_PRINTCOPIESFLAG );
- else if (ob == dialog_->input_paper_type )
- str = lyxrc.getDescription( LyXRC::RC_PRINTPAPERFLAG );
- else if (ob == dialog_->input_paper_size )
- str = lyxrc.getDescription( LyXRC::RC_PRINTPAPERDIMENSIONFLAG );
+ if (ob == dialog_->input_command)
+ str = lyxrc.getDescription(LyXRC::RC_PRINT_COMMAND);
+ else if (ob == dialog_->check_adapt_output)
+ str = lyxrc.getDescription(LyXRC::RC_PRINT_ADAPTOUTPUT);
+ else if (ob == dialog_->input_to_printer)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTTOPRINTER);
+ else if (ob == dialog_->input_to_file)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTTOFILE);
+ else if (ob == dialog_->input_file_extension)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTFILEEXTENSION);
+ else if (ob == dialog_->input_extra_options)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTEXSTRAOPTIONS);
+ else if (ob == dialog_->input_spool_command)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTSPOOL_COMMAND);
+ else if (ob == dialog_->input_spool_prefix)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTSPOOL_PRINTERPREFIX);
+ else if (ob == dialog_->input_name)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTER);
+ else if (ob == dialog_->input_even_pages)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTEVENPAGEFLAG);
+ else if (ob == dialog_->input_odd_pages)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTODDPAGEFLAG);
+ else if (ob == dialog_->input_page_range)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTPAGERANGEFLAG);
+ else if (ob == dialog_->input_reverse)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTREVERSEFLAG);
+ else if (ob == dialog_->input_landscape)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG);
+ else if (ob == dialog_->input_copies)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTCOPIESFLAG);
+ else if (ob == dialog_->input_collated)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG);
+ else if (ob == dialog_->input_paper_type)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTPAPERFLAG);
+ else if (ob == dialog_->input_paper_size)
+ str = lyxrc.getDescription(LyXRC::RC_PRINTPAPERDIMENSIONFLAG);
return str;
}
void FormPreferences::Printer::build()
{
- dialog_ = parent_.build_printer();
+ dialog_.reset(parent_.build_printer());
fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_page_range, FL_RETURN_CHANGED);
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::ScreenFonts::ScreenFonts( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_screen_fonts const * FormPreferences::ScreenFonts::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
if (changed) {
// Now update the buffers
// Can anything below here affect the redraw process?
- parent_.lv_->getLyXFunc()->Dispatch(LFUN_SCREEN_FONT_UPDATE);
+ parent_.lv_->getLyXFunc()->dispatch(LFUN_SCREEN_FONT_UPDATE);
}
}
void FormPreferences::ScreenFonts::build()
{
- dialog_ = parent_.build_screen_fonts();
-
- fl_set_input_return(dialog_->input_roman, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_sans, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_typewriter,
- FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_screen_encoding,
- FL_RETURN_CHANGED);
- fl_set_counter_return(dialog_->counter_zoom, FL_RETURN_CHANGED);
- fl_set_counter_return(dialog_->counter_dpi, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_tiny, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_script, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_footnote, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_small, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_normal, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_large, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_larger, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_largest, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_huge, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_huger, FL_RETURN_CHANGED);
-
- fl_set_input_filter(dialog_->input_tiny,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_script,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_footnote,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_small,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_normal,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_large,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_larger,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_largest,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_huge,
- fl_unsigned_int_filter);
- fl_set_input_filter(dialog_->input_huger,
- fl_unsigned_int_filter);
+ dialog_.reset(parent_.build_screen_fonts());
+
+ fl_set_counter_step(dialog_->counter_zoom, 1, 10);
+ fl_set_counter_step(dialog_->counter_dpi, 1, 10);
+
+ fl_set_input_return(dialog_->input_roman, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_sans, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_typewriter, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_screen_encoding, FL_RETURN_CHANGED);
+ fl_set_counter_return(dialog_->counter_zoom, FL_RETURN_CHANGED);
+ fl_set_counter_return(dialog_->counter_dpi, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_tiny, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_script, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_footnote, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_small, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_normal, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_large, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_larger, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_largest, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_huge, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_huger, FL_RETURN_CHANGED);
+
+ fl_set_input_filter(dialog_->input_tiny, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_script, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_footnote, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_small, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_normal, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_large, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_larger, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_largest, fl_unsigned_float_filter);
+ fl_set_input_filter(dialog_->input_huge, fl_unsigned_float_filter);
+ 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
+FormPreferences::ScreenFonts::feedback(FL_OBJECT const * const ob) const
{
string str;
- if (ob == dialog_->input_roman )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_ROMAN );
- else if (ob == dialog_->input_sans )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SANS );
- else if (ob == dialog_->input_typewriter )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_TYPEWRITER );
- else if (ob == dialog_->check_scalable )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SCALABLE );
- else if (ob == dialog_->input_screen_encoding )
- 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 )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_DPI );
+ if (ob == dialog_->input_roman)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ROMAN);
+ else if (ob == dialog_->input_sans)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SANS);
+ else if (ob == dialog_->input_typewriter)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_TYPEWRITER);
+ else if (ob == dialog_->check_scalable)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SCALABLE);
+ else if (ob == dialog_->input_screen_encoding)
+ 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)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_DPI);
else if (ob == dialog_->input_tiny
|| ob == dialog_->input_script
|| ob == dialog_->input_footnote
|| ob == dialog_->input_largest
|| ob == dialog_->input_normal
|| ob == dialog_->input_huge
- || ob == dialog_->input_huger )
- str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SIZES );
+ || ob == dialog_->input_huger)
+ str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SIZES);
return str;
}
}
-FormPreferences::SpellChecker::~SpellChecker()
+
+FormPreferences::SpellOptions::SpellOptions( FormPreferences & p )
+ : parent_(p)
+{}
+
+
+FD_form_spelloptions const * FormPreferences::SpellOptions::dialog()
{
- delete dialog_;
+ return dialog_.get();
}
-void FormPreferences::SpellChecker::apply()
+void FormPreferences::SpellOptions::apply()
{
string choice = fl_get_choice_text(dialog_->choice_spell_command);
lyxrc.isp_command = choice;
+#if 0
// If spell checker == "none", all other input set to off.
if (fl_get_choice(dialog_->choice_spell_command) == 1) {
lyxrc.isp_use_alt_lang = false;
lyxrc.isp_accept_compound = false;
lyxrc.isp_use_input_encoding = false;
} else {
+#else
int button = fl_get_button(dialog_->check_alt_lang);
choice = fl_get_input(dialog_->input_alt_lang);
- if (button && choice.empty() ) button = 0;
- if (!button ) choice.erase();
+ if (button && choice.empty()) button = 0;
+ if (!button) choice.erase();
lyxrc.isp_use_alt_lang = static_cast<bool>(button);
lyxrc.isp_alt_lang = choice;
button = fl_get_button(dialog_->check_escape_chars);
choice = fl_get_input(dialog_->input_escape_chars);
- if (button && choice.empty() ) button = 0;
- if (!button ) choice.erase();
+ if (button && choice.empty()) button = 0;
+ if (!button) choice.erase();
lyxrc.isp_use_esc_chars = static_cast<bool>(button);
lyxrc.isp_esc_chars = choice;
button = fl_get_button(dialog_->check_personal_dict);
choice = fl_get_input(dialog_->input_personal_dict);
- if (button && choice.empty() ) button = 0;
- if (!button ) choice.erase();
+ if (button && choice.empty()) button = 0;
+ if (!button) choice.erase();
lyxrc.isp_use_pers_dict = static_cast<bool>(button);
lyxrc.isp_pers_dict = choice;
button = fl_get_button(dialog_->check_input_enc);
lyxrc.isp_use_input_encoding = static_cast<bool>(button);
+#endif
+#if 0
}
+#endif
// Reset view
update();
}
-void FormPreferences::SpellChecker::build()
+void FormPreferences::SpellOptions::build()
{
- dialog_ = parent_.build_spellchecker();
+ dialog_.reset(parent_.build_spelloptions());
fl_addto_choice(dialog_->choice_spell_command,
+#if 0
_(" none | ispell | aspell "));
- 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);
+#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);
}
string const
-FormPreferences::SpellChecker::feedback(FL_OBJECT const * const ob) const
+FormPreferences::SpellOptions::feedback(FL_OBJECT const * const ob) const
{
string str;
str = lyxrc.getDescription(LyXRC::RC_USE_ESC_CHARS);
else if (ob == dialog_->input_escape_chars)
str = lyxrc.getDescription(LyXRC::RC_ESC_CHARS);
- else if (ob == dialog_->check_personal_dict )
+ else if (ob == dialog_->check_personal_dict)
str = lyxrc.getDescription(LyXRC::RC_USE_PERS_DICT);
else if (ob == dialog_->input_personal_dict)
str = lyxrc.getDescription(LyXRC::RC_PERS_DICT);
- else if (ob == dialog_->check_compound_words )
+ else if (ob == dialog_->check_compound_words)
str = lyxrc.getDescription(LyXRC::RC_ACCEPT_COMPOUND);
else if (ob == dialog_->check_input_enc)
str = lyxrc.getDescription(LyXRC::RC_USE_INP_ENC);
}
-bool FormPreferences::SpellChecker::input( FL_OBJECT const * const ob )
+bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
{
- // !ob if function is called from updateSpellChecker() to de/activate
+ // !ob if function is called from updateSpellOptions() to de/activate
// objects,
// otherwise the function is called by an xforms CB via input().
+#if 0
// If spell checker == "none", disable all input.
if (!ob || ob == dialog_->choice_spell_command) {
if (fl_get_choice(dialog_->choice_spell_command) == 1) {
- fl_deactivate_object( dialog_->check_alt_lang );
- fl_deactivate_object( dialog_->input_alt_lang );
- fl_deactivate_object( dialog_->check_escape_chars );
- fl_deactivate_object( dialog_->input_escape_chars );
- fl_deactivate_object( dialog_->check_personal_dict );
- fl_deactivate_object( dialog_->input_personal_dict );
- fl_deactivate_object( dialog_->check_compound_words );
- fl_deactivate_object( dialog_->check_input_enc );
+ fl_deactivate_object(dialog_->check_alt_lang);
+ fl_deactivate_object(dialog_->input_alt_lang);
+ fl_deactivate_object(dialog_->check_escape_chars);
+ fl_deactivate_object(dialog_->input_escape_chars);
+ fl_deactivate_object(dialog_->check_personal_dict);
+ fl_deactivate_object(dialog_->input_personal_dict);
+ fl_deactivate_object(dialog_->check_compound_words);
+ fl_deactivate_object(dialog_->check_input_enc);
return true;
} else {
- fl_activate_object( dialog_->check_alt_lang );
- fl_activate_object( dialog_->check_escape_chars );
- fl_activate_object( dialog_->check_personal_dict );
- fl_activate_object( dialog_->check_compound_words );
- fl_activate_object( dialog_->check_input_enc );
+ fl_activate_object(dialog_->check_alt_lang);
+ fl_activate_object(dialog_->check_escape_chars);
+ fl_activate_object(dialog_->check_personal_dict);
+ fl_activate_object(dialog_->check_compound_words);
+ fl_activate_object(dialog_->check_input_enc);
}
}
+#endif
if (!ob || ob == dialog_->check_alt_lang) {
- if (fl_get_button(dialog_->check_alt_lang)) {
- fl_activate_object(dialog_->input_alt_lang);
- fl_set_object_lcol(dialog_->input_alt_lang,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_alt_lang);
- fl_set_object_lcol(dialog_->input_alt_lang,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_alt_lang);
+ setEnabled(dialog_->input_alt_lang, enable);
}
if (!ob || ob == dialog_->check_escape_chars) {
- if (fl_get_button(dialog_->check_escape_chars)) {
- fl_activate_object(dialog_->input_escape_chars);
- fl_set_object_lcol(dialog_->input_escape_chars,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_escape_chars);
- fl_set_object_lcol(dialog_->input_escape_chars,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_escape_chars);
+ setEnabled(dialog_->input_escape_chars, enable);
}
if (!ob || ob == dialog_->check_personal_dict) {
- if (fl_get_button(dialog_->check_personal_dict)) {
- fl_activate_object(dialog_->input_personal_dict);
- fl_set_object_lcol(dialog_->input_personal_dict,
- FL_BLACK);
- } else {
- fl_deactivate_object(dialog_->input_personal_dict);
- fl_set_object_lcol(dialog_->input_personal_dict,
- FL_INACTIVE);
- }
+ bool const enable = fl_get_button(dialog_->check_personal_dict);
+ setEnabled(dialog_->input_personal_dict, enable);
}
- if( ob == dialog_->button_personal_dict) {
+ if (ob == dialog_->button_personal_dict) {
parent_.browse(dialog_->input_personal_dict,
- _("Personal dictionary"), "*.ispell",
- pair<string, string>(),
- pair<string, string>());
+ N_("Personal dictionary"), "*.ispell",
+ make_pair(string(), string()),
+ make_pair(string(), string()));
}
return true; // All input is valid!
}
-void FormPreferences::SpellChecker::update()
+void FormPreferences::SpellOptions::update()
{
int choice = 1;
- if (lyxrc.isp_command == "none" )
+#if 0
+ if (lyxrc.isp_command == "none")
choice = 1;
- else if (lyxrc.isp_command == "ispell" )
+ else if (lyxrc.isp_command == "ispell")
choice = 2;
- else if (lyxrc.isp_command == "aspell" )
+ else if (lyxrc.isp_command == "aspell")
choice = 3;
+#else
+ if (lyxrc.isp_command == "ispell")
+ choice = 1;
+ else if (lyxrc.isp_command == "aspell")
+ choice = 2;
+#endif
fl_set_choice(dialog_->choice_spell_command, choice);
string str;
- if (lyxrc.isp_use_alt_lang ) str = lyxrc.isp_alt_lang;
+ 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;
+ if (lyxrc.isp_use_esc_chars) str = lyxrc.isp_esc_chars;
fl_set_button(dialog_->check_escape_chars,
lyxrc.isp_use_esc_chars);
fl_set_input(dialog_->input_escape_chars, str.c_str());
str.erase();
- if (lyxrc.isp_use_pers_dict ) str = lyxrc.isp_pers_dict;
+ if (lyxrc.isp_use_pers_dict) str = lyxrc.isp_pers_dict;
fl_set_button(dialog_->check_personal_dict,
lyxrc.isp_use_pers_dict);
// Activate/Deactivate the input fields dependent on the state of the
// buttons.
- input( 0 );
+ input(0);
}
-void FormPreferences::printWarning( string const & warning )
+void FormPreferences::printWarning(string const & warning)
{
warningPosted = true;
- string str = N_("WARNING!") + string(" ") + warning;
- str = formatted( str, dialog_->text_warning->w-10,
- FL_SMALL_SIZE, FL_NORMAL_STYLE );
+ 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);
// Show the file browser dialog
string const new_filename =
- browseFile(filename, title, pattern, dir1, dir2);
+ browseFile(lv_, filename, title, pattern, dir1, dir2);
// Save the filename to the dialog
if (new_filename != filename && !new_filename.empty()) {
// C function wrapper, required by xforms.
-C_PREPOSTHANDLER(FormPreferences, FeedbackCB)
+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.
- Assert(ob);
+ 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);
// preemptive handler for feedback messages
void FormPreferences::Feedback(FL_OBJECT * ob, int event)
{
- Assert(ob);
+ lyx::Assert(ob);
switch (event) {
case FL_ENTER:
}
-
-
void FormPreferences::setPreHandler(FL_OBJECT * ob)
{
- Assert(ob);
+ lyx::Assert(ob);
fl_set_object_prehandler(ob, C_FormPreferencesFeedbackCB);
}
-
projects / lyx.git / blobdiff