Hello community,
here is the log from the commit of package qterminal for openSUSE:Factory
checked in at 2020-11-17 21:23:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qterminal (Old)
and /work/SRC/openSUSE:Factory/.qterminal.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qterminal"
Tue Nov 17 21:23:44 2020 rev:12 rq:848668 version:0.16.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qterminal/qterminal.changes 2020-11-04
18:32:47.604094351 +0100
+++ /work/SRC/openSUSE:Factory/.qterminal.new.24930/qterminal.changes
2020-11-17 21:23:48.193289590 +0100
@@ -1,0 +2,7 @@
+Sun Nov 15 07:42:39 UTC 2020 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.16.1:
+ * Fixed a regression in the layout of Terminal settings dialog.
+ * Fixed translation of shortcuts (in Terminal settings dialog).
+
+-------------------------------------------------------------------
Old:
----
qterminal-0.16.0.tar.xz
qterminal-0.16.0.tar.xz.asc
New:
----
qterminal-0.16.1.tar.xz
qterminal-0.16.1.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qterminal.spec ++++++
--- /var/tmp/diff_new_pack.PVsB1u/_old 2020-11-17 21:23:48.705290098 +0100
+++ /var/tmp/diff_new_pack.PVsB1u/_new 2020-11-17 21:23:48.705290098 +0100
@@ -17,7 +17,7 @@
Name: qterminal
-Version: 0.16.0
+Version: 0.16.1
Release: 0
Summary: A Qt-based terminal emulator
License: GPL-2.0-only
++++++ qterminal-0.16.0.tar.xz -> qterminal-0.16.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/CHANGELOG
new/qterminal-0.16.1/CHANGELOG
--- old/qterminal-0.16.0/CHANGELOG 2020-11-01 12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/CHANGELOG 2020-11-14 10:11:34.000000000 +0100
@@ -1,3 +1,8 @@
+qterminal-0.16.1 / 2020-11-14
+=============================
+ * Fixed a mistake in the layout of Terminal settings dialog.
+ * Fixed translation of shortcuts (in Terminal settings dialog).
+
qterminal-0.16.0 / 2020-11-01
=============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/CMakeLists.txt
new/qterminal-0.16.1/CMakeLists.txt
--- old/qterminal-0.16.0/CMakeLists.txt 2020-11-01 12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/CMakeLists.txt 2020-11-14 10:11:34.000000000 +0100
@@ -9,7 +9,7 @@
include(GNUInstallDirs)
# qterminal version
-set(QTERMINAL_VERSION "0.16.0")
+set(QTERMINAL_VERSION "0.16.1")
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files"
OFF)
@@ -21,7 +21,7 @@
# Minimum Versions
set(LXQTBT_MINIMUM_VERSION "0.8.0")
-set(QTERMWIDGET_MINIMUM_VERSION "0.16.0")
+set(QTERMWIDGET_MINIMUM_VERSION "0.16.1")
set(QT_MINIMUM_VERSION "5.12.0")
find_package(Qt5Gui ${QT_MINIMUM_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/forms/propertiesdialog.ui
new/qterminal-0.16.1/src/forms/propertiesdialog.ui
--- old/qterminal-0.16.0/src/forms/propertiesdialog.ui 2020-11-01
12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/src/forms/propertiesdialog.ui 2020-11-14
10:11:34.000000000 +0100
@@ -279,7 +279,7 @@
</property>
</widget>
</item>
- <item row="21" column="1">
+ <item row="22" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="backgroundImageLineEdit"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/main.cpp
new/qterminal-0.16.1/src/main.cpp
--- old/qterminal-0.16.0/src/main.cpp 2020-11-01 12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/src/main.cpp 2020-11-14 10:11:34.000000000 +0100
@@ -176,8 +176,14 @@
QIcon::setThemeName(QStringLiteral("QTerminal"));
// translations
- QString fname =
QString::fromLatin1("qterminal_%1.qm").arg(QLocale::system().name().left(5));
+
+ // install the translations built-into Qt itself
+ QTranslator qtTranslator;
+ qtTranslator.load(QStringLiteral("qt_") + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ app->installTranslator(&qtTranslator);
+
QTranslator translator;
+ QString fname =
QString::fromLatin1("qterminal_%1.qm").arg(QLocale::system().name().left(5));
#ifdef TRANSLATIONS_DIR
//qDebug() << "TRANSLATIONS_DIR: Loading translation file" << fname <<
"from dir" << TRANSLATIONS_DIR;
/*qDebug() << "load success:" <<*/ translator.load(fname,
QString::fromUtf8(TRANSLATIONS_DIR), QStringLiteral("_"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/mainwindow.cpp
new/qterminal-0.16.1/src/mainwindow.cpp
--- old/qterminal-0.16.0/src/mainwindow.cpp 2020-11-01 12:08:36.000000000
+0100
+++ new/qterminal-0.16.1/src/mainwindow.cpp 2020-11-14 10:11:34.000000000
+0100
@@ -687,8 +687,7 @@
for (auto& action : menuBarActions)
{
QString txt = action->text();
-
txt.remove(QRegularExpression(QStringLiteral("\\s*\\(&[a-zA-Z0-9]\\)\\s*")));
// Chinese and Japanese
- txt.remove(QLatin1Char('&')); // other languages
+ Properties::removeAccelerator(txt);
action->setText(txt);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/properties.cpp
new/qterminal-0.16.1/src/properties.cpp
--- old/qterminal-0.16.0/src/properties.cpp 2020-11-01 12:08:36.000000000
+0100
+++ new/qterminal-0.16.1/src/properties.cpp 2020-11-14 10:11:34.000000000
+0100
@@ -370,3 +370,11 @@
settings.setValue(QLatin1String("version"), currentVersion);
}
+void Properties::removeAccelerator(QString& str)
+{
+ // Chinese, Japanese,...
+
str.remove(QRegularExpression(QStringLiteral("\\s*\\(&[a-zA-Z0-9]\\)\\s*")));
+ // other languages
+ str.remove(QLatin1Char('&'));
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/properties.h
new/qterminal-0.16.1/src/properties.h
--- old/qterminal-0.16.0/src/properties.h 2020-11-01 12:08:36.000000000
+0100
+++ new/qterminal-0.16.1/src/properties.h 2020-11-14 10:11:34.000000000
+0100
@@ -41,6 +41,8 @@
void loadSettings();
void migrate_settings();
+ static void removeAccelerator(QString& str);
+
QSize mainWindowSize;
QSize fixedWindowSize;
QSize prefDialogSize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/propertiesdialog.cpp
new/qterminal-0.16.1/src/propertiesdialog.cpp
--- old/qterminal-0.16.0/src/propertiesdialog.cpp 2020-11-01
12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/src/propertiesdialog.cpp 2020-11-14
10:11:34.000000000 +0100
@@ -30,6 +30,14 @@
#include "config.h"
#include "qterminalapp.h"
+void KeySequenceEdit::keyPressEvent(QKeyEvent* event)
+{
+ // by not allowing multiple shortcuts,
+ // the Qt bug that makes Meta a non-modifier is worked around
+ clear();
+ QKeySequenceEdit::keyPressEvent(event);
+}
+
Delegate::Delegate (QObject *parent)
: QStyledItemDelegate (parent)
{
@@ -392,7 +400,9 @@
QAction *keyAction = actions[keyValue];
QTableWidgetItem *item = nullptr;
- auto items =
shortcutsWidget->findItems(tr(keyValue.toStdString().c_str()),
Qt::MatchExactly);
+ QString txt = keyAction->text();
+ Properties::removeAccelerator(txt);
+ auto items = shortcutsWidget->findItems(txt, Qt::MatchExactly);
if (!items.isEmpty())
item = shortcutsWidget->item(shortcutsWidget->row(items.at(0)), 1);
if (item == nullptr)
@@ -401,7 +411,7 @@
QList<QKeySequence> shortcuts;
const auto sequences = item->text().split(QLatin1Char('|'));
for (const QString& sequenceString : sequences)
- shortcuts.append(QKeySequence(sequenceString));
+ shortcuts.append(QKeySequence(sequenceString,
QKeySequence::NativeText));
keyAction->setShortcuts(shortcuts);
}
Properties::Instance()->saveSettings();
@@ -409,6 +419,8 @@
void PropertiesDialog::setupShortcuts()
{
+ shortcutsWidget->setSortingEnabled(false);
+
QMap<QString, QAction*> actions =
QTerminalApp::Instance()->getWindowList()[0]->leaseActions();
QList< QString > shortcutKeys = actions.keys();
int shortcutCount = shortcutKeys.count();
@@ -423,9 +435,11 @@
const auto shortcuts = keyAction->shortcuts();
for (const QKeySequence &shortcut : shortcuts)
- sequenceStrings.append(shortcut.toString());
+
sequenceStrings.append(shortcut.toString(QKeySequence::NativeText));
- QTableWidgetItem *itemName = new QTableWidgetItem(
tr(keyValue.toStdString().c_str()) );
+ QString txt = keyAction->text();
+ Properties::removeAccelerator(txt);
+ QTableWidgetItem *itemName = new QTableWidgetItem(txt);
QTableWidgetItem *itemShortcut = new QTableWidgetItem(
sequenceStrings.join(QLatin1Char('|')) );
itemName->setFlags( itemName->flags() & ~Qt::ItemIsEditable &
~Qt::ItemIsSelectable );
@@ -436,6 +450,8 @@
shortcutsWidget->resizeColumnsToContents();
+ shortcutsWidget->setSortingEnabled(true);
+
// No shortcut validation is needed with QKeySequenceEdit.
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/propertiesdialog.h
new/qterminal-0.16.1/src/propertiesdialog.h
--- old/qterminal-0.16.0/src/propertiesdialog.h 2020-11-01 12:08:36.000000000
+0100
+++ new/qterminal-0.16.1/src/propertiesdialog.h 2020-11-14 10:11:34.000000000
+0100
@@ -34,6 +34,9 @@
void pressKey(QKeyEvent *event) {
QKeySequenceEdit::keyPressEvent(event);
}
+
+protected:
+ void keyPressEvent(QKeyEvent* event) override;
};
class Delegate : public QStyledItemDelegate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/translations/qterminal_cs.ts
new/qterminal-0.16.1/src/translations/qterminal_cs.ts
--- old/qterminal-0.16.0/src/translations/qterminal_cs.ts 2020-11-01
12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/src/translations/qterminal_cs.ts 2020-11-14
10:11:34.000000000 +0100
@@ -163,7 +163,7 @@
<message>
<location filename="../mainwindow.cpp" line="325"/>
<source>Handle history...</source>
- <translation type="unfinished"></translation>
+ <translation>Zpracovat historii...</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="333"/>
@@ -228,7 +228,7 @@
<message>
<location filename="../mainwindow.cpp" line="385"/>
<source>&Preferences...</source>
- <translation>&Předvolby…</translation>
+ <translation>&Nastavení…</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="389"/>
@@ -310,7 +310,7 @@
<message>
<location filename="../mainwindow.cpp" line="522"/>
<source>&Keyboard Cursor Shape</source>
- <translation>Tvar textového &kurzoru</translation>
+ <translation>Tvar textového &ukazatele</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="622"/>
@@ -330,7 +330,7 @@
<message>
<location filename="../mainwindow.cpp" line="663"/>
<source>A lightweight multiplatform terminal emulator</source>
- <translation>Nenáročný multiplatformní emulátor terminálu</translation>
+ <translation>Nenáročný emulátor terminálu pro více
systémů</translation>
</message>
</context>
<context>
@@ -570,37 +570,37 @@
<message>
<location filename="../forms/propertiesdialog.ui" line="459"/>
<source>Specify whether box drawing characters should be drawn by
QTerminal internally or left to underlying font rendering libraries.</source>
- <translation type="unfinished"></translation>
+ <translation>Určete, zda mají být znaky pro kreslení rámečku kresleny
QTerminalem vnitřně nebo ponechány na podkladových knihovnách vykreslování
písem.</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="479"/>
<source>Toggles usage of bold font face for rendering intense
colors</source>
- <translation type="unfinished"></translation>
+ <translation>Přepíná použití tučného písma pro vykreslení výrazných
barev</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="482"/>
<source>Use bold font face for intense colors</source>
- <translation type="unfinished"></translation>
+ <translation>Pro výrazné barvy použít tučné písmo</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="489"/>
<source>&Hide Window Borders</source>
- <translation type="unfinished">&Skrýt okraje oken</translation>
+ <translation>&Skrýt okraje oken</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="559"/>
<source><html><head/><body><p>Which behavior
to emulate. Note that this does not have to match your operating
system.</p><p>If you are not sure, use the <span style="
font-weight:600;">default</span>
emulation.</p></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head/><body><p>Které
chování napodobit. Všimněte si, že toto nemusí odpovídat vašemu operačnímu
systému.</p><p>Pokud si nejste jisti, použijte <span
style=" font-weight:600;">default</span>
emulaci.</p></body></html></translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="581"/>
<source>This command will be run with an argument containing the file
name of a tempfile containing the scrollback history</source>
- <translation type="unfinished"></translation>
+ <translation>Tento příkaz bude spuštěn s argumentem obsahujícím název
souboru dočasného souboru obsahujícího historii posouvání</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="584"/>
<source>Handle history command</source>
- <translation type="unfinished"></translation>
+ <translation>Zpracovat příkaz pro historii</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="603"/>
@@ -616,17 +616,17 @@
<message>
<location filename="../forms/propertiesdialog.ui" line="695"/>
<source>Open new tab to the right of the active tab</source>
- <translation type="unfinished"></translation>
+ <translation>Otevřít novou kartu napravo od činné karty</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="698"/>
<source>If unchecked the new tab will be opened as the rightmost
tab</source>
- <translation type="unfinished"></translation>
+ <translation>Pokud není zaškrtnuto, nová karta se otevře jako karta
zcela vpravo</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="726"/>
<source>Close tab on middle-click</source>
- <translation type="unfinished"></translation>
+ <translation>Zavřít kartu klepnutím prostředního tlačítka
myši</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="798"/>
@@ -636,7 +636,12 @@
3. Click on a Shortcut or press Enter
To remove/disable a Shortcut, at point 2 press only a modifier (like
Shift)</source>
- <translation type="unfinished"></translation>
+ <translation>Pro upravení zkratky:
+1. Poklepejte na její klávesu
+2. Stiskněte požadovanou kombinaci a uvolněte ji
+3. Klepněte na zástupce nebo stiskněte klávesu Enter
+
+pro odebrání/zakázání zkratky, v bodě 2 stiskněte pouze modifikátor (například
Shift)</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="863"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qterminal-0.16.0/src/translations/qterminal_he.ts
new/qterminal-0.16.1/src/translations/qterminal_he.ts
--- old/qterminal-0.16.0/src/translations/qterminal_he.ts 2020-11-01
12:08:36.000000000 +0100
+++ new/qterminal-0.16.1/src/translations/qterminal_he.ts 2020-11-14
10:11:34.000000000 +0100
@@ -163,7 +163,7 @@
<message>
<location filename="../mainwindow.cpp" line="325"/>
<source>Handle history...</source>
- <translation type="unfinished"></translation>
+ <translation>טיפול בהיסטוריה…</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="333"/>
@@ -586,17 +586,17 @@
<message>
<location filename="../forms/propertiesdialog.ui" line="459"/>
<source>Specify whether box drawing characters should be drawn by
QTerminal internally or left to underlying font rendering libraries.</source>
- <translation type="unfinished"></translation>
+ <translation>לציין האם תווי ציור תיבות יצוירו פנימית ב־QTerminal או
יישארו לספריות עיבוד גופנים פנימיות.</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="479"/>
<source>Toggles usage of bold font face for rendering intense
colors</source>
- <translation type="unfinished"></translation>
+ <translation>בררת השימוש בגוף גופן מוגדר לעיבוד של צבעים
חזקים</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="482"/>
<source>Use bold font face for intense colors</source>
- <translation type="unfinished"></translation>
+ <translation>להשתמש בגוף גופן מודגש לצבעים חזקים</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="489"/>
@@ -606,17 +606,17 @@
<message>
<location filename="../forms/propertiesdialog.ui" line="559"/>
<source><html><head/><body><p>Which behavior
to emulate. Note that this does not have to match your operating
system.</p><p>If you are not sure, use the <span style="
font-weight:600;">default</span>
emulation.</p></body></html></source>
- <translation type="unfinished"></translation>
+ <translation><html><head/><body><p>איזו
התנהגות לדמות. נא לשים לב שזה לא חייבת להיות מערכת ההפעלה
שלך.</p><p>במקרה של ספק, עדיף להשתמש בהדמיית <span style="
font-weight:600;">בררת
המחדל</span>.</p></body></html></translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="581"/>
<source>This command will be run with an argument containing the file
name of a tempfile containing the scrollback history</source>
- <translation type="unfinished"></translation>
+ <translation>הפקודה הזאת תופעל עם ארגומנט שכולל את שם קובץ התבנית
שמכילה את היסטוריית הגלילה לאחור</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="584"/>
<source>Handle history command</source>
- <translation type="unfinished"></translation>
+ <translation>טיפול בפקודה history</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="603"/>
@@ -637,7 +637,7 @@
<message>
<location filename="../forms/propertiesdialog.ui" line="698"/>
<source>If unchecked the new tab will be opened as the rightmost
tab</source>
- <translation type="unfinished"></translation>
+ <translation>אם לא סומן אז הלשונית החדשה תיפתח כלשונית השמאלית
ביותר</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="726"/>
@@ -652,7 +652,12 @@
3. Click on a Shortcut or press Enter
To remove/disable a Shortcut, at point 2 press only a modifier (like
Shift)</source>
- <translation type="unfinished"></translation>
+ <translation>כדי לערוך קיצור דרך:
+1. יש ללחוץ על המקש לחיצה כפולה
+2. להקיש את צירוף המקשים הרצוי
+3. ללחוץ על קיצור דרך או על Enter
+
+כדי להסיר/להשבית קיצור דרך, בנקודה 2 ללחוץ על מקש החלפה בלבד (כגון
Shift)</translation>
</message>
<message>
<location filename="../forms/propertiesdialog.ui" line="828"/>
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
