mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Port of Martin Vermeer's QNote work: fix of framed and shaded note.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14696 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f475b7bde6
commit
1004ba79f1
@ -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;
|
||||
|
||||
|
@ -33,6 +33,8 @@ QNoteDialog::QNoteDialog(QNote * form)
|
||||
connect( noteRB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) );
|
||||
connect( greyedoutRB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) );
|
||||
connect( commentRB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) );
|
||||
connect( framedRB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) );
|
||||
connect( shadedRB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) );
|
||||
}
|
||||
|
||||
|
||||
|
@ -87,6 +87,26 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="framedRB" >
|
||||
<property name="toolTip" >
|
||||
<string>Framed in box</string>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>&Framed</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="shadedRB" >
|
||||
<property name="toolTip" >
|
||||
<string>Box with shaded background</string>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>&Shaded</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
Loading…
Reference in New Issue
Block a user