*
* \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include "ControlPrefs.h"
#include "FormPreferences.h"
#include "forms/form_preferences.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "Color.h"
-#include "input_validators.h"
+#include "FormColorpicker.h"
#include "forms_gettext.h"
+#include "input_validators.h"
+#include "xformsBC.h"
#include "xforms_helpers.h"
-#include "helper_funcs.h" // getSecond
+
+#include "controllers/ControlPrefs.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h" // getSecond
#include "buffer.h"
-#include "converter.h"
-#include "format.h"
-#include "debug.h"
-#include "language.h"
-#include "frnt_lang.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "lastfiles.h"
#include "LColor.h"
-#include "Lsstream.h"
-#include "funcrequest.h"
-#include "author.h"
+#include "lyxfont.h"
#include "support/lstrings.h"
-#include "support/lyxfunctional.h"
-#include "support/lyxmanip.h"
#include "support/tostr.h"
+#include "support/path_defines.h"
#include "support/filetools.h"
-#include "support/LAssert.h"
-
-#include "graphics/GraphicsCache.h"
-#include "graphics/GraphicsTypes.h"
-
-#include <boost/bind.hpp>
#include "lyx_forms.h"
#include "combox.h"
-#include <utility>
#include <iomanip>
-#include <X11/Xlib.h>
using std::endl;
-using std::pair;
using std::make_pair;
using std::max;
using std::min;
+
+using std::pair;
using std::vector;
-using std::setw;
-using std::setfill;
+using std::string;
-extern string system_lyxdir;
-extern string user_lyxdir;
+namespace lyx {
-using namespace lyx::support;
+using support::AddName;
+using support::ChangeExtension;
+using support::rtrim;
+using support::strToDbl;
+using support::trim;
+using support::user_lyxdir;
-namespace grfx = lyx::graphics;
+namespace frontend {
namespace {
-// These should probably go inside the class definition...
-Formats local_formats;
-Converters local_converters;
-
string makeFontName(string const & family, string const & foundry)
{
if (foundry.empty())
}
-string const X11hexname(RGBColor const & col)
-{
- ostringstream ostr;
-
- ostr << '#' << std::setbase(16) << setfill('0')
- << setw(2) << col.r
- << setw(2) << col.g
- << setw(2) << col.b;
-
- return STRCONV(ostr.str());
-}
#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2)
bool const scalableTabfolders = false;
} // namespace anon
-typedef FormCB<ControlPrefs, FormDB<FD_preferences> > base_class;
+typedef FormController<ControlPrefs, FormView<FD_preferences> > base_class;
-FormPreferences::FormPreferences()
- : base_class(_("Preferences"), scalableTabfolders),
- colors_(*this), converters_(*this), inputs_misc_(*this),
- formats_(*this), interface_(*this), language_(*this),
- lnf_misc_(*this), identity_(*this), outputs_misc_(*this),
- paths_(*this), printer_(*this), screen_fonts_(*this),
- spelloptions_(*this)
-{
-}
+FormPreferences::FormPreferences(Dialog & parent)
+ : base_class(parent, _("Preferences"), scalableTabfolders),
+ colors_(*this), converters_(*this), copiers_(*this),
+ formats_(*this), identity_(*this), inputs_misc_(*this),
+ interface_(*this), language_(*this), lnf_misc_(*this),
+ outputs_misc_(*this), paths_(*this), printer_(*this),
+ screen_fonts_(*this), spelloptions_(*this)
+{}
void FormPreferences::redraw()
FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs);
if (inner_form && inner_form->visible)
fl_hide_form(inner_form);
- FormBase::hide();
+ FormDialogView::hide();
}
// these will become nested tabfolders
colors_.build();
converters_.build();
+ copiers_.build();
formats_.build();
inputs_misc_.build();
interface_.build();
fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Converters").c_str(),
converters_.dialog()->form);
+ fl_addto_tabfolder(converters_tab_->tabfolder_inner,
+ _("Copiers").c_str(),
+ copiers_.dialog()->form);
// then build inputs
// Paths should probably go in a few inner_tab called Files
LyXRC & rc(controller().rc());
colors_.apply();
- formats_.apply(); // Must be before converters_.apply()
- converters_.apply();
inputs_misc_.apply(rc);
interface_.apply(rc);
language_.apply(rc);
spelloptions_.apply(rc);
// The "Save" button has been pressed.
- if (controller().isClosing() && colors_.modifiedXformsPrefs) {
+ if (dialog().isClosing() && colors_.modifiedXformsPrefs) {
string const filename =
- AddName(user_lyxdir, "preferences.xform");
+ AddName(user_lyxdir(), "preferences.xform");
colors_.modifiedXformsPrefs = !XformsColor::write(filename);
}
}
string const FormPreferences::getFeedback(FL_OBJECT * ob)
{
- Assert(ob);
+ BOOST_ASSERT(ob);
if (ob->form->fdui == colors_.dialog())
return colors_.feedback(ob);
if (ob->form->fdui == converters_.dialog())
return converters_.feedback(ob);
+ if (ob->form->fdui == copiers_.dialog())
+ return copiers_.feedback(ob);
if (ob->form->fdui == formats_.dialog())
return formats_.feedback(ob);
if (ob->form->fdui == inputs_misc_.dialog())
ButtonPolicy::SMInput FormPreferences::input(FL_OBJECT * ob, long)
{
- Assert(ob);
+ BOOST_ASSERT(ob);
bool valid = true;
colors_.input(ob);
} else if (ob->form->fdui == converters_.dialog()) {
valid = converters_.input(ob);
+ } else if (ob->form->fdui == copiers_.dialog()) {
+ valid = copiers_.input(ob);
} else if (ob->form->fdui == formats_.dialog()) {
valid = formats_.input(ob);
} else if (ob->form->fdui == interface_.dialog()) {
colors_.update();
formats_.update(); // Must be before converters_.update()
converters_.update();
+ copiers_.update();
inputs_misc_.update(rc);
interface_.update(rc);
language_.update(rc);
// 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());
+ LColor::color lc = lcolor.getFromLyXName(cit->lyxname);
if (lc == LColor::inherit) continue;
// Create a valid X11 name of the form "#rrggbb"
void FormPreferences::Colors::build()
{
+ picker_.reset(new FormColorpicker);
dialog_.reset(build_preferences_colors(&parent_));
fl_set_object_color(dialog_->button_color,
GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
- 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);
-
- 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);
-
- fl_set_slider_bounds(dialog_->slider_value, 0.0, 1.0);
- fl_set_slider_step(dialog_->slider_value, 0.01);
- fl_set_slider_return(dialog_->slider_value, FL_RETURN_CHANGED);
-
- fl_set_slider_bounds(dialog_->slider_red, 0.0, 255.0);
- fl_set_slider_step(dialog_->slider_red, 1.0);
- fl_set_slider_return(dialog_->slider_red, FL_RETURN_CHANGED);
-
- fl_set_slider_bounds(dialog_->slider_green, 0.0, 255.0);
- fl_set_slider_step(dialog_->slider_green, 1.0);
- fl_set_slider_return(dialog_->slider_green, FL_RETURN_CHANGED);
-
- fl_set_slider_bounds(dialog_->slider_blue, 0.0, 255.0);
- fl_set_slider_step(dialog_->slider_blue, 1.0);
- fl_set_slider_return(dialog_->slider_blue, FL_RETURN_CHANGED);
-
// set up the feedback mechanism
setPrehandler(dialog_->browser_lyx_objs);
setPrehandler(dialog_->button_color);
setPrehandler(dialog_->button_modify);
- setPrehandler(dialog_->dial_hue);
- setPrehandler(dialog_->slider_saturation);
- setPrehandler(dialog_->slider_value);
- setPrehandler(dialog_->slider_red);
- setPrehandler(dialog_->slider_green);
- setPrehandler(dialog_->slider_blue);
- setPrehandler(dialog_->radio_rgb);
- setPrehandler(dialog_->radio_hsv);
}
if (ob == dialog_->button_modify)
return _("Modify the LyX object's color. Note: you must then \"Apply\" the change.");
- 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)
- return _("Find a new color.");
-
- if (ob == dialog_->radio_rgb || ob == dialog_->radio_hsv)
- return _("Toggle between RGB and HSV color spaces.");
-
return string();
}
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_->slider_red ||
- ob == dialog_->slider_green ||
- ob == dialog_->slider_blue) {
- InputRGB();
-
- } else if (ob == dialog_->radio_rgb ||
- ob == dialog_->radio_hsv) {
- SwitchColorSpace();
-
} else if (ob == dialog_->button_modify) {
Modify();
}
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();
-
- // Deactivate the modify button to begin with...
- setEnabled(dialog_->button_modify, false);
-
- fl_unfreeze_form(dialog_->form);
-}
-
-
-void FormPreferences::Colors::InputHSV()
-{
- 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);
-
- int const h = int(hue);
- int const s = int(100.0 * sat);
- int const v = int(100.0 * val);
-
- string const label = tostr(h) + ", " + tostr(s) + ", " + tostr(v);
- fl_set_object_label(dialog_->text_color_values, label.c_str());
-
- RGBColor col = HSVColor(hue, sat, val);
-
- fl_freeze_form(dialog_->form);
-
- fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
- fl_redraw_object(dialog_->button_color);
-
- col = HSVColor(hue, 1.0, 1.0);
- col.r = max(col.r, 0u);
- 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);
-}
-
-
-void FormPreferences::Colors::InputRGB()
-{
- 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));
-
- string const label = tostr(red) + string(", ") + tostr(green) +
- string(", ") + tostr(blue);
- fl_set_object_label(dialog_->text_color_values, label.c_str());
-
- fl_freeze_form(dialog_->form);
-
- RGBColor col = RGBColor(red, green, blue);
- fl_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);
}
xformsColorDB.clear();
XformsColor xcol;
- xcol.name = _("GUI background");
+ xcol.lyxname = "GUI background";
+ xcol.guiname = _("GUI background");
xcol.colorID = FL_COL1;
fl_getmcolor(FL_COL1, &xcol.r, &xcol.g, &xcol.b);
xformsColorDB.push_back(xcol);
- xcol.name = _("GUI text");
+ xcol.lyxname = "GUI text";
+ xcol.guiname = _("GUI text");
xcol.colorID = FL_BLACK;
fl_getmcolor(FL_BLACK, &xcol.r, &xcol.g, &xcol.b);
xformsColorDB.push_back(xcol);
- xcol.name = _("GUI selection");
+ xcol.lyxname = "GUI selection";
+ xcol.guiname = _("GUI selection");
xcol.colorID = FL_YELLOW;
fl_getmcolor(FL_YELLOW, &xcol.r, &xcol.g, &xcol.b);
xformsColorDB.push_back(xcol);
- xcol.name = _("GUI pointer");
+ xcol.lyxname = "GUI pointer";
+ xcol.guiname = _("GUI pointer");
xcol.colorID = GUI_COLOR_CURSOR;
fl_getmcolor(GUI_COLOR_CURSOR, &xcol.r, &xcol.g, &xcol.b);
}
// Finally, push the color onto the database
- NamedColor ncol(lcolor.getGUIName(lc), col);
+ NamedColor ncol(lcolor.getLyXName(lc), lcolor.getGUIName(lc), col);
lyxColorDB.push_back(ncol);
}
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_addto_browser(colbr, cit->guiname.c_str());
}
for (vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
cit != lyxColorDB.end(); ++cit) {
- fl_addto_browser(colbr, cit->getname().c_str());
+ fl_addto_browser(colbr, cit->guiname.c_str());
}
// just to be safe...
if (selLyX < 1)
return;
- RGBColor col;
- fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
+ RGBColor before;
+ fl_getmcolor(GUI_COLOR_CHOICE, &before.r, &before.g, &before.b);
+
+ RGBColor col = picker_->requestColor(before);
+ if (before == col)
+ return;
+
+ fl_mapcolor(GUI_COLOR_CHOICE, col.r, col.g, col.b);
+ fl_redraw_object(dialog_->button_color);
// Is the choice an Xforms color...
if (selLyX - 1 < xformsColorDB.size()) {
lyxColorDB[i].g = col.g;
lyxColorDB[i].b = col.b;
}
-
- fl_freeze_form(dialog_->form);
- setEnabled(dialog_->button_modify, false);
- fl_unfreeze_form(dialog_->form);
-}
-
-
-void FormPreferences::Colors::SwitchColorSpace() const
-{
- bool const hsv = fl_get_button(dialog_->radio_hsv);
-
- RGBColor col;
- fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b);
-
- fl_freeze_form(dialog_->form);
-
- if (hsv) {
- 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, 0u);
- 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) + ", " + tostr(s) +
- ", " + tostr(v);
- fl_set_object_label(dialog_->text_color_values, label.c_str());
-
- } else {
- fl_show_object(dialog_->slider_red);
- fl_show_object(dialog_->slider_blue);
- 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) + ", " + tostr(g) +
- ", " + tostr(b);
- fl_set_object_label(dialog_->text_color_values, label.c_str());
- }
-
- fl_unfreeze_form(dialog_->form);
}
}
-void FormPreferences::Converters::apply() const
+::Converters & FormPreferences::Converters::converters()
+{
+ return parent_.controller().converters();
+}
+
+
+::Formats & FormPreferences::Converters::formats()
{
- parent_.controller().setConverters(local_converters);
+ return parent_.controller().formats();
}
void FormPreferences::Converters::update()
{
- local_converters = converters;
- local_converters.update(local_formats);
UpdateBrowser();
}
void FormPreferences::Converters::UpdateBrowser()
{
- local_converters.sort();
+ 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) {
+ for (::Converters::const_iterator cit = converters().begin();
+ cit != converters().end(); ++cit) {
string const name = cit->From->prettyname() + " -> "
+ cit->To->prettyname();
fl_addto_browser(dialog_->browser_all, name.c_str());
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 = converters().getConverter(from, to);
+ converters().add(from, to, command, flags);
if (!old) {
- local_converters.updateLast(local_formats);
+ converters().updateLast(formats());
UpdateBrowser();
}
setEnabled(dialog_->button_add, false);
fl_freeze_form(dialog_->form);
- Converter const & c = local_converters.get(i - 1);
- int j = local_formats.getNumber(c.from);
+ Converter const & c = converters().get(i - 1);
+ int j = formats().getNumber(c.from);
if (j >= 0)
fl_set_choice(dialog_->choice_from, j + 1);
- j = local_formats.getNumber(c.to);
+ j = formats().getNumber(c.to);
if (j >= 0)
fl_set_choice(dialog_->choice_to, j + 1);
string const from = GetFrom();
string const to = GetTo();
- local_converters.erase(from, to);
+ converters().erase(from, to);
UpdateBrowser();
return true;
}
{
string const from = GetFrom();
string const to = GetTo();
- int const sel = local_converters.getNumber(from, to);
+ int const sel = converters().getNumber(from, to);
fl_freeze_form(dialog_->form);
}
-string const FormPreferences::Converters::GetFrom() const
+string const FormPreferences::Converters::GetFrom()
{
::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();
+ if (i > 0 && i <= formats().size())
+ return formats().get(i - 1).name();
lyxerr << "FormPreferences::Converters::GetFrom: No choice!" << endl;
return "???";
}
-string const FormPreferences::Converters::GetTo() const
+string const FormPreferences::Converters::GetTo()
{
::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();
+ if (i > 0 && i <= formats().size())
+ return formats().get(i - 1).name();
lyxerr << "FormPreferences::Converters::GetTo: No choice!" << endl;
return "???";
}
-void FormPreferences::Converters::UpdateChoices() const
+void FormPreferences::Converters::UpdateChoices()
{
string choice;
- for (::Formats::const_iterator cit = local_formats.begin();
- cit != local_formats.end(); ++cit) {
+ for (::Formats::const_iterator cit = formats().begin();
+ cit != formats().end(); ++cit) {
if (!choice.empty())
choice += " | ";
else
}
+FormPreferences::Copiers::Copiers(FormPreferences & p)
+ : parent_(p)
+{}
+
+
+FD_preferences_copiers const * FormPreferences::Copiers::dialog()
+{
+ return dialog_.get();
+}
+
+
+::Movers & FormPreferences::Copiers::movers()
+{
+ return parent_.controller().movers();
+}
+
+
+void FormPreferences::Copiers::build()
+{
+ dialog_.reset(build_preferences_copiers(&parent_));
+
+ fl_set_input_return(dialog_->input_copier, FL_RETURN_CHANGED);
+
+ // set up the feedback mechanism
+ setPrehandler(dialog_->browser_all);
+ setPrehandler(dialog_->button_delete);
+ setPrehandler(dialog_->button_add);
+ setPrehandler(dialog_->choice_format);
+ setPrehandler(dialog_->input_copier);
+}
+
+
+string const
+FormPreferences::Copiers::feedback(FL_OBJECT const * const ob) const
+{
+ if (ob == dialog_->browser_all)
+ return _("All explicitly defined copiers for LyX");
+
+ if (ob == dialog_->choice_format)
+ return _("Copier for this format");
+
+ if (ob == dialog_->input_copier)
+
+ return _("The command used to copy the file. "
+ "$$i is the \"from\" file name and "
+ "$$o is the \"to\" file name.\n"
+ "$$s can be used as path to "
+ "LyX's own collection of scripts.");
+
+ if (ob == dialog_->button_delete)
+ return _("Remove the current copier from the list of available "
+ "copiers. Note: you must then \"Apply\" the change.");
+
+ if (ob == dialog_->button_add) {
+ if (string(ob->label) == _("Add"))
+ return _("Add the current copier to the list of available "
+ "copiers. Note: you must then \"Apply\" the change.");
+ else
+ return _("Modify the contents of the current copier. "
+ "Note: you must then \"Apply\" the change.");
+ }
+
+ return string();
+}
+
+
+bool FormPreferences::Copiers::input(FL_OBJECT const * const ob)
+{
+ if (ob == dialog_->browser_all)
+ return Browser();
+
+ if (ob == dialog_->choice_format
+ || ob == dialog_->input_copier)
+ return Input();
+
+ if (ob == dialog_->button_add)
+ return Add();
+
+ if (ob == dialog_->button_delete)
+ return Erase();
+
+ return true;
+}
+
+
+void FormPreferences::Copiers::update()
+{
+ // Build data for the browser widget
+ Movers::iterator const begin = movers().begin();
+ Movers::iterator const end = movers().end();
+
+ vector<string> fmts;
+ fmts.reserve(std::distance(begin, end));
+ for (Movers::iterator it = begin; it != end; ++it) {
+ std::string const & command = it->second.command();
+ if (command.empty())
+ continue;
+ std::string const & fmt = it->first;
+ fmts.push_back(::formats.prettyName(fmt));
+ }
+
+ std::sort(fmts.begin(), fmts.end());
+
+ // Build data for the choice widget
+ string choice;
+ for (::Formats::const_iterator it = ::formats.begin();
+ it != ::formats.end(); ++it) {
+ if (!choice.empty())
+ choice += " | ";
+ else
+ choice += ' ';
+ choice += it->prettyname();
+ }
+ choice += ' ';
+
+ // The input widget
+ fl_freeze_form(dialog_->form);
+ fl_set_input(dialog_->input_copier, "");
+
+ // The browser widget
+ fl_clear_browser(dialog_->browser_all);
+
+ vector<string>::const_iterator it = fmts.begin();
+ vector<string>::const_iterator const fmts_end = fmts.end();
+ for (; it != fmts_end; ++it)
+ fl_addto_browser(dialog_->browser_all, it->c_str());
+
+ // The choice widget
+ fl_clear_choice(dialog_->choice_format);
+ fl_addto_choice(dialog_->choice_format, choice.c_str());
+ fl_set_choice(dialog_->choice_format, 1);
+
+ Input();
+ fl_unfreeze_form(dialog_->form);
+}
+
+
+namespace {
+
+struct SamePrettyName {
+ SamePrettyName(string const & n) : pretty_name_(n) {}
+
+ bool operator()(::Format const & fmt) const {
+ return fmt.prettyname() == pretty_name_;
+ }
+
+private:
+ string const pretty_name_;
+};
+
+
+::Format const * getFormat(std::string const & prettyname)
+{
+ ::Formats::const_iterator it = ::formats.begin();
+ ::Formats::const_iterator const end = ::formats.end();
+ it = std::find_if(it, end, SamePrettyName(prettyname));
+ return it == end ? 0 : &*it;
+}
+
+} // namespace anon
+
+
+bool FormPreferences::Copiers::Add()
+{
+ ::Format const * fmt = getFormat(getString(dialog_->choice_format));
+ if (fmt == 0)
+ return false;
+
+ string const command = getString(dialog_->input_copier);
+ if (command.empty())
+ return false;
+
+ fl_freeze_form(dialog_->form);
+
+ movers().set(fmt->name(), command);
+ update();
+ setEnabled(dialog_->button_add, false);
+
+ fl_unfreeze_form(dialog_->form);
+ return true;
+}
+
+
+bool FormPreferences::Copiers::Browser()
+{
+ int const i = fl_get_browser(dialog_->browser_all);
+ if (i <= 0) return false;
+
+ ::Format const * fmt = getFormat(getString(dialog_->browser_all, i));
+ if (fmt == 0)
+ return false;
+
+ string const & fmt_name = fmt->name();
+ string const & gui_name = fmt->prettyname();
+ string const & command = movers().command(fmt_name);
+
+ fl_freeze_form(dialog_->form);
+
+ int const choice_size = fl_get_choice_maxitems(dialog_->choice_format);
+ for (int i = 1; i <= choice_size; ++i) {
+ char const * const c_str =
+ fl_get_choice_item_text(dialog_->choice_format, i);
+ string const line = c_str ? trim(c_str) : string();
+ if (line == gui_name) {
+ fl_set_choice(dialog_->choice_format, i);
+ break;
+ }
+ }
+
+ fl_set_input(dialog_->input_copier, command.c_str());
+
+ fl_set_object_label(dialog_->button_add, idex(_("Modify|#M")).c_str());
+ fl_set_button_shortcut(dialog_->button_add,
+ scex(_("Modify|#M")).c_str(), 1);
+
+ setEnabled(dialog_->button_add, false);
+ setEnabled(dialog_->button_delete, true);
+
+ fl_unfreeze_form(dialog_->form);
+ return false;
+}
+
+
+bool FormPreferences::Copiers::Erase()
+{
+ ::Format const * fmt = getFormat(getString(dialog_->choice_format));
+ if (fmt == 0)
+ return false;
+
+ string const & fmt_name = fmt->name();
+
+ movers().set(fmt_name, string());
+ update();
+ return true;
+}
+
+
+bool FormPreferences::Copiers::Input()
+{
+ ::Format const * fmt = getFormat(getString(dialog_->choice_format));
+ if (fmt == 0)
+ return false;
+
+ string const & gui_name = fmt->prettyname();
+ string const command = getString(dialog_->input_copier);
+
+ fl_freeze_form(dialog_->form);
+ fl_deselect_browser(dialog_->browser_all);
+ bool found_line = false;
+ int const browser_size = fl_get_browser_maxline(dialog_->browser_all);
+ for (int i = 1; i <= browser_size; ++i) {
+ char const * const c_str =
+ fl_get_browser_line(dialog_->browser_all, i);
+ string const line = c_str ? trim(c_str) : string();
+ if (line == gui_name) {
+ fl_select_browser_line(dialog_->browser_all, i);
+ int top = max(i-5, 1);
+ fl_set_browser_topline(dialog_->browser_all, top);
+ found_line = true;
+ break;
+ }
+ }
+
+ if (!found_line) {
+ fl_set_object_label(dialog_->button_add,
+ idex(_("Add|#A")).c_str());
+ fl_set_button_shortcut(dialog_->button_add,
+ scex(_("Add|#A")).c_str(), 1);
+
+ setEnabled(dialog_->button_delete, false);
+ } else {
+ fl_set_object_label(dialog_->button_add,
+ idex(_("Modify|#M")).c_str());
+ fl_set_button_shortcut(dialog_->button_add,
+ scex(_("Modify|#M")).c_str(), 1);
+
+ setEnabled(dialog_->button_delete, true);
+ }
+
+ setEnabled(dialog_->button_add, !command.empty());
+
+ fl_unfreeze_form(dialog_->form);
+ return false;
+}
+
+
FormPreferences::Formats::Formats(FormPreferences & p)
: parent_(p)
{}
}
-void FormPreferences::Formats::apply() const
+::Converters & FormPreferences::Formats::converters()
{
- parent_.controller().setFormats(local_formats);
+ return parent_.controller().converters();
+}
+
+
+::Formats & FormPreferences::Formats::formats()
+{
+ return parent_.controller().formats();
}
fl_set_input_return(dialog_->input_format, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_viewer, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_editor, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_shrtcut, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_gui_name, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_extension, FL_RETURN_CHANGED);
setPrehandler(dialog_->button_add);
setPrehandler(dialog_->input_extension);
setPrehandler(dialog_->input_viewer);
+ setPrehandler(dialog_->input_editor);
setPrehandler(dialog_->input_shrtcut);
}
if (ob == dialog_->input_viewer)
return _("The command used to launch the viewer application.");
+ if (ob == dialog_->input_editor)
+ return _("The command used to launch the editor application.");
+
if (ob == dialog_->button_delete)
return _("Remove the current format from the list of available "
"formats. Note: you must then \"Apply\" the change.");
|| ob == dialog_->input_gui_name
|| ob == dialog_->input_shrtcut
|| ob == dialog_->input_extension
- || ob == dialog_->input_viewer)
+ || ob == dialog_->input_viewer
+ || ob == dialog_->input_editor)
return Input();
if (ob == dialog_->button_add)
void FormPreferences::Formats::update()
{
- local_formats = formats;
UpdateBrowser();
}
void FormPreferences::Formats::UpdateBrowser()
{
- local_formats.sort();
+ formats().sort();
fl_freeze_form(dialog_->form);
fl_deselect_browser(dialog_->browser_all);
fl_clear_browser(dialog_->browser_all);
- for (::Formats::const_iterator cit = local_formats.begin();
- cit != local_formats.end(); ++cit)
+ for (::Formats::const_iterator cit = formats().begin();
+ cit != formats().end(); ++cit)
fl_addto_browser(dialog_->browser_all,
cit->prettyname().c_str());
// Mustn't forget to update the Formats available to the converters_
parent_.converters_.UpdateChoices();
- local_converters.update(local_formats);
+ converters().update(formats());
}
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);
+ string const editor = fl_get_input(dialog_->input_editor);
- Format const * old = local_formats.getFormat(name);
+ Format const * old = formats().getFormat(name);
string const old_prettyname = old ? old->prettyname() : string();
- local_formats.add(name, extension, prettyname, shortcut);
- local_formats.setViewer(name, viewer);
+ formats().add(name, extension, prettyname, shortcut, viewer, editor);
if (!old || prettyname != old_prettyname) {
UpdateBrowser();
if (old)
fl_freeze_form(dialog_->form);
- Format const & f = local_formats.get(i - 1);
+ Format const & f = 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_shrtcut, f.shortcut().c_str());
fl_set_input(dialog_->input_extension, f.extension().c_str());
fl_set_input(dialog_->input_viewer, f.viewer().c_str());
+ fl_set_input(dialog_->input_editor, f.editor().c_str());
fl_set_object_label(dialog_->button_add,
idex(_("Modify|#M")).c_str());
{
string const name = fl_get_input(dialog_->input_format);
- if (local_converters.formatIsUsed(name)) {
+ if (converters().formatIsUsed(name)) {
parent_.postWarning(_("Cannot remove a Format used by a Converter. "
"Remove the converter first."));
setEnabled(dialog_->button_delete, false);
return false;
}
- local_formats.erase(name);
+ formats().erase(name);
UpdateBrowser();
return true;
}
bool FormPreferences::Formats::Input()
{
string const name = fl_get_input(dialog_->input_format);
- int const sel = local_formats.getNumber(name);
+ int const sel = formats().getNumber(name);
fl_freeze_form(dialog_->form);
if (sel < 0) {
fl_set_input_return(dialog_->input_command_end, FL_RETURN_CHANGED);
// Store the lang identifiers for later
- vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
+ vector<LanguagePair> const langs = getLanguageData(false);
lang_ = getSecond(langs);
FL_OBJECT * obj = dialog_->combox_default_lang;
- vector<frnt::LanguagePair>::const_iterator lit = langs.begin();
- vector<frnt::LanguagePair>::const_iterator lend = langs.end();
+ vector<LanguagePair>::const_iterator lit = langs.begin();
+ vector<LanguagePair>::const_iterator lend = langs.end();
for (; lit != lend; ++lit) {
fl_addto_combox(obj, lit->first.c_str());
}
fl_get_button(dialog_->check_cursor_follows_scrollbar);
rc.dialogs_iconify_with_main =
fl_get_button(dialog_->check_dialogs_iconify_with_main);
- rc.preview = fl_get_button(dialog_->check_preview_latex);
+
+ switch (fl_get_choice(dialog_->choice_instant_preview)) {
+ case 1:
+ rc.preview = LyXRC::PREVIEW_OFF;
+ break;
+ case 2:
+ rc.preview = LyXRC::PREVIEW_NO_MATH;
+ break;
+ case 3:
+ rc.preview = LyXRC::PREVIEW_ON;
+ break;
+ }
+
rc.autosave = static_cast<unsigned int>
(fl_get_counter_value(dialog_->counter_autosave));
rc.wheel_jump = static_cast<unsigned int>
(fl_get_counter_value(dialog_->counter_wm_jump));
// See FIXME below
- // grfx::DisplayType old_value = rc.display_graphics;
- switch (fl_get_choice(dialog_->choice_display)) {
+ // graphics::DisplayType old_value = rc.display_graphics;
+ switch (fl_get_choice(dialog_->choice_graphics_display)) {
case 4:
- rc.display_graphics = grfx::NoDisplay;
+ rc.display_graphics = graphics::NoDisplay;
break;
case 3:
- rc.display_graphics = grfx::ColorDisplay;
+ rc.display_graphics = graphics::ColorDisplay;
break;
case 2:
- rc.display_graphics = grfx::GrayscaleDisplay;
+ rc.display_graphics = graphics::GrayscaleDisplay;
break;
case 1:
- rc.display_graphics = grfx::MonochromeDisplay;
+ rc.display_graphics = graphics::MonochromeDisplay;
break;
default:
- rc.display_graphics = grfx::ColorDisplay;
+ rc.display_graphics = graphics::ColorDisplay;
break;
}
#endif
#if 0
if (old_value != rc.display_graphics) {
- grfx::GCache & gc = grfx::GCache::get();
+ graphics::GCache & gc = graphics::GCache::get();
gc.changeDisplay();
}
#endif
setPrehandler(dialog_->counter_autosave);
setPrehandler(dialog_->check_cursor_follows_scrollbar);
setPrehandler(dialog_->check_dialogs_iconify_with_main);
- setPrehandler(dialog_->check_preview_latex);
+ setPrehandler(dialog_->choice_instant_preview);
setPrehandler(dialog_->counter_wm_jump);
- fl_addto_choice(dialog_->choice_display,
+ fl_addto_choice(dialog_->choice_graphics_display,
_("Monochrome|Grayscale|Color|Do not display").c_str());
+
+ fl_addto_choice(dialog_->choice_instant_preview,
+ _("Off|No math|On").c_str());
}
return LyXRC::getDescription(LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR);
if (ob == dialog_->check_dialogs_iconify_with_main)
return LyXRC::getDescription(LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN);
- if (ob == dialog_->check_preview_latex)
+ if (ob == dialog_->choice_instant_preview)
return LyXRC::getDescription(LyXRC::RC_PREVIEW);
if (ob == dialog_->counter_autosave)
return LyXRC::getDescription(LyXRC::RC_AUTOSAVE);
if (ob == dialog_->counter_wm_jump)
return LyXRC::getDescription(LyXRC::RC_WHEEL_JUMP);
- if (ob == dialog_->choice_display)
+ if (ob == dialog_->choice_graphics_display)
return LyXRC::getDescription(LyXRC::RC_DISPLAY_GRAPHICS);
return string();
}
rc.cursor_follows_scrollbar);
fl_set_button(dialog_->check_dialogs_iconify_with_main,
rc.dialogs_iconify_with_main);
- fl_set_button(dialog_->check_preview_latex,
- rc.preview);
+
+ switch (rc.preview) {
+ case LyXRC::PREVIEW_OFF:
+ fl_set_choice(dialog_->choice_instant_preview, 1);
+ break;
+ case LyXRC::PREVIEW_NO_MATH:
+ fl_set_choice(dialog_->choice_instant_preview, 2);
+ break;
+ case LyXRC::PREVIEW_ON:
+ fl_set_choice(dialog_->choice_instant_preview, 3);
+ break;
+ }
+
fl_set_counter_value(dialog_->counter_autosave, rc.autosave);
fl_set_counter_value(dialog_->counter_wm_jump, rc.wheel_jump);
switch (rc.display_graphics) {
- case grfx::NoDisplay:
- fl_set_choice(dialog_->choice_display, 4);
+ case graphics::NoDisplay:
+ fl_set_choice(dialog_->choice_graphics_display, 4);
break;
- case grfx::ColorDisplay:
- fl_set_choice(dialog_->choice_display, 3);
+ case graphics::ColorDisplay:
+ fl_set_choice(dialog_->choice_graphics_display, 3);
break;
- case grfx::GrayscaleDisplay:
- fl_set_choice(dialog_->choice_display, 2);
+ case graphics::GrayscaleDisplay:
+ fl_set_choice(dialog_->choice_graphics_display, 2);
break;
- case grfx::MonochromeDisplay:
- fl_set_choice(dialog_->choice_display, 1);
+ case graphics::MonochromeDisplay:
+ fl_set_choice(dialog_->choice_graphics_display, 1);
break;
default:
- fl_set_choice(dialog_->choice_display, 3);
+ fl_set_choice(dialog_->choice_graphics_display, 3);
break;
}
}
int const choice =
fl_get_choice(dialog_->choice_default_papersize) - 1;
- rc.default_papersize = static_cast<BufferParams::PAPER_SIZE>(choice);
+ rc.default_papersize = static_cast<PAPER_SIZE>(choice);
rc.ascii_roff_command = fl_get_input(dialog_->input_ascii_roff);
rc.chktex_command = fl_get_input(dialog_->input_checktex);
+ rc.bibtex_command = fl_get_input(dialog_->input_bibtex);
+ rc.index_command = fl_get_input(dialog_->input_index);
rc.view_dvi_paper_option = fl_get_input(dialog_->input_paperoption);
rc.auto_reset_options = fl_get_button(dialog_->check_autoreset_classopt);
}
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_bibtex, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_checktex, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_index, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_paperoption, FL_RETURN_CHANGED);
fl_addto_choice(dialog_->choice_default_papersize,
setPrehandler(dialog_->input_tex_encoding);
setPrehandler(dialog_->choice_default_papersize);
setPrehandler(dialog_->input_ascii_roff);
+ setPrehandler(dialog_->input_bibtex);
setPrehandler(dialog_->input_checktex);
+ setPrehandler(dialog_->input_index);
setPrehandler(dialog_->input_paperoption);
setPrehandler(dialog_->check_autoreset_classopt);
}
return LyXRC::getDescription(LyXRC::RC_FONT_ENCODING);
if (ob == dialog_->input_ascii_roff)
return LyXRC::getDescription(LyXRC::RC_ASCIIROFF_COMMAND);
+ if (ob == dialog_->input_bibtex)
+ return LyXRC::getDescription(LyXRC::RC_BIBTEX_COMMAND);
if (ob == dialog_->input_checktex)
return LyXRC::getDescription(LyXRC::RC_CHKTEX_COMMAND);
+ if (ob == dialog_->input_index)
+ return LyXRC::getDescription(LyXRC::RC_INDEX_COMMAND);
if (ob == dialog_->choice_default_papersize)
return LyXRC::getDescription(LyXRC::RC_DEFAULT_PAPERSIZE);
if (ob == dialog_->input_paperoption)
rc.ascii_roff_command.c_str());
fl_set_input(dialog_->input_checktex,
rc.chktex_command.c_str());
+ fl_set_input(dialog_->input_bibtex,
+ rc.bibtex_command.c_str());
+ fl_set_input(dialog_->input_index,
+ rc.index_command.c_str());
fl_set_input(dialog_->input_paperoption,
rc.view_dvi_paper_option.c_str());
fl_set_button(dialog_->check_autoreset_classopt,
{
rc.document_path = fl_get_input(dialog_->input_default_path);
rc.template_path = fl_get_input(dialog_->input_template_path);
+ rc.tempdir_path = fl_get_input(dialog_->input_temp_dir);
- int button = fl_get_button(dialog_->check_use_temp_dir);
- string str = fl_get_input(dialog_->input_temp_dir);
- if (!button)
- str.erase();
-
- rc.use_tempdir = button;
- rc.tempdir_path = str;
-
- button = fl_get_button(dialog_->check_last_files);
- str = fl_get_input(dialog_->input_lastfiles);
+ int button = fl_get_button(dialog_->check_last_files);
+ string str = fl_get_input(dialog_->input_lastfiles);
if (!button) str.erase();
rc.check_lastfiles = button;
fl_set_input_return(dialog_->input_temp_dir, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_lastfiles, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_backup_path, FL_RETURN_CHANGED);
+ fl_set_counter_bounds(dialog_->counter_lastfiles, 0, maxlastfiles);
fl_set_counter_return(dialog_->counter_lastfiles, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_serverpipe, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_backup_path);
setPrehandler(dialog_->input_serverpipe);
setPrehandler(dialog_->input_temp_dir);
- setPrehandler(dialog_->check_use_temp_dir);
}
return LyXRC::getDescription(LyXRC::RC_DOCUMENTPATH);
if (ob == dialog_->input_template_path)
return LyXRC::getDescription(LyXRC::RC_TEMPLATEPATH);
- if (ob == dialog_->check_use_temp_dir)
- return LyXRC::getDescription(LyXRC::RC_USETEMPDIR);
if (ob == dialog_->input_temp_dir)
return LyXRC::getDescription(LyXRC::RC_TEMPDIRPATH);
if (ob == dialog_->check_last_files)
// !ob if function is called from Paths::update() to de/activate
// objects,
// otherwise the function is called by an xforms CB via input().
- if (!ob || ob == dialog_->check_use_temp_dir) {
- bool const enable = fl_get_button(dialog_->check_use_temp_dir);
- setEnabled(dialog_->input_temp_dir, enable);
- }
-
if (!ob || ob == dialog_->check_last_files) {
bool const enable = fl_get_button(dialog_->check_last_files);
setEnabled(dialog_->input_lastfiles, enable);
rc.make_backup);
fl_set_input(dialog_->input_backup_path, str.c_str());
- str.erase();
- if (rc.use_tempdir)
- str = rc.tempdir_path;
-
- fl_set_button(dialog_->check_use_temp_dir,
- rc.use_tempdir);
- fl_set_input(dialog_->input_temp_dir, str.c_str());
+ fl_set_input(dialog_->input_temp_dir, rc.tempdir_path.c_str());
str.erase();
if (rc.check_lastfiles)
// buttons.
input(0);
}
+
+} // namespace frontend
+} // namespace lyx
projects / lyx.git / blobdiff