View Issue Details

IDProjectCategoryView StatusLast Update
0016470ScribusGeneralpublic2021-04-15 20:37
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.7.svn 
Fixed in Version1.5.7.svn 
Summary0016470: Clean up unused .ui files
DescriptionI have never encountered these interfaces when I used Scribus:
- scribus/ui/positionsetter.ui
- scribus/ui/rotationsetter.ui

I assume that they are useless. Maybe they should be removed from the source. I attached a related patch, but I think it is incomplete (I don't know what to do with translation files and Visual Studio files).
TagsNo tags attached.
PatchNo

Activities

bubu

2021-02-12 21:14

reporter  

0001-Clean-up-unused-.ui-files.patch (7,849 bytes)   
From 1b0bb44495fb1650b096736bc96dd108c702ec62 Mon Sep 17 00:00:00 2001
Message-Id: <1b0bb44495fb1650b096736bc96dd108c702ec62.1613163798.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Fri, 12 Feb 2021 22:03:03 +0100
Subject: [PATCH] Clean up unused .ui files

---
 Scribus.pro                  |   2 -
 scribus/CMakeLists.txt       |   6 --
 scribus/ui/positionsetter.ui | 125 -----------------------------------
 scribus/ui/rotationsetter.ui |  62 -----------------
 4 files changed, 195 deletions(-)

diff --git a/Scribus.pro b/Scribus.pro
index 94ab4c516..2306c6a11 100644
--- a/Scribus.pro
+++ b/Scribus.pro
@@ -1069,7 +1069,6 @@ FORMS += scribus/ui/aboutplugins.ui \
          scribus/ui/picsearchoptions.ui \
          scribus/ui/picstatus.ui \
          scribus/ui/polygonwidgetbase.ui \
-         scribus/ui/positionsetter.ui \
          scribus/ui/preferencesdialogbase.ui \
          scribus/ui/prefs_colormanagementbase.ui \
          scribus/ui/prefs_displaybase.ui \
@@ -1123,7 +1122,6 @@ FORMS += scribus/ui/aboutplugins.ui \
          scribus/ui/replaceonecolor.ui \
          scribus/ui/resourcemanagerbase.ui \
          scribus/ui/resourcemanagerlicensebase.ui \
-         scribus/ui/rotationsetter.ui \
          scribus/ui/selectobjects.ui \
          scribus/ui/shortcutwidget.ui \
          scribus/ui/smcellstylewidget.ui \
diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
index 51a4b3138..75ab8a921 100644
--- a/scribus/CMakeLists.txt
+++ b/scribus/CMakeLists.txt
@@ -72,11 +72,6 @@ endif()
 
 # We setup something like a group to gather setter related stuff
 # because it could expand into a huge amount of files at some point.
-set(SCRIBUS_ITEMSETTERS_UI_SRC
-	ui/positionsetter.ui
-	ui/rotationsetter.ui
-)
-
 set(SCRIBUS_ITEMSETTERS_CLASS
 	openpalettemanager.h
 	openpalettemodel.h
@@ -223,7 +218,6 @@ set(SCRIBUS_UI_SRC
 	ui/unicodesearch.ui
 	ui/useprintermarginsdialog.ui
 	ui/weldeditbase.ui
-#	#{SCRIBUS_ITEMSETTERS_UI_SRC}
 	${SCRIBUS_OSG_UI_SRC}
 )
 
diff --git a/scribus/ui/positionsetter.ui b/scribus/ui/positionsetter.ui
deleted file mode 100644
index 41ec19563..000000000
--- a/scribus/ui/positionsetter.ui
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PositionSetterWidget</class>
- <widget class="QWidget" name="PositionSetterWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>291</width>
-    <height>72</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout_4">
-   <item row="0" column="0">
-    <layout class="QFormLayout" name="formLayout_3">
-     <item row="0" column="0">
-      <layout class="QFormLayout" name="formLayout_2">
-       <item row="0" column="0">
-        <widget class="QLabel" name="xposLabel">
-         <property name="text">
-          <string>X-pos:</string>
-         </property>
-         <property name="buddy">
-          <cstring>xposSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="ScrSpinBox" name="xposSpinBox">
-         <property name="focusPolicy">
-          <enum>Qt::WheelFocus</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="yposLabel">
-         <property name="text">
-          <string>Y-pos:</string>
-         </property>
-         <property name="buddy">
-          <cstring>yposSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="ScrSpinBox" name="yposSpinBox"/>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout">
-         <item row="0" column="0">
-          <widget class="QLabel" name="widthLabel">
-           <property name="text">
-            <string>Width:</string>
-           </property>
-           <property name="buddy">
-            <cstring>widthSpinBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="ScrSpinBox" name="widthSpinBox"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="heightLabel">
-           <property name="text">
-            <string>Height:</string>
-           </property>
-           <property name="buddy">
-            <cstring>heightSpinBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="ScrSpinBox" name="heightSpinBox"/>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="LinkButton" name="keepFrameWHRatioButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>LinkButton</class>
-   <extends>QToolButton</extends>
-   <header>ui/linkbutton.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/scribus/ui/rotationsetter.ui b/scribus/ui/rotationsetter.ui
deleted file mode 100644
index f258f3ee1..000000000
--- a/scribus/ui/rotationsetter.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RotationWidget</class>
- <widget class="QWidget" name="RotationWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>203</width>
-    <height>39</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout_2">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="rotationLabel">
-         <property name="text">
-          <string>Rotation:</string>
-         </property>
-         <property name="buddy">
-          <cstring>rotationSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="ScrSpinBox" name="rotationSpinBox"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QPushButton" name="rot90Button">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="text">
-        <string>+90</string>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
-- 
2.27.0

bubu

2021-03-21 18:16

reporter   ~0049046

Updated patch to current trunk branch.
0001-Clean-up-unused-.ui-files-2.patch (6,705 bytes)   
From c20b4e2cfc06c62581ef148710c25ed6ab4c4988 Mon Sep 17 00:00:00 2001
Message-Id: <c20b4e2cfc06c62581ef148710c25ed6ab4c4988.1616350545.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sun, 21 Mar 2021 19:15:25 +0100
Subject: [PATCH] Clean up unused .ui files

---
 Scribus.pro                  |   1 -
 scribus/ui/positionsetter.ui | 122 -----------------------------------
 scribus/ui/rotationsetter.ui |  62 ------------------
 3 files changed, 185 deletions(-)

diff --git a/Scribus.pro b/Scribus.pro
index 7003c1248..6ba6aa795 100644
--- a/Scribus.pro
+++ b/Scribus.pro
@@ -1064,7 +1064,6 @@ FORMS += scribus/ui/aboutplugins.ui \
          scribus/ui/picsearchoptions.ui \
          scribus/ui/picstatus.ui \
          scribus/ui/polygonwidgetbase.ui \
-         scribus/ui/positionsetter.ui \
          scribus/ui/preferencesdialogbase.ui \
          scribus/ui/prefs_colormanagementbase.ui \
          scribus/ui/prefs_displaybase.ui \
diff --git a/scribus/ui/positionsetter.ui b/scribus/ui/positionsetter.ui
deleted file mode 100644
index a63027d2b..000000000
--- a/scribus/ui/positionsetter.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PositionSetterWidget</class>
- <widget class="QWidget" name="PositionSetterWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>291</width>
-    <height>72</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout_4">
-   <item row="0" column="0">
-    <layout class="QFormLayout" name="formLayout_3">
-     <item row="0" column="0">
-      <layout class="QFormLayout" name="formLayout_2">
-       <item row="0" column="0">
-        <widget class="QLabel" name="xposLabel">
-         <property name="text">
-          <string>X-pos:</string>
-         </property>
-         <property name="buddy">
-          <cstring>xposSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="ScrSpinBox" name="xposSpinBox">
-         <property name="focusPolicy">
-          <enum>Qt::WheelFocus</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="yposLabel">
-         <property name="text">
-          <string>Y-pos:</string>
-         </property>
-         <property name="buddy">
-          <cstring>yposSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="ScrSpinBox" name="yposSpinBox"/>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout">
-         <item row="0" column="0">
-          <widget class="QLabel" name="widthLabel">
-           <property name="text">
-            <string>Width:</string>
-           </property>
-           <property name="buddy">
-            <cstring>widthSpinBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="ScrSpinBox" name="widthSpinBox"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="heightLabel">
-           <property name="text">
-            <string>Height:</string>
-           </property>
-           <property name="buddy">
-            <cstring>heightSpinBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="ScrSpinBox" name="heightSpinBox"/>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="LinkButton" name="keepFrameWHRatioButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>LinkButton</class>
-   <extends>QToolButton</extends>
-   <header>ui/linkbutton.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/scribus/ui/rotationsetter.ui b/scribus/ui/rotationsetter.ui
deleted file mode 100644
index f258f3ee1..000000000
--- a/scribus/ui/rotationsetter.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RotationWidget</class>
- <widget class="QWidget" name="RotationWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>203</width>
-    <height>39</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout_2">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="rotationLabel">
-         <property name="text">
-          <string>Rotation:</string>
-         </property>
-         <property name="buddy">
-          <cstring>rotationSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="ScrSpinBox" name="rotationSpinBox"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QPushButton" name="rot90Button">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="text">
-        <string>+90</string>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
-- 
2.27.0

jghali

2021-03-24 21:18

administrator   ~0049052

Last edited: 2021-03-24 21:31

Rotationsetter.ui is in fact used by pageitemrotationsetter.h, same for positionsetter.ui which is used by pageitempositionsetter.h. So removing and rotationsetter.ui and positionsetter.ui would imply removing the files listed in the SCRIBUS_ITEMSETTERS_SRC variable in scribus\CMakeLists.txt. Not sure what we should do about these files. This is experimental code which may still have an interest.

bubu

2021-03-24 21:25

reporter   ~0049053

Jean, thanks for clarifying.

Well then let's keep them and feel free to close this ticket.

jghali

2021-03-24 21:33

administrator   ~0049054

I have asked @cbradney his opinion, waiting for his response. If he is ok with removing these files, I'll remove them. I have no particular opinion about keeping or removing them.

jghali

2021-03-26 21:15

administrator   ~0049058

So the choice was to remove them.

Issue History

Date Modified Username Field Change
2021-02-12 21:14 bubu New Issue
2021-02-12 21:14 bubu File Added: 0001-Clean-up-unused-.ui-files.patch
2021-03-21 18:16 bubu Note Added: 0049046
2021-03-21 18:16 bubu File Added: 0001-Clean-up-unused-.ui-files-2.patch
2021-03-24 21:18 jghali Note Added: 0049052
2021-03-24 21:25 bubu Note Added: 0049053
2021-03-24 21:31 jghali Note Edited: 0049052
2021-03-24 21:33 jghali Note Added: 0049054
2021-03-26 21:15 jghali Assigned To => jghali
2021-03-26 21:15 jghali Status new => resolved
2021-03-26 21:15 jghali Resolution open => fixed
2021-03-26 21:15 jghali Fixed in Version => 1.5.7.svn
2021-03-26 21:15 jghali Note Added: 0049058
2021-04-15 20:37 cbradney Status resolved => closed