ENH: Implement right-aligned text in QPlainTextEdit without a subclas…

…s. #2153
starviewer-medical · Apr 13, 2022 · c3edd84 · c3edd84
1 parent c14ec28
commit c3edd84
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 124 deletions.
diff --git a/starviewer/src/core/CMakeLists.txt b/starviewer/src/core/CMakeLists.txt
@@ -228,7 +228,6 @@ set(SOURCES
     qopacitytransferfunctiongraphicalview.cpp
     qopacitytransferfunctiongraphicalviewline.cpp
     qopacitytransferfunctiongraphicalviewnode.cpp
-    qplaintextedit2.cpp
     qreleasenotes.cpp
     qscreendistribution.cpp
     qscrollareawithbettersizehint.cpp

diff --git a/starviewer/src/core/q2dviewerannotationsconfigurationwidget.cpp b/starviewer/src/core/q2dviewerannotationsconfigurationwidget.cpp
@@ -23,10 +23,11 @@ Q2DViewerAnnotationsConfigurationWidget::Q2DViewerAnnotationsConfigurationWidget
 {
     setupUi(this);
 
-    m_topLeftPlainTextEdit->setAlignment(Qt::AlignLeft);
-    m_topRightPlainTextEdit->setAlignment(Qt::AlignRight);
-    m_bottomLeftPlainTextEdit->setAlignment(Qt::AlignLeft);
-    m_bottomRightPlainTextEdit->setAlignment(Qt::AlignRight);
+    // Set text right-aligned in right text edits
+    QTextOption option = m_topRightPlainTextEdit->document()->defaultTextOption();
+    option.setAlignment(Qt::AlignRight);
+    m_topRightPlainTextEdit->document()->setDefaultTextOption(option);
+    m_bottomRightPlainTextEdit->document()->setDefaultTextOption(option);
 
     m_modalityLabel->setVisible(modality != "Default");
     m_modalityLineEdit->setVisible(modality != "Default");

diff --git a/starviewer/src/core/q2dviewerannotationsconfigurationwidgetbase.ui b/starviewer/src/core/q2dviewerannotationsconfigurationwidgetbase.ui
@@ -170,28 +170,28 @@
       </layout>
      </item>
      <item row="1" column="0">
-      <widget class="udg::QPlainTextEdit2" name="m_topLeftPlainTextEdit">
+      <widget class="QPlainTextEdit" name="m_topLeftPlainTextEdit">
        <property name="lineWrapMode">
         <enum>QPlainTextEdit::NoWrap</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="udg::QPlainTextEdit2" name="m_topRightPlainTextEdit">
+      <widget class="QPlainTextEdit" name="m_topRightPlainTextEdit">
        <property name="lineWrapMode">
         <enum>QPlainTextEdit::NoWrap</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="udg::QPlainTextEdit2" name="m_bottomLeftPlainTextEdit">
+     <item row="3" column="1">
+      <widget class="QPlainTextEdit" name="m_bottomRightPlainTextEdit">
        <property name="lineWrapMode">
         <enum>QPlainTextEdit::NoWrap</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="udg::QPlainTextEdit2" name="m_bottomRightPlainTextEdit">
+     <item row="3" column="0">
+      <widget class="QPlainTextEdit" name="m_bottomLeftPlainTextEdit">
        <property name="lineWrapMode">
         <enum>QPlainTextEdit::NoWrap</enum>
        </property>
@@ -236,13 +236,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>udg::QPlainTextEdit2</class>
-   <extends>QPlainTextEdit</extends>
-   <header>qplaintextedit2.h</header>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../main/themes/starviewer/starviewer.qrc"/>
  </resources>

diff --git a/starviewer/src/core/qplaintextedit2.cpp b/starviewer/src/core/qplaintextedit2.cpp
diff --git a/starviewer/src/core/qplaintextedit2.h b/starviewer/src/core/qplaintextedit2.h