* \author Edwin Leuven
* \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
-#include <vector>
-
-
#include <config.h>
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "forms/form_character.h"
-#include "gettext.h"
-#include "helper_funcs.h"
+
#include "xforms_helpers.h"
-#include FORMS_H_LOCATION
-#include "combox.h"
+#include "xformsBC.h"
-#include "frnt_lang.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
#include "support/lstrings.h"
+#include "lyx_forms.h"
+#include "combox.h"
+
using std::vector;
-using std::find;
+using std::string;
+
+namespace lyx {
+
+using support::getStringFromVector;
+
+namespace frontend {
-using namespace frnt;
typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
FormCharacter::FormCharacter(Dialog & parent)
- : base_class(parent, _("Character Layout"), false)
+ : base_class(parent, _("Text Style"), false)
{}
activate = ButtonPolicy::SMI_VALID;
pos = fl_get_choice(dialog_->choice_bar);
- if (bar_[pos - 1] != frnt::IGNORE)
+ if (bar_[pos - 1] != IGNORE)
activate = ButtonPolicy::SMI_VALID;
pos = fl_get_choice(dialog_->choice_color);
return activate;
}
+
+} // namespace frontend
+} // namespace lyx