*
* \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 "ControlPrefs.h"
#include "forms/form_preferences.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
#include "FormColorpicker.h"
-#include "Color.h"
-#include "input_validators.h"
#include "forms_gettext.h"
-#include "xforms_helpers.h"
-#include "helper_funcs.h" // getSecond
+#include "input_validators.h"
+#include "xformsBC.h"
+
+#include "controllers/helper_funcs.h" // getSecond
+#include "controllers/frnt_lang.h"
#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 "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 lyx::support::AddName;
+using lyx::support::ChangeExtension;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+using lyx::support::trim;
+using lyx::support::user_lyxdir;
using std::endl;
-using std::pair;
using std::make_pair;
using std::max;
using std::min;
-using std::vector;
-using std::setw;
-using std::setfill;
-extern string user_lyxdir;
+using std::pair;
+using std::vector;
+using std::string;
-using namespace lyx::support;
namespace {
}
-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;
// The "Save" button has been pressed.
if (controller().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);
ButtonPolicy::SMInput FormPreferences::input(FL_OBJECT * ob, long)
{
- Assert(ob);
+ BOOST_ASSERT(ob);
bool valid = true;