0001-Clean-up-HTML-header-code-from-translation-segments.patch (8,332 bytes)
From 75371acc11abc9c3ccee0128ad048cf75a93c7b1 Mon Sep 17 00:00:00 2001
Message-Id: <75371acc11abc9c3ccee0128ad048cf75a93c7b1.1612118818.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sun, 31 Jan 2021 19:46:35 +0100
Subject: [PATCH] Clean up HTML header code from translation segments
---
scribus/plugins/imposition/impositionbase.ui | 5 +-
.../plugins/imposition/impositionplugin.cpp | 5 +-
scribus/ui/colorsandfills.cpp | 1 +
scribus/ui/colorsandfillsbase.ui | 55 ++++++++-----------
4 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/scribus/plugins/imposition/impositionbase.ui b/scribus/plugins/imposition/impositionbase.ui
index c1c69719d..bcb5e950f 100644
--- a/scribus/plugins/imposition/impositionbase.ui
+++ b/scribus/plugins/imposition/impositionbase.ui
@@ -322,10 +322,7 @@
<item>
<widget class="QLineEdit" name="inpPages" >
<property name="toolTip" >
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Separate pages with a comma, ranges with a hyphen, e.g. 1,4,9-11 to get pages 1,4,9,10,11.</p></body></html></string>
+ <string>Separate pages with a comma, ranges with a hyphen, e.g. 1,4,9-11 to get pages 1,4,9,10,11.</string>
</property>
</widget>
</item>
diff --git a/scribus/plugins/imposition/impositionplugin.cpp b/scribus/plugins/imposition/impositionplugin.cpp
index 58857b0b1..7d76d41a0 100644
--- a/scribus/plugins/imposition/impositionplugin.cpp
+++ b/scribus/plugins/imposition/impositionplugin.cpp
@@ -29,7 +29,10 @@ ImpositionPlugin::ImpositionPlugin() : ScActionPlugin()
languageChange();
}
-ImpositionPlugin::~ImpositionPlugin() {};
+ImpositionPlugin::~ImpositionPlugin() {
+ setupUi(this);
+ inpPages->setToolTip("<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\"font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">" + tr("Separate pages with a comma, ranges with a hyphen, e.g. 1,4,9-11 to get pages 1,4,9,10,11.") + "</p></body></html>");
+};
void ImpositionPlugin::languageChange()
{
diff --git a/scribus/ui/colorsandfills.cpp b/scribus/ui/colorsandfills.cpp
index 0e982a666..933ee4b9b 100644
--- a/scribus/ui/colorsandfills.cpp
+++ b/scribus/ui/colorsandfills.cpp
@@ -79,6 +79,7 @@ ColorsAndFillsDialog::ColorsAndFillsDialog(QWidget* parent, QHash<QString, VGrad
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
dataTree->setContextMenuPolicy(Qt::CustomContextMenu);
dataTree->setIconSize(QSize(60, 48));
+ dataTree->setToolTip("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\"font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;\"><table border=\"0\" style=\"-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;\"><tr><td style=\"border: none;\"><p style=\"margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">" + tr( "If color management is enabled, an exclamation mark indicates that the color may be outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks." ) + "</p></td></tr></table></body></html>");
colorItems = new QTreeWidgetItem(dataTree);
colorItems->setText(0, tr("Solid Colors"));
gradientItems = new QTreeWidgetItem(dataTree);
diff --git a/scribus/ui/colorsandfillsbase.ui b/scribus/ui/colorsandfillsbase.ui
index db4360546..00c5d8acc 100644
--- a/scribus/ui/colorsandfillsbase.ui
+++ b/scribus/ui/colorsandfillsbase.ui
@@ -17,32 +17,25 @@
<bool>false</bool>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <item>
- <widget class="QTreeWidget" name="dataTree">
+ <bool>true</bool>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <widget class="QTreeWidget" name="dataTree">
<property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If color management is enabled, an exclamation mark indicates that the color may be outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks.</p></td></tr></table></body></html></string>
+ <string>If color management is enabled, an exclamation mark indicates that the color may be outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks.</string>
</property>
<attribute name="headerVisible">
<bool>false</bool>
@@ -125,12 +118,12 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Color Sets</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
+ <string>Color Sets</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Current Color Set:</string>
</property>
</widget>
--
2.27.0
