X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiNote.cpp;h=adbb6e7425f09bbd3893116d2cc3cc34fcbe03cc;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=457eb136cb0d2f86200dbcc93795003b0032fa59;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git

diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp
index 457eb136cb..adbb6e7425 100644
--- a/src/frontends/qt4/GuiNote.cpp
+++ b/src/frontends/qt4/GuiNote.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -17,19 +17,15 @@
 
 #include "insets/InsetNote.h"
 
-#include <QCloseEvent>
-
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
 GuiNote::GuiNote(GuiView & lv)
-	: GuiDialog(lv, "note")
+	: GuiDialog(lv, "note", qt_("Note Settings"))
 {
 	setupUi(this);
-	setViewTitle(_("Note Settings"));
 
 	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
 	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -37,8 +33,6 @@ GuiNote::GuiNote(GuiView & lv)
 	connect(noteRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(greyedoutRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(commentRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
-	connect(framedRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
-	connect(shadedRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
 	bc().setOK(okPB);
@@ -46,13 +40,6 @@ GuiNote::GuiNote(GuiView & lv)
 }
 
 
-void GuiNote::closeEvent(QCloseEvent * e)
-{
-	slotClose();
-	e->accept();
-}
-
-
 void GuiNote::change_adaptor()
 {
 	changed();
@@ -71,12 +58,6 @@ void GuiNote::updateContents()
 	case InsetNoteParams::Greyedout:
 		greyedoutRB->setChecked(true);
 		break;
-	case InsetNoteParams::Framed:
-		framedRB->setChecked(true);
-		break;
-	case InsetNoteParams::Shaded:
-		shadedRB->setChecked(true);
-		break;
 	}
 }
 
@@ -87,10 +68,6 @@ void GuiNote::applyView()
 		params_.type = InsetNoteParams::Greyedout;
 	else if (commentRB->isChecked())
 		params_.type = InsetNoteParams::Comment;
-	else if (framedRB->isChecked())
-		params_.type = InsetNoteParams::Framed;
-	else if (shadedRB->isChecked())
-		params_.type = InsetNoteParams::Shaded;
 	else
 		params_.type = InsetNoteParams::Note;
 }
@@ -98,7 +75,7 @@ void GuiNote::applyView()
 
 bool GuiNote::initialiseParams(string const & data)
 {
-	InsetNoteMailer::string2params(data, params_);
+	InsetNote::string2params(data, params_);
 	return true;
 }
 
@@ -111,7 +88,7 @@ void GuiNote::clearParams()
 
 void GuiNote::dispatchParams()
 {
-	dispatch(FuncRequest(getLfun(), InsetNoteMailer::params2string(params_)));
+	dispatch(FuncRequest(getLfun(), InsetNote::params2string(params_)));
 }
 
 
@@ -121,4 +98,4 @@ Dialog * createGuiNote(GuiView & lv) { return new GuiNote(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiNote_moc.cpp"
+#include "moc_GuiNote.cpp"