Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FormNote.C

diff --git a/src/frontends/xforms/FormNote.C b/src/frontends/xforms/FormNote.C
index aad238f512a39a943280fde2db73a7976cd5e434..00110aca241e9a3461853e265a8fbb08ac78895b 100644 (file)
--- a/src/frontends/xforms/FormNote.C
+++ b/src/frontends/xforms/FormNote.C
@@ -5,25 +5,31 @@
  *
  * \author Martin Vermeer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
-#include "xformsBC.h"
-#include "ControlNote.h"
 #include "FormNote.h"
+#include "ControlNote.h"
 #include "forms/form_note.h"
-#include "xforms_helpers.h" // formatted
-#include "lyx_forms.h"
+
+#include "Tooltips.h"
+#include "xformsBC.h"
+
 #include "insets/insetnote.h"
-#include "debug.h"
+
+#include "lyx_forms.h"
+
+using std::string;
+
+namespace lyx {
+namespace frontend {
 
 typedef FormController<ControlNote, FormView<FD_note> > base_class;
 
 FormNote::FormNote(Dialog & parent)
-       : base_class(parent, _("Note"))
+       : base_class(parent, _("LyX: Note Settings"))
 {}
 
 
@@ -31,23 +37,52 @@ void FormNote::build()
 {
        dialog_.reset(build_note(this));
 
-       fl_addto_choice(dialog_->choice_type, predefineds().c_str());
+
+       tooltips().init(dialog_->radio_note,
+                       _("LyX internal only"));
+       tooltips().init(dialog_->radio_comment,
+                       _("Export to LaTeX/Docbook but don't print"));
+       tooltips().init(dialog_->radio_greyedout,
+                       _("Print as grey text"));
 
        bcview().setOK(dialog_->button_ok);
-       bcview().setApply(dialog_->button_apply);
        bcview().setCancel(dialog_->button_cancel);
 }
 
 
 void FormNote::update()
 {
-       string type(controller().params().type);
-       fl_set_choice_text(dialog_->choice_type, type.c_str());
+       FL_OBJECT * rb = 0;
+
+       switch (controller().params().type) {
+       case InsetNoteParams::Note:
+               rb = dialog_->radio_note;
+               break;
+       case InsetNoteParams::Comment:
+               rb = dialog_->radio_comment;
+               break;
+       case InsetNoteParams::Greyedout:
+               rb = dialog_->radio_greyedout;
+               break;
+       }
+
+       fl_set_button(rb, 1);
 }
 
 
 void FormNote::apply()
 {
-       controller().params().type = fl_get_choice_text(dialog_->choice_type);
+       InsetNoteParams::Type type;
+
+       if (fl_get_button(dialog_->radio_greyedout))
+               type = InsetNoteParams::Greyedout;
+       else if (fl_get_button(dialog_->radio_comment))
+               type = InsetNoteParams::Comment;
+       else
+               type = InsetNoteParams::Note;
+
+       controller().params().type = type;
 }
 
+} // namespace frontend
+} // namespace lyx