commit 010284dbe5eb7fca7f19214926f073db0d0d86f5
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Aug 26 11:35:12 2016 +0200
Implement proper dialog titles in InsetParamsDialogs
Fixes: #10329
---
src/frontends/qt4/FloatPlacement.h | 1 +
src/frontends/qt4/GuiBibitem.h | 1 +
src/frontends/qt4/GuiBox.h | 1 +
src/frontends/qt4/GuiBranch.h | 1 +
src/frontends/qt4/GuiERT.h | 1 +
src/frontends/qt4/GuiHSpace.h | 1 +
src/frontends/qt4/GuiHyperlink.h | 1 +
src/frontends/qt4/GuiInfo.h | 1 +
src/frontends/qt4/GuiLabel.h | 1 +
src/frontends/qt4/GuiLine.h | 1 +
src/frontends/qt4/GuiNomenclature.h | 1 +
src/frontends/qt4/GuiTabular.h | 1 +
src/frontends/qt4/GuiVSpace.h | 1 +
src/frontends/qt4/InsetParamsDialog.cpp | 2 +-
src/frontends/qt4/InsetParamsWidget.h | 5 +++++
status.22x | 2 ++
16 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt4/FloatPlacement.h
b/src/frontends/qt4/FloatPlacement.h
index 01ddb2c..c5f8dd7 100644
--- a/src/frontends/qt4/FloatPlacement.h
+++ b/src/frontends/qt4/FloatPlacement.h
@@ -35,6 +35,7 @@ public:
//@{
InsetCode insetCode() const { return FLOAT_CODE; }
FuncCode creationCode() const { return LFUN_FLOAT_INSERT; }
+ QString dialogTitle() const { return qt_("Float Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiBibitem.h b/src/frontends/qt4/GuiBibitem.h
index 17d901c..d96d7c1 100644
--- a/src/frontends/qt4/GuiBibitem.h
+++ b/src/frontends/qt4/GuiBibitem.h
@@ -33,6 +33,7 @@ private:
//@{
InsetCode insetCode() const { return BIBITEM_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Bibliography Item Settings");
}
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiBox.h b/src/frontends/qt4/GuiBox.h
index 9553350..4c32dcf 100644
--- a/src/frontends/qt4/GuiBox.h
+++ b/src/frontends/qt4/GuiBox.h
@@ -41,6 +41,7 @@ private:
//@{
InsetCode insetCode() const { return BOX_CODE; }
FuncCode creationCode() const { return LFUN_BOX_INSERT; }
+ QString dialogTitle() const { return qt_("Box Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h
index 3268397..69aaa81 100644
--- a/src/frontends/qt4/GuiBranch.h
+++ b/src/frontends/qt4/GuiBranch.h
@@ -32,6 +32,7 @@ private:
//@{
InsetCode insetCode() const { return BRANCH_CODE; }
FuncCode creationCode() const { return LFUN_BRANCH_INSERT; }
+ QString dialogTitle() const { return qt_("Branch Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiERT.h b/src/frontends/qt4/GuiERT.h
index 35ca85c..cc4caef 100644
--- a/src/frontends/qt4/GuiERT.h
+++ b/src/frontends/qt4/GuiERT.h
@@ -30,6 +30,7 @@ private:
//@{
InsetCode insetCode() const { return ERT_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("TeX Mode Inset Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiHSpace.h b/src/frontends/qt4/GuiHSpace.h
index 5b09d7a..9be11ab 100644
--- a/src/frontends/qt4/GuiHSpace.h
+++ b/src/frontends/qt4/GuiHSpace.h
@@ -36,6 +36,7 @@ private:
//@{
InsetCode insetCode() const { return math_mode_ ? MATH_SPACE_CODE :
SPACE_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Horizontal Space Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiHyperlink.h b/src/frontends/qt4/GuiHyperlink.h
index 4e31964..3f24fce 100644
--- a/src/frontends/qt4/GuiHyperlink.h
+++ b/src/frontends/qt4/GuiHyperlink.h
@@ -32,6 +32,7 @@ private:
//@{
InsetCode insetCode() const { return HYPERLINK_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Hyperlink Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiInfo.h b/src/frontends/qt4/GuiInfo.h
index 2fecdbe..f0ebfc4 100644
--- a/src/frontends/qt4/GuiInfo.h
+++ b/src/frontends/qt4/GuiInfo.h
@@ -33,6 +33,7 @@ private:
//@{
InsetCode insetCode() const { return INFO_CODE; }
FuncCode creationCode() const { return LFUN_INFO_INSERT; }
+ QString dialogTitle() const { return qt_("Info Inset Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiLabel.h b/src/frontends/qt4/GuiLabel.h
index 0b7afd2..261f145 100644
--- a/src/frontends/qt4/GuiLabel.h
+++ b/src/frontends/qt4/GuiLabel.h
@@ -32,6 +32,7 @@ private:
//@{
InsetCode insetCode() const { return LABEL_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Label Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiLine.h b/src/frontends/qt4/GuiLine.h
index a1fded8..076d544 100644
--- a/src/frontends/qt4/GuiLine.h
+++ b/src/frontends/qt4/GuiLine.h
@@ -31,6 +31,7 @@ private:
//@{
InsetCode insetCode() const { return LINE_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Line Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiNomenclature.h
b/src/frontends/qt4/GuiNomenclature.h
index 7e4c7f5..30fb2c8 100644
--- a/src/frontends/qt4/GuiNomenclature.h
+++ b/src/frontends/qt4/GuiNomenclature.h
@@ -33,6 +33,7 @@ private:
//@{
InsetCode insetCode() const { return NOMENCL_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Nomenclature Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index c19e066..20f7681 100644
--- a/src/frontends/qt4/GuiTabular.h
+++ b/src/frontends/qt4/GuiTabular.h
@@ -42,6 +42,7 @@ private:
//@{
InsetCode insetCode() const { return TABULAR_CODE; }
FuncCode creationCode() const { return LFUN_TABULAR_INSERT; }
+ QString dialogTitle() const { return qt_("Tabular Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/GuiVSpace.h b/src/frontends/qt4/GuiVSpace.h
index f26d40e..36b4fec 100644
--- a/src/frontends/qt4/GuiVSpace.h
+++ b/src/frontends/qt4/GuiVSpace.h
@@ -37,6 +37,7 @@ private:
//@{
InsetCode insetCode() const { return VSPACE_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Vertical Space Settings"); }
void paramsToDialog(Inset const *);
docstring dialogToParams() const;
bool checkWidgets(bool readonly) const;
diff --git a/src/frontends/qt4/InsetParamsDialog.cpp
b/src/frontends/qt4/InsetParamsDialog.cpp
index 81652af..44f49b5 100644
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -74,7 +74,7 @@ struct InsetParamsDialog::Private
InsetParamsDialog::InsetParamsDialog(GuiView & lv, InsetParamsWidget * widget)
: DialogView(lv, toqstr(insetName(widget->insetCode())),
- toqstr(insetName(widget->insetCode()))), d(new Private)
+ widget->dialogTitle()), d(new Private)
{
setupUi(this);
setInsetParamsWidget(widget);
diff --git a/src/frontends/qt4/InsetParamsWidget.h
b/src/frontends/qt4/InsetParamsWidget.h
index a531645..96f90d1 100644
--- a/src/frontends/qt4/InsetParamsWidget.h
+++ b/src/frontends/qt4/InsetParamsWidget.h
@@ -13,6 +13,9 @@
#define INSET_PARAMS_WIDGET_H
#include "insets/InsetCode.h"
+#include "insets/Inset.h"
+
+#include "qt_helpers.h"
#include "FuncCode.h"
@@ -58,6 +61,8 @@ public:
/// This is a base class; destructor must exist and be virtual.
virtual ~InsetParamsWidget() {}
///
+ virtual QString dialogTitle() const { return
toqstr(insetName(insetCode())); }
+ ///
virtual InsetCode insetCode() const = 0;
///
virtual FuncCode creationCode() const = 0;
diff --git a/status.22x b/status.22x
index 5a69176..55f0033 100644
--- a/status.22x
+++ b/status.22x
@@ -97,6 +97,8 @@ What's new
- Avoid to overwrite end-of-proof character with text on screen (bug
10344).
+- Use proper dialog titles in InsetParams-derived dialogs (bug 10329).
+
* INTERNALS
