Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qtermwidget-qt5 for openSUSE:Factory
checked in at 2021-11-09 23:54:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtermwidget-qt5 (Old)
and /work/SRC/openSUSE:Factory/.qtermwidget-qt5.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtermwidget-qt5"
Tue Nov 9 23:54:31 2021 rev:9 rq:930115 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtermwidget-qt5/qtermwidget-qt5.changes
2021-04-17 00:02:16.629642516 +0200
+++
/work/SRC/openSUSE:Factory/.qtermwidget-qt5.new.1890/qtermwidget-qt5.changes
2021-11-09 23:54:51.395960150 +0100
@@ -1,0 +2,10 @@
+Mon Nov 8 10:08:12 UTC 2021 - Michael Vetter <[email protected]>
+
+- Update to 1.0.0:
+ * Bumped minimum required Qt version to 5.15.
+ * Fixed crash under (Plasma) Wayland on opening tab and splitting.
+ * Quote drag-and-drop file names.
+ * Backported CNL and CPL support from Konsole.
+ * Some code cleanup.
+
+-------------------------------------------------------------------
Old:
----
qtermwidget-0.17.0.tar.xz
qtermwidget-0.17.0.tar.xz.asc
New:
----
qtermwidget-1.0.0.tar.xz
qtermwidget-1.0.0.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtermwidget-qt5.spec ++++++
--- /var/tmp/diff_new_pack.FCmiba/_old 2021-11-09 23:54:52.175960548 +0100
+++ /var/tmp/diff_new_pack.FCmiba/_new 2021-11-09 23:54:52.179960550 +0100
@@ -27,7 +27,7 @@
code dealing with user interface parts and session management was \
removed.
Name: qtermwidget-qt5
-Version: 0.17.0
+Version: 1.0.0
Release: 0
Summary: %{pack_summ}
License: GPL-2.0-or-later
@@ -37,11 +37,11 @@
Source1:
https://github.com/lxqt/qtermwidget/releases/download/%{version}/qtermwidget-%{version}.tar.xz.asc
Source2: %{name}.keyring
BuildRequires: cmake >= 3.1.9
-BuildRequires: lxqt-build-tools-devel >= 0.9.0
+BuildRequires: lxqt-build-tools-devel >= 0.10.0
BuildRequires: pkgconfig
BuildRequires: utf8proc-devel
BuildRequires: cmake(Qt5LinguistTools)
-BuildRequires: pkgconfig(Qt5Widgets) >= 5.12
+BuildRequires: pkgconfig(Qt5Widgets) >= 5.15
%description
%{pack_desc}
++++++ qtermwidget-0.17.0.tar.xz -> qtermwidget-1.0.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/.ci/build.sh
new/qtermwidget-1.0.0/.ci/build.sh
--- old/qtermwidget-0.17.0/.ci/build.sh 2021-04-11 11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/.ci/build.sh 2021-11-05 11:18:23.000000000 +0100
@@ -3,7 +3,11 @@
source shared-ci/prepare-archlinux.sh
# See *depends in
https://github.com/archlinuxcn/repo/blob/master/archlinuxcn/qtermwidget-git/PKGBUILD
-pacman -S --noconfirm --needed git cmake lxqt-build-tools-git qt5-tools
python-pyqt5 python-sip4 sip4
+pacman -S --noconfirm --needed git cmake lxqt-build-tools-git qt5-tools
python-sip4 sip4
+
+# Use older PyQt for now as 5.15.6 does not work with SIP 4
+# https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
+pacman -U --noconfirm
https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.5-1-x86_64.pkg.tar.zst
cmake -B build -S . \
-DBUILD_EXAMPLE=ON \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/.editorconfig
new/qtermwidget-1.0.0/.editorconfig
--- old/qtermwidget-0.17.0/.editorconfig 1970-01-01 01:00:00.000000000
+0100
+++ new/qtermwidget-1.0.0/.editorconfig 2021-11-05 11:18:23.000000000 +0100
@@ -0,0 +1,5 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/CHANGELOG
new/qtermwidget-1.0.0/CHANGELOG
--- old/qtermwidget-0.17.0/CHANGELOG 2021-04-11 11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/CHANGELOG 2021-11-05 11:18:23.000000000 +0100
@@ -1,3 +1,15 @@
+qtermwidget-1.0.0 / 2021-11-04
+===============================
+ * Bumped minimum required Qt version to 5.15.
+ * Fixed crash under (Plasma) Wayland on opening tab and splitting.
+ * Use "empty()" to check for container emptiness.
+ * Made some member functions const.
+ * Quote drag-and-drop file names.
+ * Backported CNL and CPL support from Konsole.
+ * Use QRandomGenerator instead of qrand().
+ * Silenced some compilation warnings.
+ * Basic EditorConfig definition.
+
qtermwidget-0.17.0 / 2021-04-15
===============================
* Drop support for KDE3 color scheme formats.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/CMakeLists.txt
new/qtermwidget-1.0.0/CMakeLists.txt
--- old/qtermwidget-0.17.0/CMakeLists.txt 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/CMakeLists.txt 2021-11-05 11:18:23.000000000
+0100
@@ -20,8 +20,8 @@
# just change version for releases
-set(QTERMWIDGET_VERSION_MAJOR "0")
-set(QTERMWIDGET_VERSION_MINOR "17")
+set(QTERMWIDGET_VERSION_MAJOR "1")
+set(QTERMWIDGET_VERSION_MINOR "0")
set(QTERMWIDGET_VERSION_PATCH "0")
set(QTERMWIDGET_VERSION
"${QTERMWIDGET_VERSION_MAJOR}.${QTERMWIDGET_VERSION_MINOR}.${QTERMWIDGET_VERSION_PATCH}")
@@ -31,8 +31,8 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Minimum Versions
-set(QT_MINIMUM_VERSION "5.12.0")
-set(LXQTBT_MINIMUM_VERSION "0.9.0")
+set(QT_MINIMUM_VERSION "5.15.0")
+set(LXQTBT_MINIMUM_VERSION "0.10.0")
find_package(Qt5Widgets "${QT_MINIMUM_VERSION}" REQUIRED)
find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/ColorScheme.cpp
new/qtermwidget-1.0.0/lib/ColorScheme.cpp
--- old/qtermwidget-0.17.0/lib/ColorScheme.cpp 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/ColorScheme.cpp 2021-11-05 11:18:23.000000000
+0100
@@ -31,6 +31,7 @@
#include <QSettings>
#include <QDir>
#include <QRegularExpression>
+#include <QRandomGenerator>
// KDE
@@ -175,25 +176,21 @@
_table[index] = entry;
}
-ColorEntry ColorScheme::colorEntry(int index , uint randomSeed) const
+ColorEntry ColorScheme::colorEntry(int index) const
{
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
- if ( randomSeed != 0 )
- qsrand(randomSeed);
-
ColorEntry entry = colorTable()[index];
- if ( randomSeed != 0 &&
- _randomTable != nullptr &&
+ if ( _randomTable != nullptr &&
!_randomTable[index].isNull() )
{
const RandomizationRange& range = _randomTable[index];
- int hueDifference = range.hue ? (qrand() % range.hue) - range.hue/2 :
0;
- int saturationDifference = range.saturation ? (qrand() %
range.saturation) - range.saturation/2 : 0;
- int valueDifference = range.value ? (qrand() % range.value) -
range.value/2 : 0;
+ int hueDifference = range.hue ?
QRandomGenerator::global()->bounded(range.hue) - range.hue/2 : 0;
+ int saturationDifference = range.saturation ?
QRandomGenerator::global()->bounded(range.saturation) - range.saturation/2 : 0;
+ int valueDifference = range.value ?
QRandomGenerator::global()->bounded(range.value) - range.value/2 : 0;
QColor& color = entry.color;
@@ -206,10 +203,10 @@
return entry;
}
-void ColorScheme::getColorTable(ColorEntry* table , uint randomSeed) const
+void ColorScheme::getColorTable(ColorEntry* table) const
{
for ( int i = 0 ; i < TABLE_COLORS ; i++ )
- table[i] = colorEntry(i,randomSeed);
+ table[i] = colorEntry(i);
}
bool ColorScheme::randomizedBackgroundColor() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/ColorScheme.h
new/qtermwidget-1.0.0/lib/ColorScheme.h
--- old/qtermwidget-0.17.0/lib/ColorScheme.h 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/ColorScheme.h 2021-11-05 11:18:23.000000000
+0100
@@ -87,14 +87,14 @@
* @param randomSeed Color schemes may allow certain colors in their
* palette to be randomized. The seed is used to pick the random color.
*/
- void getColorTable(ColorEntry* table, uint randomSeed = 0) const;
+ void getColorTable(ColorEntry* table) const;
/**
* Retrieves a single color entry from the table.
*
* See getColorTable()
*/
- ColorEntry colorEntry(int index , uint randomSeed = 0) const;
+ ColorEntry colorEntry(int index) const;
/**
* Convenience method. Returns the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/History.cpp
new/qtermwidget-1.0.0/lib/History.cpp
--- old/qtermwidget-0.17.0/lib/History.cpp 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/History.cpp 2021-11-05 11:18:23.000000000
+0100
@@ -401,7 +401,7 @@
dynamic_cast<HistoryTypeBuffer*>(m_histType)->m_nbLines = lineCount;
}
-int HistoryScrollBuffer::bufferIndex(int lineNumber)
+int HistoryScrollBuffer::bufferIndex(int lineNumber) const
{
Q_ASSERT( lineNumber >= 0 );
Q_ASSERT( lineNumber < _maxLineCount );
@@ -612,7 +612,7 @@
{
length=line.size();
- if (line.size() > 0) {
+ if (!line.empty()) {
formatLength=1;
int k=1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/History.h
new/qtermwidget-1.0.0/lib/History.h
--- old/qtermwidget-0.17.0/lib/History.h 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/History.h 2021-11-05 11:18:23.000000000 +0100
@@ -184,7 +184,7 @@
private:
- int bufferIndex(int lineNumber);
+ int bufferIndex(int lineNumber) const;
HistoryLine* _historyBuffer;
QBitArray _wrappedLine;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/KeyboardTranslator.cpp
new/qtermwidget-1.0.0/lib/KeyboardTranslator.cpp
--- old/qtermwidget-0.17.0/lib/KeyboardTranslator.cpp 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/KeyboardTranslator.cpp 2021-11-05
11:18:23.000000000 +0100
@@ -475,7 +475,7 @@
{
return _description;
}
-bool KeyboardTranslatorReader::hasNextEntry()
+bool KeyboardTranslatorReader::hasNextEntry() const
{
return _hasNext;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/KeyboardTranslator.h
new/qtermwidget-1.0.0/lib/KeyboardTranslator.h
--- old/qtermwidget-0.17.0/lib/KeyboardTranslator.h 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/KeyboardTranslator.h 2021-11-05
11:18:23.000000000 +0100
@@ -369,7 +369,7 @@
QString description() const;
/** Returns true if there is another entry in the source stream */
- bool hasNextEntry();
+ bool hasNextEntry() const;
/** Returns the next entry found in the source stream */
KeyboardTranslator::Entry nextEntry();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/Screen.cpp
new/qtermwidget-1.0.0/lib/Screen.cpp
--- old/qtermwidget-0.17.0/lib/Screen.cpp 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/Screen.cpp 2021-11-05 11:18:23.000000000
+0100
@@ -127,6 +127,37 @@
cuX = qMax(0,cuX-n);
}
+void Screen::cursorNextLine(int n)
+ //=CNL
+{
+ if (n == 0) {
+ n = 1; // Default
+ }
+ cuX = 0;
+ while (n > 0) {
+ if (cuY < lines - 1) {
+ cuY += 1;
+ }
+ n--;
+ }
+
+}
+
+void Screen::cursorPreviousLine(int n)
+ //=CPL
+{
+ if (n == 0) {
+ n = 1; // Default
+ }
+ cuX = 0;
+ while (n > 0) {
+ if (cuY > 0) {
+ cuY -= 1;
+ }
+ n--;
+ }
+}
+
void Screen::cursorRight(int n)
//=CUF
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/Screen.h
new/qtermwidget-1.0.0/lib/Screen.h
--- old/qtermwidget-0.17.0/lib/Screen.h 2021-04-11 11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/Screen.h 2021-11-05 11:18:23.000000000 +0100
@@ -94,6 +94,16 @@
*/
void cursorLeft(int n);
/**
+ * Moves cursor to beginning of the line by @p n lines down.
+ * The cursor will stop at the beginning of the line.
+ */
+ void cursorNextLine(int n);
+ /**
+ * Moves cursor to beginning of the line by @p n lines up.
+ * The cursor will stop at the beginning of the line.
+ */
+ void cursorPreviousLine(int n);
+ /**
* Move the cursor to the right by @p n columns.
* The cursor will stop at the right-most column.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/Session.cpp
new/qtermwidget-1.0.0/lib/Session.cpp
--- old/qtermwidget-0.17.0/lib/Session.cpp 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/Session.cpp 2021-11-05 11:18:23.000000000
+0100
@@ -143,7 +143,7 @@
return _shellProcess->state() == QProcess::Running;
}
-void Session::setCodec(QTextCodec * codec)
+void Session::setCodec(QTextCodec * codec) const
{
emulation()->setCodec(codec);
}
@@ -1034,7 +1034,7 @@
}
}
-void SessionGroup::connectPair(Session * master , Session * other)
+void SessionGroup::connectPair(Session * master , Session * other) const
{
// qDebug() << k_funcinfo;
@@ -1045,7 +1045,7 @@
SLOT(sendString(const char *,int)) );
}
}
-void SessionGroup::disconnectPair(Session * master , Session * other)
+void SessionGroup::disconnectPair(Session * master , Session * other) const
{
// qDebug() << k_funcinfo;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/Session.h
new/qtermwidget-1.0.0/lib/Session.h
--- old/qtermwidget-0.17.0/lib/Session.h 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/Session.h 2021-11-05 11:18:23.000000000 +0100
@@ -340,7 +340,7 @@
void setSize(const QSize & size);
/** Sets the text codec used by this session's terminal emulation. */
- void setCodec(QTextCodec * codec);
+ void setCodec(QTextCodec * codec) const;
/**
* Sets whether the session has a dark background or not. The session
@@ -633,8 +633,8 @@
int masterMode() const;
private:
- void connectPair(Session * master , Session * other);
- void disconnectPair(Session * master , Session * other);
+ void connectPair(Session * master , Session * other) const;
+ void disconnectPair(Session * master , Session * other) const;
void connectAll(bool connect);
QList<Session *> masters() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/TerminalCharacterDecoder.cpp
new/qtermwidget-1.0.0/lib/TerminalCharacterDecoder.cpp
--- old/qtermwidget-0.17.0/lib/TerminalCharacterDecoder.cpp 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/TerminalCharacterDecoder.cpp 2021-11-05
11:18:23.000000000 +0100
@@ -79,6 +79,16 @@
_linePositions << pos;
}
+ // check the real length
+ for (int i = 0 ; i < count ; i++)
+ {
+ if (characters + i == nullptr)
+ {
+ count = i;
+ break;
+ }
+ }
+
//TODO should we ignore or respect the LINE_WRAPPED line property?
//note: we build up a QString and send it to the text stream rather
writing into the text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/TerminalDisplay.cpp
new/qtermwidget-1.0.0/lib/TerminalDisplay.cpp
--- old/qtermwidget-0.17.0/lib/TerminalDisplay.cpp 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/TerminalDisplay.cpp 2021-11-05
11:18:23.000000000 +0100
@@ -226,14 +226,14 @@
// "Base character width on widest ASCII character. This prevents too wide
// characters in the presence of double wide (e.g. Japanese) characters."
// Get the width from representative normal width characters
- _fontWidth =
qRound((double)fm.width(QLatin1String(REPCHAR))/(double)qstrlen(REPCHAR));
+ _fontWidth =
qRound((double)fm.horizontalAdvance(QLatin1String(REPCHAR))/(double)qstrlen(REPCHAR));
_fixedFont = true;
- int fw = fm.width(QLatin1Char(REPCHAR[0]));
+ int fw = fm.horizontalAdvance(QLatin1Char(REPCHAR[0]));
for(unsigned int i=1; i< qstrlen(REPCHAR); i++)
{
- if (fw != fm.width(QLatin1Char(REPCHAR[i])))
+ if (fw != fm.horizontalAdvance(QLatin1Char(REPCHAR[i])))
{
_fixedFont = false;
break;
@@ -649,7 +649,7 @@
}
void TerminalDisplay::drawLineCharString( QPainter& painter, int x, int y,
const std::wstring& str,
- const Character* attributes)
+ const Character* attributes) const
{
const QPen& currentPen = painter.pen();
@@ -875,7 +875,7 @@
const QColor backgroundColor = style->backgroundColor.color(_colorTable);
// draw background if different from the display's background color
- if ( backgroundColor != palette().background().color() )
+ if ( backgroundColor != palette().window().color() )
drawBackground(painter,rect,backgroundColor,
false /* do not use transparency */);
@@ -1278,7 +1278,7 @@
{
const QString label = tr("Size: XXX x XXX");
_resizeWidget = new QLabel(label, this);
-
_resizeWidget->setMinimumWidth(_resizeWidget->fontMetrics().width(label));
+
_resizeWidget->setMinimumWidth(_resizeWidget->fontMetrics().horizontalAdvance(label));
_resizeWidget->setMinimumHeight(_resizeWidget->sizeHint().height());
_resizeWidget->setAlignment(Qt::AlignCenter);
@@ -1446,12 +1446,12 @@
calDrawTextAdditionHeight(paint);
}
- const auto rects = (pe->region() & cr).rects();
- for (const QRect &rect : rects)
+ const QRegion regToDraw = pe->region() & cr;
+ for (auto rect = regToDraw.begin(); rect != regToDraw.end(); rect++)
{
- drawBackground(paint,rect,palette().background().color(),
+ drawBackground(paint,*rect,palette().window().color(),
true /* use opacity setting */);
- drawContents(paint, rect);
+ drawContents(paint, *rect);
}
drawInputMethodPreeditString(paint,preeditRect());
paintFilters(paint);
@@ -1623,7 +1623,7 @@
QFontMetrics fm(font());
int result = 0;
for (int column = 0; column < length; column++) {
- result += fm.width(_image[loc(startColumn + column, line)].character);
+ result += fm.horizontalAdvance(_image[loc(startColumn + column,
line)].character);
}
return result;
}
@@ -2415,7 +2415,7 @@
}
}
-void TerminalDisplay::getCharacterPosition(const QPoint& widgetPoint,int&
line,int& column) const
+void TerminalDisplay::getCharacterPosition(const QPointF& widgetPoint,int&
line,int& column) const
{
line = (widgetPoint.y()-contentsRect().top()-_topMargin) / _fontHeight;
if (line < 0)
@@ -2553,7 +2553,7 @@
void TerminalDisplay::wheelEvent( QWheelEvent* ev )
{
- if (ev->orientation() != Qt::Vertical)
+ if (ev->angleDelta().y() == 0)
return;
// if the terminal program is not interested mouse events
@@ -2573,10 +2573,10 @@
// to get a reasonable scrolling speed, scroll by one line for every 5
degrees
// of mouse wheel rotation. Mouse wheels typically move in steps of
15 degrees,
// giving a scroll of 3 lines
- int key = ev->delta() > 0 ? Qt::Key_Up : Qt::Key_Down;
+ int key = ev->angleDelta().y() > 0 ? Qt::Key_Up : Qt::Key_Down;
- // QWheelEvent::delta() gives rotation in eighths of a degree
- int wheelDegrees = ev->delta() / 8;
+ // QWheelEvent::angleDelta().y() gives rotation in eighths of a degree
+ int wheelDegrees = ev->angleDelta().y() / 8;
int linesToScroll = abs(wheelDegrees) / 5;
QKeyEvent keyScrollEvent(QEvent::KeyPress,key,Qt::NoModifier);
@@ -2591,9 +2591,9 @@
int charLine;
int charColumn;
- getCharacterPosition( ev->pos() , charLine , charColumn );
+ getCharacterPosition( ev->position() , charLine , charColumn );
- emit mouseSignal( ev->delta() > 0 ? 4 : 5,
+ emit mouseSignal( ev->angleDelta().y() > 0 ? 4 : 5,
charColumn + 1,
charLine + 1 +_scrollBar->value() -_scrollBar->maximum()
,
0);
@@ -2791,7 +2791,7 @@
}
}
-void TerminalDisplay::bracketText(QString& text)
+void TerminalDisplay::bracketText(QString& text) const
{
if (bracketedPasteMode() && !_disabledBracketedPasteMode)
{
@@ -3203,10 +3203,9 @@
// without quoting them (this only affects paths with spaces in)
//urlText = KShell::quoteArg(urlText);
- dropText += urlText;
-
- if ( i != urls.count()-1 )
- dropText += QLatin1Char(' ');
+ QChar q(QLatin1Char('\''));
+ dropText += q + QString(urlText).replace(q, QLatin1String("'\\''")) +
q;
+ dropText += QLatin1Char(' ');
}
}
else
@@ -3224,7 +3223,7 @@
QMimeData *mimeData = new QMimeData;
mimeData->setText(QApplication::clipboard()->text(QClipboard::Selection));
dragInfo.dragObject->setMimeData(mimeData);
- dragInfo.dragObject->start(Qt::CopyAction);
+ dragInfo.dragObject->exec(Qt::CopyAction);
// Don't delete the QTextDrag object. Qt will delete it when it's done with
it.
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/TerminalDisplay.h
new/qtermwidget-1.0.0/lib/TerminalDisplay.h
--- old/qtermwidget-0.17.0/lib/TerminalDisplay.h 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/TerminalDisplay.h 2021-11-05 11:18:23.000000000
+0100
@@ -206,7 +206,7 @@
void emitSelection(bool useXselection,bool appendReturn);
/** change and wrap text corresponding to paste mode **/
- void bracketText(QString& text);
+ void bracketText(QString& text) const;
/**
* Sets the shape of the keyboard cursor. This is the cursor drawn
@@ -428,7 +428,7 @@
// maps a point on the widget to the position ( ie. line and column )
// of the character at that point.
- void getCharacterPosition(const QPoint& widgetPoint,int& line,int& column)
const;
+ void getCharacterPosition(const QPointF& widgetPoint,int& line,int&
column) const;
void disableBracketedPasteMode(bool disable) { _disabledBracketedPasteMode
= disable; }
bool bracketedPasteModeIsDisabled() const { return
_disabledBracketedPasteMode; }
@@ -672,7 +672,7 @@
const Character* style, bool
invertCharacterColor);
// draws a string of line graphics
void drawLineCharString(QPainter& painter, int x, int y,
- const std::wstring& str, const Character*
attributes);
+ const std::wstring& str, const Character*
attributes) const;
// draws the preedit string for input methods
void drawInputMethodPreeditString(QPainter& painter , const QRect& rect);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/Vt102Emulation.cpp
new/qtermwidget-1.0.0/lib/Vt102Emulation.cpp
--- old/qtermwidget-0.17.0/lib/Vt102Emulation.cpp 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/Vt102Emulation.cpp 2021-11-05
11:18:23.000000000 +0100
@@ -228,7 +228,7 @@
charClass[i] |= CTL;
for(i = 32;i < 256; ++i)
charClass[i] |= CHR;
- for(s = (quint8*)"@ABCDGHILMPSTXZbcdfry"; *s; ++s)
+ for(s = (quint8*)"@ABCDEFGHILMPSTXZbcdfry"; *s; ++s)
charClass[*s] |= CPN;
// resize = \e[8;<row>;<col>t
for(s = (quint8*)"t"; *s; ++s)
@@ -666,8 +666,8 @@
case TY_CSI_PN('B' ) : _currentScreen->cursorDown (p
); break; //VT100
case TY_CSI_PN('C' ) : _currentScreen->cursorRight (p
); break; //VT100
case TY_CSI_PN('D' ) : _currentScreen->cursorLeft (p
); break; //VT100
- case TY_CSI_PN('E' ) : /* Not implemented: cursor next p lines */
break; //VT100
- case TY_CSI_PN('F' ) : /* Not implemented: cursor preceding p lines
*/ break; //VT100
+ case TY_CSI_PN('E' ) : _currentScreen->cursorNextLine (p
); break; //VT100
+ case TY_CSI_PN('F' ) : _currentScreen->cursorPreviousLine (p
); break; //VT100
case TY_CSI_PN('G' ) : _currentScreen->setCursorX (p
); break; //LINUX
case TY_CSI_PN('H' ) : _currentScreen->setCursorYX (p,
q); break; //VT100
case TY_CSI_PN('I' ) : _currentScreen->tab (p
); break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/kpty.cpp
new/qtermwidget-1.0.0/lib/kpty.cpp
--- old/qtermwidget-0.17.0/lib/kpty.cpp 2021-04-11 11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/kpty.cpp 2021-11-05 11:18:23.000000000 +0100
@@ -338,11 +338,7 @@
qWarning()
<< "chownpty failed for device " << ptyName << "::" << d->ttyName
<< "\nThis means the communication can be eavesdropped."
-#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0))
<< Qt::endl;
-#else
- << endl;
-#endif
}
#if defined (HAVE__GETPTY) || defined (HAVE_GRANTPT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtermwidget-0.17.0/lib/qtermwidget.cpp
new/qtermwidget-1.0.0/lib/qtermwidget.cpp
--- old/qtermwidget-0.17.0/lib/qtermwidget.cpp 2021-04-11 11:44:51.000000000
+0200
+++ new/qtermwidget-1.0.0/lib/qtermwidget.cpp 2021-11-05 11:18:23.000000000
+0100
@@ -267,11 +267,7 @@
// translations
// First check $XDG_DATA_DIRS. This follows the implementation in libqtxdg
QString d = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
-#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0))
QStringList dirs = d.split(QLatin1Char(':'), Qt::SkipEmptyParts);
-#else
- QStringList dirs = d.split(QLatin1Char(':'), QString::SkipEmptyParts);
-#endif
if (dirs.isEmpty()) {
dirs.append(QString::fromLatin1("/usr/local/share"));
dirs.append(QString::fromLatin1("/usr/share"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_bg.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_bg.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_bg.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_bg.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????????? ???? ????????????????????
??????????</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????? ???? ??????, ???? ???????????? ????
?????????????????? ???????? ???????????</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????????? ???? ??????????????...</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_cs.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_cs.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_cs.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_cs.ts 2021-11-05
11:18:23.000000000 +0100
@@ -6,22 +6,22 @@
<message>
<location filename="../Session.cpp" line="454"/>
<source>Bell in session '%1'</source>
- <translation>Zvonek v sezen?? '%1'</translation>
+ <translation>Zvonek v sezen?? ???%1???</translation>
</message>
<message>
<location filename="../Session.cpp" line="606"/>
<source>Session '%1' exited with status %2.</source>
- <translation>Sezen?? '%1' ukon??eno se stavem
%2.</translation>
+ <translation>Sezen?? ???%1??? ukon??eno se stavem %2.</translation>
</message>
<message>
<location filename="../Session.cpp" line="608"/>
<source>Session '%1' crashed.</source>
- <translation>Sezen?? '%1' spadlo.</translation>
+ <translation>Sezen?? ???%1??? zhavarovalo.</translation>
</message>
<message>
<location filename="../Session.cpp" line="613"/>
<source>Session '%1' exited unexpectedly.</source>
- <translation>Sezen?? '%1' neo??ek??van??
ukon??eno.</translation>
+ <translation>Sezen?? ???%1??? neo??ek??van?? ukon??eno.</translation>
</message>
</context>
<context>
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>Vlo??it v??ce????dkov?? text</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Opravdu chcete tento text vlo??it?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>Zobrazit podrobnosti...</translation>
</message>
</context>
<context>
@@ -107,12 +107,12 @@
<message>
<location filename="../qtermwidget.cpp" line="468"/>
<source>Color Scheme Error</source>
- <translation>Chyba barevn??ho sch??matu</translation>
+ <translation>Chyba sch??ma barev</translation>
</message>
<message>
<location filename="../qtermwidget.cpp" line="469"/>
<source>Cannot load color scheme: %1</source>
- <translation>Neda???? se na????st barevn?? sch??ma: %1</translation>
+ <translation>Neda???? se na????st sch??ma barev: %1</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_da.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_da.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_da.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_da.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>Inds??t multilinjetekst</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Er du sikker p??, at du vil inds??tte
teksten?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>Vis detaljer ...</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_de.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_de.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_de.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_de.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>mehrzeiligen Text einf??gen</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Sie wollen diesen Text einf??gen?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_es.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_es.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_es.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_es.ts 2021-11-05
11:18:23.000000000 +0100
@@ -6,22 +6,22 @@
<message>
<location filename="../Session.cpp" line="454"/>
<source>Bell in session '%1'</source>
- <translation>Campana en sesi??n '%1'</translation>
+ <translation>Campana en sesi??n ??%1??</translation>
</message>
<message>
<location filename="../Session.cpp" line="606"/>
<source>Session '%1' exited with status %2.</source>
- <translation>Sesi??n '%1' ha terminado con estado
%2.</translation>
+ <translation>La sesi??n ??%1?? ha terminado con el estado
%2.</translation>
</message>
<message>
<location filename="../Session.cpp" line="608"/>
<source>Session '%1' crashed.</source>
- <translation>La sesi??n '%1' fall??.</translation>
+ <translation>Ces?? el funcionamiento de la sesi??n
??%1??.</translation>
</message>
<message>
<location filename="../Session.cpp" line="613"/>
<source>Session '%1' exited unexpectedly.</source>
- <translation>La sesi??n '%1' se cerr??
inesperadamente.</translation>
+ <translation>La sesi??n ??%1?? ha terminado
inesperadamente.</translation>
</message>
</context>
<context>
@@ -29,27 +29,27 @@
<message>
<location filename="../TerminalDisplay.cpp" line="1279"/>
<source>Size: XXX x XXX</source>
- <translation>Tama??o: XXX x XXX</translation>
+ <translation>Tama??o: XXX ?? XXX</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="1291"/>
<source>Size: %1 x %2</source>
- <translation>Tama??o: %1 x %2</translation>
+ <translation>Tama??o: %1 ?? %2</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>Pegar un texto de varias l??neas</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>??Seguro que quiere pegar el texto?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
<source><qt>Output has been <a
href="http://en.wikipedia.org/wiki/Flow_control">suspended</a>
by pressing Ctrl+S. Press <b>Ctrl+Q</b> to
resume.</qt></source>
- <translation><qt>La salida ha sido <a
href="http://en.wikipedia.org/wiki/Flow_control">suspendida</a>
al pulsar Ctrl+S. Pulse <b>Ctrl+Q</b> para
reanudarla.</qt></translation>
+ <translation><qt>La salida se ha <a
href="http://en.wikipedia.org/wiki/Flow_control">suspendido</a>
al presionar Ctrl+S. Presione <b>Ctrl+Q</b> para
reanudarla.</qt></translation>
</message>
</context>
<context>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>Mostrar los detalles???</translation>
</message>
</context>
<context>
@@ -74,12 +74,12 @@
<location filename="../ColorScheme.cpp" line="278"/>
<location filename="../ColorScheme.cpp" line="293"/>
<source>Un-named Color Scheme</source>
- <translation>Esquema de color sin nombre</translation>
+ <translation>Combinaci??n de colores sin nombre</translation>
</message>
<message>
<location filename="../ColorScheme.cpp" line="464"/>
<source>Accessible Color Scheme</source>
- <translation>Esquema de color accesible</translation>
+ <translation>Combinaci??n de colores accesible</translation>
</message>
<message>
<location filename="../Filter.cpp" line="515"/>
@@ -107,12 +107,12 @@
<message>
<location filename="../qtermwidget.cpp" line="468"/>
<source>Color Scheme Error</source>
- <translation>Error del esquema de color</translation>
+ <translation>Error de la combinaci??n de colores</translation>
</message>
<message>
<location filename="../qtermwidget.cpp" line="469"/>
<source>Cannot load color scheme: %1</source>
- <translation>No se puede cargar el esquema de color: %1</translation>
+ <translation>No se puede cargar la combinaci??n de colores:
%1</translation>
</message>
</context>
<context>
@@ -120,7 +120,7 @@
<message>
<location filename="../SearchBar.cpp" line="40"/>
<source>Match case</source>
- <translation>Distinguir may??sculas de min??sculas</translation>
+ <translation>Distinguir may??sculas y min??sculas</translation>
</message>
<message>
<location filename="../SearchBar.cpp" line="46"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_fr.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_fr.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_fr.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_fr.ts 2021-11-05
11:18:23.000000000 +0100
@@ -6,7 +6,7 @@
<message>
<location filename="../Session.cpp" line="454"/>
<source>Bell in session '%1'</source>
- <translation type="unfinished">Sonnerie dans la session
'%1'</translation>
+ <translation>Sonnerie dans la session '%1'</translation>
</message>
<message>
<location filename="../Session.cpp" line="606"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_hr.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_hr.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_hr.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_hr.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>Umetni vi??eredan tekst</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Stvarno ??eli?? umetnuti ovaj tekst?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>Prika??i detalje ???</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_hu.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_hu.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_hu.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_hu.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>T??bbsoros sz??veg beilleszt??se</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Biztosan beilleszti ezt a sz??veget?</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>R??szletek megjelen??t??se...</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_lt.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_lt.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_lt.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_lt.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>??d??ti keli?? eilu??i?? tekst??</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>Ar tikrai norite ??d??ti ???? tekst???</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>Rodyti i??samiau...</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_nl.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_nl.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_nl.ts 1970-01-01
01:00:00.000000000 +0100
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_nl.ts 2021-11-05
11:18:23.000000000 +0100
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
+<context>
+ <name>Konsole::Session</name>
+ <message>
+ <location filename="../Session.cpp" line="454"/>
+ <source>Bell in session '%1'</source>
+ <translation>Bel in sessie ???%1???</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="606"/>
+ <source>Session '%1' exited with status %2.</source>
+ <translation>Sessie ???%1??? is afgesloten met status
???%2???.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="608"/>
+ <source>Session '%1' crashed.</source>
+ <translation>Sessie ???%1??? is gecrasht.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="613"/>
+ <source>Session '%1' exited unexpectedly.</source>
+ <translation>Sessie ???%1??? is onverwachts afgebroken.</translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::TerminalDisplay</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1279"/>
+ <source>Size: XXX x XXX</source>
+ <translation>Grootte: XXX x XXX</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1291"/>
+ <source>Size: %1 x %2</source>
+ <translation>Grootte: %1x%2</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2741"/>
+ <source>Paste multiline text</source>
+ <translation>Meerregelige tekst plakken</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2742"/>
+ <source>Are you sure you want to paste this text?</source>
+ <translation>Weet u zeker dat u deze tekst wilt plakken?</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="3241"/>
+ <source><qt>Output has been <a
href="http://en.wikipedia.org/wiki/Flow_control">suspended</a>
by pressing Ctrl+S. Press <b>Ctrl+Q</b> to
resume.</qt></source>
+ <translation><qt>Door op Ctrl+S te drukken is de uitvoer <a
href="http://en.wikipedia.org/wiki/Flow_control">onderbroken</a>.
Druk op <b>Ctrl+Q</b> om te hervatten.</qt></translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::Vt102Emulation</name>
+ <message>
+ <location filename="../Vt102Emulation.cpp" line="1121"/>
+ <source>No keyboard translator available. The information needed to
convert key presses into characters to send to the terminal is missing.</source>
+ <translation>Er is geen toetsaanslagomzetting beschikbaar, waardoor
toetsaanslagen niet kunnen worden omgezet in tekens.</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2748"/>
+ <source>Show Details...</source>
+ <translation>Details tonen???</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location filename="../ColorScheme.cpp" line="278"/>
+ <location filename="../ColorScheme.cpp" line="293"/>
+ <source>Un-named Color Scheme</source>
+ <translation>Naamloos kleurenschema</translation>
+ </message>
+ <message>
+ <location filename="../ColorScheme.cpp" line="464"/>
+ <source>Accessible Color Scheme</source>
+ <translation>Toegankelijk kleurenschema</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="515"/>
+ <source>Open Link</source>
+ <translation>Link openen</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="516"/>
+ <source>Copy Link Address</source>
+ <translation>Linkadres kopi??ren</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="520"/>
+ <source>Send Email To...</source>
+ <translation>E-mail versturen naar???</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="521"/>
+ <source>Copy Email Address</source>
+ <translation>E-mailadres kopi??ren</translation>
+ </message>
+</context>
+<context>
+ <name>QTermWidget</name>
+ <message>
+ <location filename="../qtermwidget.cpp" line="468"/>
+ <source>Color Scheme Error</source>
+ <translation>Kleurenschemafout</translation>
+ </message>
+ <message>
+ <location filename="../qtermwidget.cpp" line="469"/>
+ <source>Cannot load color scheme: %1</source>
+ <translation>Het kleurenschema kan niet worden geladen:
%1</translation>
+ </message>
+</context>
+<context>
+ <name>SearchBar</name>
+ <message>
+ <location filename="../SearchBar.cpp" line="40"/>
+ <source>Match case</source>
+ <translation>Hoofdlettergevoelig</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="46"/>
+ <source>Regular expression</source>
+ <translation>Reguliere uitdrukking</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="50"/>
+ <source>Highlight all matches</source>
+ <translation>Alle overeenkomsten markeren</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="14"/>
+ <source>SearchBar</source>
+ <translation>Zoekbalk</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="20"/>
+ <source>X</source>
+ <translation>X</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="32"/>
+ <source>Find:</source>
+ <translation>Zoeken:</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="42"/>
+ <source><</source>
+ <translation><</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="54"/>
+ <source>></source>
+ <translation>></translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="66"/>
+ <source>...</source>
+ <translation>???</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_ru.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_ru.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_ru.ts 2021-04-11
11:44:51.000000000 +0200
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_ru.ts 2021-11-05
11:18:23.000000000 +0100
@@ -39,12 +39,12 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2741"/>
<source>Paste multiline text</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????? ????????????????????????????
????????????</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="2742"/>
<source>Are you sure you want to paste this text?</source>
- <translation type="unfinished"></translation>
+ <translation>???? ?????????? ???????????? ???????????????? ????????
???????????</translation>
</message>
<message>
<location filename="../TerminalDisplay.cpp" line="3241"/>
@@ -65,7 +65,7 @@
<message>
<location filename="../TerminalDisplay.cpp" line="2748"/>
<source>Show Details...</source>
- <translation type="unfinished"></translation>
+ <translation>???????????????? ??????????????????????...</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_sk.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_sk.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_sk.ts 1970-01-01
01:00:00.000000000 +0100
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_sk.ts 2021-11-05
11:18:23.000000000 +0100
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sk">
+<context>
+ <name>Konsole::Session</name>
+ <message>
+ <location filename="../Session.cpp" line="454"/>
+ <source>Bell in session '%1'</source>
+ <translation>Zvon??ek v rel??ci?? '%1'</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="606"/>
+ <source>Session '%1' exited with status %2.</source>
+ <translation>Rel??cia '%1' bola ukon??en?? so stavom
%2.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="608"/>
+ <source>Session '%1' crashed.</source>
+ <translation>Rel??cia '%1' spadla.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="613"/>
+ <source>Session '%1' exited unexpectedly.</source>
+ <translation>Rel??cia '%1' bola neo??ak??vane
ukon??en??.</translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::TerminalDisplay</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1279"/>
+ <source>Size: XXX x XXX</source>
+ <translation>Ve??kos??: XXX x XXX</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1291"/>
+ <source>Size: %1 x %2</source>
+ <translation>Ve??kos??: %1 x %2</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2741"/>
+ <source>Paste multiline text</source>
+ <translation>Prilepi?? viacriadkov?? text</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2742"/>
+ <source>Are you sure you want to paste this text?</source>
+ <translation>Prajete si prilepi?? tento text?</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="3241"/>
+ <source><qt>Output has been <a
href="http://en.wikipedia.org/wiki/Flow_control">suspended</a>
by pressing Ctrl+S. Press <b>Ctrl+Q</b> to
resume.</qt></source>
+ <translation><qt>V??stup bol <a
href="http://en.wikipedia.org/wiki/Flow_control">pozastaven??</a>
stla??en??m Ctrl+S. Stla??te<b>Ctrl+Q</b> pre op??tovn??
spustenie.</qt></translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::Vt102Emulation</name>
+ <message>
+ <location filename="../Vt102Emulation.cpp" line="1121"/>
+ <source>No keyboard translator available. The information needed to
convert key presses into characters to send to the terminal is missing.</source>
+ <translation>Preklada?? kl??vesnice nie je dostupn??. Ch??baj?? preto
inform??cie potrebn?? na prevod k??dov stla??en??ch kl??ves na znaky poslan??
na termin??l.</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2748"/>
+ <source>Show Details...</source>
+ <translation>Zobrazi?? podrobnosti...</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location filename="../ColorScheme.cpp" line="278"/>
+ <location filename="../ColorScheme.cpp" line="293"/>
+ <source>Un-named Color Scheme</source>
+ <translation>Farebn?? sch??ma bez mena</translation>
+ </message>
+ <message>
+ <location filename="../ColorScheme.cpp" line="464"/>
+ <source>Accessible Color Scheme</source>
+ <translation>Farebn?? sch??ma pre zjednodu??en?? pr??stup</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="515"/>
+ <source>Open Link</source>
+ <translation>Otvori?? odkaz</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="516"/>
+ <source>Copy Link Address</source>
+ <translation>Kop??rova?? adresu odkazu</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="520"/>
+ <source>Send Email To...</source>
+ <translation>Posla?? email na adresu...</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="521"/>
+ <source>Copy Email Address</source>
+ <translation>Kop??rova?? e-mailov?? adresu</translation>
+ </message>
+</context>
+<context>
+ <name>QTermWidget</name>
+ <message>
+ <location filename="../qtermwidget.cpp" line="468"/>
+ <source>Color Scheme Error</source>
+ <translation>Chyba vo farebnej sch??me</translation>
+ </message>
+ <message>
+ <location filename="../qtermwidget.cpp" line="469"/>
+ <source>Cannot load color scheme: %1</source>
+ <translation>Nepodarilo sa na????ta?? sch??mu: %1</translation>
+ </message>
+</context>
+<context>
+ <name>SearchBar</name>
+ <message>
+ <location filename="../SearchBar.cpp" line="40"/>
+ <source>Match case</source>
+ <translation>Rozli??ova?? ve??k?? a mal?? p??smen??</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="46"/>
+ <source>Regular expression</source>
+ <translation>Regul??rny v??raz</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="50"/>
+ <source>Highlight all matches</source>
+ <translation>Zv??razni?? v??etky zhody</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="14"/>
+ <source>SearchBar</source>
+ <translation>H??adanie</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="20"/>
+ <source>X</source>
+ <translation>X</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="32"/>
+ <source>Find:</source>
+ <translation>H??ada??:</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="42"/>
+ <source><</source>
+ <translation><</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="54"/>
+ <source>></source>
+ <translation>></translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="66"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtermwidget-0.17.0/lib/translations/qtermwidget_uk.ts
new/qtermwidget-1.0.0/lib/translations/qtermwidget_uk.ts
--- old/qtermwidget-0.17.0/lib/translations/qtermwidget_uk.ts 1970-01-01
01:00:00.000000000 +0100
+++ new/qtermwidget-1.0.0/lib/translations/qtermwidget_uk.ts 2021-11-05
11:18:23.000000000 +0100
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="uk">
+<context>
+ <name>Konsole::Session</name>
+ <message>
+ <location filename="../Session.cpp" line="454"/>
+ <source>Bell in session '%1'</source>
+ <translation>???????????? ?? ???????????? '%1'</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="606"/>
+ <source>Session '%1' exited with status %2.</source>
+ <translation>?????????? '%1' ???????????????????? ????
???????????????? %2.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="608"/>
+ <source>Session '%1' crashed.</source>
+ <translation>???????? ???????????? '%1'.</translation>
+ </message>
+ <message>
+ <location filename="../Session.cpp" line="613"/>
+ <source>Session '%1' exited unexpectedly.</source>
+ <translation>?????????? '%1' ??????????????
????????????????????.</translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::TerminalDisplay</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1279"/>
+ <source>Size: XXX x XXX</source>
+ <translation>????????????: XXX x XXX</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="1291"/>
+ <source>Size: %1 x %2</source>
+ <translation>????????????: %1 x %2</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2741"/>
+ <source>Paste multiline text</source>
+ <translation>???????????????? ????????????????????????????
??????????</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2742"/>
+ <source>Are you sure you want to paste this text?</source>
+ <translation>???? ????????????????, ???? ???????????? ????????????????
?????? ???????????</translation>
+ </message>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="3241"/>
+ <source><qt>Output has been <a
href="http://en.wikipedia.org/wiki/Flow_control">suspended</a>
by pressing Ctrl+S. Press <b>Ctrl+Q</b> to
resume.</qt></source>
+ <translation><qt>?????????????????? ???????? <a
href="http://en.wikipedia.org/wiki/Flow_control">??????????????????????</a>
?????????????????????? Ctrl+S. ?????????????????? <b>Ctrl+Q</b>
?????? ??????????????????????.</qt></translation>
+ </message>
+</context>
+<context>
+ <name>Konsole::Vt102Emulation</name>
+ <message>
+ <location filename="../Vt102Emulation.cpp" line="1121"/>
+ <source>No keyboard translator available. The information needed to
convert key presses into characters to send to the terminal is missing.</source>
+ <translation>???? ?????????????????? ????????????????????
????????????????????. ???????????????? ????????????????????,
?????????????????? ?????? ???????????????????????? ????????????????????
???????????? ?? ?????????????? ???? ???????????????????? ??
????????????????.</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <location filename="../TerminalDisplay.cpp" line="2748"/>
+ <source>Show Details...</source>
+ <translation>???????????????? ??????????????????...</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location filename="../ColorScheme.cpp" line="278"/>
+ <location filename="../ColorScheme.cpp" line="293"/>
+ <source>Un-named Color Scheme</source>
+ <translation>?????????????? ?????????? ?????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../ColorScheme.cpp" line="464"/>
+ <source>Accessible Color Scheme</source>
+ <translation>?????????????? ?????????? ?????? ?????????? ??
???????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="515"/>
+ <source>Open Link</source>
+ <translation>???????????????? ??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="516"/>
+ <source>Copy Link Address</source>
+ <translation>?????????????????? ????????????
??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="520"/>
+ <source>Send Email To...</source>
+ <translation>?????????????????? ??-????????????...</translation>
+ </message>
+ <message>
+ <location filename="../Filter.cpp" line="521"/>
+ <source>Copy Email Address</source>
+ <translation>?????????????????? ????????????
??-??????????</translation>
+ </message>
+</context>
+<context>
+ <name>QTermWidget</name>
+ <message>
+ <location filename="../qtermwidget.cpp" line="468"/>
+ <source>Color Scheme Error</source>
+ <translation>?????????????? ???????????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../qtermwidget.cpp" line="469"/>
+ <source>Cannot load color scheme: %1</source>
+ <translation>???? ?????????????? ?????????????????????? ??????????????
??????????: %1</translation>
+ </message>
+</context>
+<context>
+ <name>SearchBar</name>
+ <message>
+ <location filename="../SearchBar.cpp" line="40"/>
+ <source>Match case</source>
+ <translation>?????????????????????? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="46"/>
+ <source>Regular expression</source>
+ <translation>???????????????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.cpp" line="50"/>
+ <source>Highlight all matches</source>
+ <translation>???????????????????? ?????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="14"/>
+ <source>SearchBar</source>
+ <translation>????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="20"/>
+ <source>X</source>
+ <translation>X</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="32"/>
+ <source>Find:</source>
+ <translation>????????????:</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="42"/>
+ <source><</source>
+ <translation><</translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="54"/>
+ <source>></source>
+ <translation>></translation>
+ </message>
+ <message>
+ <location filename="../SearchBar.ui" line="66"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+</context>
+</TS>
