Port of Martin Vermeer's QNote work: fix of framed and shaded note.

[lyx.git] / src / frontends / qt4 / QNote.C

diff --git a/src/frontends/qt4/QNote.C b/src/frontends/qt4/QNote.C
index 6d49ae2f4bae67b685dd6dbd4e590537dc4e3260..24118ad6d551913276534593fb3bc12757b6373a 100644 (file)
--- a/src/frontends/qt4/QNote.C
+++ b/src/frontends/qt4/QNote.C
@@ -46,18 +46,9 @@ void QNote::build_dialog()
 
 void QNote::update_contents()
 {
-       // FIXME: This needs fixing. Framed and Shaded is not working.
        QRadioButton * rb = 0;
 
        switch (controller().params().type) {
-       case InsetNoteParams::Framed:
-               //rb = dialog_->framedRB;
-               rb = dialog_->greyedoutRB;
-               break;
-       case InsetNoteParams::Shaded:
-               //rb = dialog_->shadedRB;
-               rb = dialog_->greyedoutRB;
-               break;
        case InsetNoteParams::Note:
                rb = dialog_->noteRB;
                break;
@@ -67,6 +58,12 @@ void QNote::update_contents()
        case InsetNoteParams::Greyedout:
                rb = dialog_->greyedoutRB;
                break;
+       case InsetNoteParams::Framed:
+               rb = dialog_->framedRB;
+               break;
+       case InsetNoteParams::Shaded:
+               rb = dialog_->shadedRB;
+               break;
        }
 
        rb->setChecked(true);
@@ -81,6 +78,10 @@ void QNote::apply()
                type = InsetNoteParams::Greyedout;
        else if (dialog_->commentRB->isChecked())
                type = InsetNoteParams::Comment;
+       else if (dialog_->framedRB->isChecked())
+               type = InsetNoteParams::Framed;
+       else if (dialog_->shadedRB->isChecked())
+               type = InsetNoteParams::Shaded;
        else
                type = InsetNoteParams::Note;