From 2d221495eb6dd9b97f64c167a553a894dce5e1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Mon, 27 Nov 2017 10:46:51 +0100 Subject: [PATCH] ASCII import dialog. Use monospace font in preview widget --- .../RicPasteAsciiDataToSummaryPlotFeatureUi.cpp | 5 ++++- Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp | 2 ++ Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp index 5a2a328260..dd88b1798f 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp @@ -112,7 +112,7 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi CAF_PDM_InitFieldNoDefault(&m_cellSeparator, "CellSeparator", "Cell Separator", "", "", ""); - CAF_PDM_InitFieldNoDefault(&m_timeSeriesColumnName, "TimeColumnName", "ColumnName", "", "", ""); + CAF_PDM_InitFieldNoDefault(&m_timeSeriesColumnName, "TimeColumnName", "Selected Time Column", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_previewText, "PreviewText", "Preview Text", "", "", ""); m_previewText.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); @@ -311,6 +311,9 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::defineEditorAttribute(const caf::P if (attrib) { attrib->wrapMode = caf::PdmUiTextEditorAttribute::NoWrap; + + QFont font("Monospace", 7); + attrib->font = font; } } } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp index 7ad9d623e7..b88843a81e 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp @@ -124,6 +124,8 @@ void PdmUiTextEditor::configureAndUpdateUi(const QString& uiConfigName) m_textEdit->blockSignals(false); m_textEdit->setWordWrapMode(toQTextOptionWrapMode(leab.wrapMode)); + + m_textEdit->setFont(leab.font); } //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h index fc2087bed6..1f6b6cf1b8 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h @@ -80,6 +80,7 @@ public: TextMode textMode; bool showSaveButton; WrapMode wrapMode; + QFont font; }; //==================================================================================================