From e33355a4d0f57a27ca50270d74b23486fd3ddf2c Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Mon, 18 Jul 2016 21:34:11 -0400 Subject: [PATCH 01/33] Add option to use the selected font's line characters Konsole has builtin code to manually write out line characters. There are certain reasons why this might not be desired. This adds a profile option to use the fonts line characters. The default is as-is today using the builtin code. BUG: 364992 (cherry picked from commit a4de3feb16df7f18559587ebf78f115d88acc022) --- src/EditProfileDialog.cpp | 9 +++++++++ src/EditProfileDialog.h | 1 + src/EditProfileDialog.ui | 10 ++++++++++ src/Profile.cpp | 2 ++ src/Profile.h | 8 ++++++++ src/TerminalDisplay.cpp | 3 ++- src/TerminalDisplay.h | 16 ++++++++++++++++ src/ViewManager.cpp | 1 + 8 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index dbc54b91..a85cd5b3 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -447,6 +447,10 @@ void EditProfileDialog::setupAppearancePage(const Profile::Ptr profile) _ui->boldIntenseButton->setChecked(profile->boldIntense()); connect(_ui->boldIntenseButton, &QCheckBox::toggled, this, &Konsole::EditProfileDialog::setBoldIntense); + + _ui->useFontLineCharactersButton->setChecked(profile->useFontLineCharacters()); + connect(_ui->useFontLineCharactersButton, &QCheckBox::toggled, this, &Konsole::EditProfileDialog::useFontLineCharacters); + _ui->enableMouseWheelZoomButton->setChecked(profile->mouseWheelZoomEnabled()); connect(_ui->enableMouseWheelZoomButton, &QCheckBox::toggled, this, &Konsole::EditProfileDialog::toggleMouseWheelZoom); } @@ -474,6 +478,11 @@ void EditProfileDialog::setBoldIntense(bool enable) preview(Profile::BoldIntense, enable); updateTempProfileProperty(Profile::BoldIntense, enable); } +void EditProfileDialog::useFontLineCharacters(bool enable) +{ + preview(Profile::UseFontLineCharacters, enable); + updateTempProfileProperty(Profile::UseFontLineCharacters, enable); +} void EditProfileDialog::toggleMouseWheelZoom(bool enable) { updateTempProfileProperty(Profile::MouseWheelZoomEnabled, enable); diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h index 64e32638..1195c140 100644 --- a/src/EditProfileDialog.h +++ b/src/EditProfileDialog.h @@ -126,6 +126,7 @@ private slots: void showAllFontsButtonWarning(bool enable); void setAntialiasText(bool enable); void setBoldIntense(bool enable); + void useFontLineCharacters(bool enable); void showFontDialog(); void newColorScheme(); void editColorScheme(); diff --git a/src/EditProfileDialog.ui b/src/EditProfileDialog.ui index 7b86c6fb..1acec377 100644 --- a/src/EditProfileDialog.ui +++ b/src/EditProfileDialog.ui @@ -613,6 +613,16 @@ + + + + Use the selected font for line characters instead of the builtin code + + + Use line characters contained in font + + + diff --git a/src/Profile.cpp b/src/Profile.cpp index c58eacd5..06fe5b1e 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -78,6 +78,7 @@ const Profile::PropertyInfo Profile::DefaultPropertyNames[] = { , { ColorScheme , "colors" , 0 , QVariant::String } , { AntiAliasFonts, "AntiAliasFonts" , APPEARANCE_GROUP , QVariant::Bool } , { BoldIntense, "BoldIntense", APPEARANCE_GROUP, QVariant::Bool } + , { UseFontLineCharacters, "UseFontLineChararacters", APPEARANCE_GROUP, QVariant::Bool } , { LineSpacing , "LineSpacing" , APPEARANCE_GROUP , QVariant::Int } // Keyboard @@ -199,6 +200,7 @@ FallbackProfile::FallbackProfile() setProperty(DefaultEncoding, QString(QTextCodec::codecForLocale()->name())); setProperty(AntiAliasFonts, true); setProperty(BoldIntense, true); + setProperty(UseFontLineCharacters, false); setProperty(WordCharacters, ":@-./_~?&=%+#"); diff --git a/src/Profile.h b/src/Profile.h index 37a0559b..de74afad 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -223,6 +223,9 @@ public: /** (bool) Whether character with intense colors should be rendered * in bold font or just in bright color. */ BoldIntense, + /** (bool) Whether to use font's line characters instead of the + * builtin code. */ + UseFontLineCharacters, /** (bool) Whether new sessions should be started in the same * directory as the currently active session. */ @@ -479,6 +482,11 @@ public: return property(Profile::BoldIntense); } + /** Convenience method for property(Profile::UseFontLineCharacters)*/ + bool useFontLineCharacters() const { + return property(Profile::UseFontLineCharacters); + } + /** Convenience method for property(Profile::StartInCurrentSessionDir) */ bool startInCurrentSessionDir() const { return property(Profile::StartInCurrentSessionDir); diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index c7fb3c64..4f28837d 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -375,6 +375,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _filterUpdateRequired(true) , _cursorShape(Enum::BlockCursor) , _antialiasText(true) + , _useFontLineCharacters(false) , _printerFriendly(false) , _sessionController(0) , _trimTrailingSpaces(false) @@ -854,7 +855,7 @@ void TerminalDisplay::drawCharacters(QPainter& painter, } // draw text - if (isLineCharString(text)) { + if (isLineCharString(text) && !_useFontLineCharacters) { drawLineCharString(painter, rect.x(), rect.y(), text, style); } else { // Force using LTR as the document layout for the terminal area, because diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h index 7f09a529..93c98abb 100644 --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -414,6 +414,21 @@ public: return _boldIntense; } + /** + * Specifies whether line characters will be displayed using font instead + * of builtin code. + * as bold. Defaults to false. + */ + void setUseFontLineCharacters(bool value) { + _useFontLineCharacters = value; + } + /** + * Returns true if font line characters will be used. + */ + bool getFontLineCharacters() const { + return _useFontLineCharacters; + } + /** * Sets whether or not the current height and width of the * terminal in lines and columns is displayed whilst the widget @@ -920,6 +935,7 @@ private: InputMethodData _inputMethodData; bool _antialiasText; // do we anti-alias or not + bool _useFontLineCharacters; bool _printerFriendly; // are we currently painting to a printer in black/white mode diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index da2ccd97..90ef863b 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -777,6 +777,7 @@ void ViewManager::applyProfileToView(TerminalDisplay* view , const Profile::Ptr // load font view->setAntialias(profile->antiAliasFonts()); view->setBoldIntense(profile->boldIntense()); + view->setUseFontLineCharacters(profile->useFontLineCharacters()); view->setVTFont(profile->font()); // set scroll-bar position From f1c3069d55ea25ab362dec27e9fff79d99cb66d7 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 19 Jul 2016 22:50:23 +0200 Subject: [PATCH 02/33] GIT_SILENT Upgrade KDE Applications version to 16.07.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d47dc69..c4b282c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 3bc54a5ac0f5bd808d067c613451ae85a3c1df10 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Jul 2016 13:37:16 +0000 Subject: [PATCH 03/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 12 ++++++++++-- desktop/konsolepart.desktop | 1 + desktop/org.kde.konsole.desktop | 1 + desktop/terminalemulator.desktop | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 9ef74810..57fe8c21 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -430,9 +430,11 @@ Action=Popup Name=Activity in Hidden Monitored Session Name[ca]=Activitat en una sessió controlada oculta Name[ca@valencia]=Activitat en una sessió controlada oculta +Name[cs]=Aktivita ve skrytém monitorovaném sezení Name[es]=Actividad en sesión oculta monitorizada Name[it]=Attività in sessione sorvegliata nascosta Name[nl]=Activiteit in een verborgen gevolgde sessie +Name[pl]=Aktywność w ukrytej monitorowanej sesji Name[pt]=Actividade em Sessão Vigiada Escondida Name[sl]=Dejavnost v skriti nadzorovani seji Name[sv]=Aktivitet i dold bevakad session @@ -442,9 +444,11 @@ Name[zh_TW]=隱藏的監控工作階段的活動 Comment=Activity detected in a hidden monitored session Comment[ca]=Activitat detectada en una sessió controlada oculta Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta +Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[it]=Attività rilevata in una sessione sorvegliata nascosta Comment[nl]=Activiteit ontdekt in een verborgen gevolgde sessie +Comment[pl]=Wykryto aktywność w ukrytej monitorowanej sesji Comment[pt]=Actividade detectada numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana dejavnost Comment[sv]=Aktivitet funnen i en dold bevakad session @@ -622,9 +626,11 @@ Action=Popup Name=Silence in Hidden Monitored Session Name[ca]=Silenci en una sessió controlada oculta Name[ca@valencia]=Silenci en una sessió controlada oculta +Name[cs]=Ticho ve skrytém monitorovaném sezení Name[es]=Silencio en sesión oculta monitorizada Name[it]=Silenzio in una sessione sorvegliata nascosta Name[nl]=Stilte in verborgen gevolgde sessie +Name[pl]=Cisza w ukrytej monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Escondida Name[sl]=Nedejavnost v skriti nadzorovani seji Name[sv]=Tystnad i dold bevakad session @@ -634,9 +640,11 @@ Name[zh_TW]=隱藏的監控工作階段的靜默 Comment=Silence detected in a hidden monitored session Comment[ca]=Silenci detectat en una sessió controlada oculta Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta +Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie +Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana nedejavnost Comment[sv]=Tystnad funnen i en dold bevakad session @@ -701,7 +709,7 @@ Name[nl]=Stilte in gevolgde sessie Name[nn]=Stille i overvaka økt Name[or]=ଯାଞ୍ଚକୃତ ଅଧିବେଶନରେ ନିରବତା Name[pa]=ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ 'ਚ ਚੁੱਪ -Name[pl]=Brak aktywności w monitorowanej sesji +Name[pl]=Cisza w monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Name[pt_BR]=Silêncio em sessão monitorada Name[ro]=Liniște în sesiunea monitorizată @@ -783,7 +791,7 @@ Comment[nl]=Stilte ontdekt in gevolgde sessie Comment[nn]=Stille oppdaga i overvaka økt Comment[or]=ଯାଞ୍ଚକୃତ ଅଧିବେଶନରେ ଚିହ୍ନଟ ହୋଇଥିବା ନିରବତା Comment[pa]=ਇੱਕ ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਚੁੱਪ ਹੋਈ -Comment[pl]=Wykryto brak aktywności w monitorowanej sesji +Comment[pl]=Wykryto ciszę w monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada Comment[pt_BR]=Silêncio detectado em uma sessão monitorada Comment[ro]=Liniște detectată într-o sesiune monitorizată diff --git a/desktop/konsolepart.desktop b/desktop/konsolepart.desktop index 86838e09..29a9ae84 100644 --- a/desktop/konsolepart.desktop +++ b/desktop/konsolepart.desktop @@ -107,6 +107,7 @@ Name[zh_TW]=終端機模擬程式 Comment=Command line access Comment[ca]=Accés a la línia d'ordres Comment[ca@valencia]=Accés a la línia d'ordes +Comment[cs]=Přístup k příkazové řádce Comment[da]=Kommandolinjetilgang Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index c6ff5526..d4beac84 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -191,6 +191,7 @@ GenericName[zh_TW]=終端機 Comment=Command line access Comment[ca]=Accés a la línia d'ordres Comment[ca@valencia]=Accés a la línia d'ordes +Comment[cs]=Přístup k příkazové řádce Comment[da]=Kommandolinjetilgang Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop index e2a0aa04..0318ca5c 100644 --- a/desktop/terminalemulator.desktop +++ b/desktop/terminalemulator.desktop @@ -98,6 +98,7 @@ Name[zh_TW]=終端機模擬程式 Comment=Command line access Comment[ca]=Accés a la línia d'ordres Comment[ca@valencia]=Accés a la línia d'ordes +Comment[cs]=Přístup k příkazové řádce Comment[da]=Kommandolinjetilgang Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών From 745790291d33057cdef8011a8df95a0dc1e61a32 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Jul 2016 13:27:24 +0000 Subject: [PATCH 04/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 57fe8c21..2ebc7e93 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -434,6 +434,7 @@ Name[cs]=Aktivita ve skrytém monitorovaném sezení Name[es]=Actividad en sesión oculta monitorizada Name[it]=Attività in sessione sorvegliata nascosta Name[nl]=Activiteit in een verborgen gevolgde sessie +Name[nn]=Aktivitet i gøymd overvaka økt Name[pl]=Aktywność w ukrytej monitorowanej sesji Name[pt]=Actividade em Sessão Vigiada Escondida Name[sl]=Dejavnost v skriti nadzorovani seji @@ -448,6 +449,7 @@ Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[it]=Attività rilevata in una sessione sorvegliata nascosta Comment[nl]=Activiteit ontdekt in een verborgen gevolgde sessie +Comment[nn]=Aktivitet oppdaga i gøymd overvaka økt Comment[pl]=Wykryto aktywność w ukrytej monitorowanej sesji Comment[pt]=Actividade detectada numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana dejavnost @@ -630,6 +632,7 @@ Name[cs]=Ticho ve skrytém monitorovaném sezení Name[es]=Silencio en sesión oculta monitorizada Name[it]=Silenzio in una sessione sorvegliata nascosta Name[nl]=Stilte in verborgen gevolgde sessie +Name[nn]=Stille i gøymd overvaka økt Name[pl]=Cisza w ukrytej monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Escondida Name[sl]=Nedejavnost v skriti nadzorovani seji @@ -644,6 +647,7 @@ Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie +Comment[nn]=Stille oppdaga i gøymd overvaka økt Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana nedejavnost From 23e8765f8dd0f65c271693afdaa6fd1c5dc93bd6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Jul 2016 13:46:27 +0000 Subject: [PATCH 05/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 2ebc7e93..ce72b1f7 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -438,6 +438,10 @@ Name[nn]=Aktivitet i gøymd overvaka økt Name[pl]=Aktywność w ukrytej monitorowanej sesji Name[pt]=Actividade em Sessão Vigiada Escondida Name[sl]=Dejavnost v skriti nadzorovani seji +Name[sr]=Активност у скривеној надгледаној сесији +Name[sr@ijekavian]=Активност у скривеној надгледаној сесији +Name[sr@ijekavianlatin]=Aktivnost u skrivenoj nadgledanoj sesiji +Name[sr@latin]=Aktivnost u skrivenoj nadgledanoj sesiji Name[sv]=Aktivitet i dold bevakad session Name[uk]=Дії у прихованому сеансі спостереження Name[x-test]=xxActivity in Hidden Monitored Sessionxx @@ -453,6 +457,10 @@ Comment[nn]=Aktivitet oppdaga i gøymd overvaka økt Comment[pl]=Wykryto aktywność w ukrytej monitorowanej sesji Comment[pt]=Actividade detectada numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana dejavnost +Comment[sr]=Уочена је активност скривеној у надгледаној сесији +Comment[sr@ijekavian]=Уочена је активност скривеној у надгледаној сесији +Comment[sr@ijekavianlatin]=Uočena je aktivnost skrivenoj u nadgledanoj sesiji +Comment[sr@latin]=Uočena je aktivnost skrivenoj u nadgledanoj sesiji Comment[sv]=Aktivitet funnen i en dold bevakad session Comment[uk]=У прихованому сеансі спостереження виявлено дії Comment[x-test]=xxActivity detected in a hidden monitored sessionxx @@ -636,6 +644,10 @@ Name[nn]=Stille i gøymd overvaka økt Name[pl]=Cisza w ukrytej monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Escondida Name[sl]=Nedejavnost v skriti nadzorovani seji +Name[sr]=Тишина у скривеној надгледаној сесији +Name[sr@ijekavian]=Тишина у скривеној надгледаној сесији +Name[sr@ijekavianlatin]=Tišina u skrivenoj nadgledanoj sesiji +Name[sr@latin]=Tišina u skrivenoj nadgledanoj sesiji Name[sv]=Tystnad i dold bevakad session Name[uk]=Тиша у прихованому сеансі спостереження Name[x-test]=xxSilence in Hidden Monitored Sessionxx @@ -651,6 +663,10 @@ Comment[nn]=Stille oppdaga i gøymd overvaka økt Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida Comment[sl]=V skriti nadzorovani seji je bila zaznana nedejavnost +Comment[sr]=Уочена је тишина скривеној у надгледаној сесији +Comment[sr@ijekavian]=Уочена је тишина скривеној у надгледаној сесији +Comment[sr@ijekavianlatin]=Uočena je tišina skrivenoj u nadgledanoj sesiji +Comment[sr@latin]=Uočena je tišina skrivenoj u nadgledanoj sesiji Comment[sv]=Tystnad funnen i en dold bevakad session Comment[uk]=У прихованому сеансі спостереження виявлено тишу Comment[x-test]=xxSilence detected in a hidden monitored sessionxx From 0c252f7760ceb7b0027936afc63956872163da81 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Jul 2016 12:32:41 +0000 Subject: [PATCH 06/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ desktop/konsolehere.desktop | 1 + desktop/konsolepart.desktop | 1 + desktop/konsolerun.desktop | 1 + desktop/org.kde.konsole.desktop | 2 ++ desktop/terminalemulator.desktop | 1 + 6 files changed, 10 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index ce72b1f7..8dcf1aec 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -432,6 +432,7 @@ Name[ca]=Activitat en una sessió controlada oculta Name[ca@valencia]=Activitat en una sessió controlada oculta Name[cs]=Aktivita ve skrytém monitorovaném sezení Name[es]=Actividad en sesión oculta monitorizada +Name[et]=Aktiivsus peidetud jälgitavas seansis Name[it]=Attività in sessione sorvegliata nascosta Name[nl]=Activiteit in een verborgen gevolgde sessie Name[nn]=Aktivitet i gøymd overvaka økt @@ -451,6 +452,7 @@ Comment[ca]=Activitat detectada en una sessió controlada oculta Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení Comment[es]=Actividad detectada en una sesión oculta monitorizada +Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis Comment[it]=Attività rilevata in una sessione sorvegliata nascosta Comment[nl]=Activiteit ontdekt in een verborgen gevolgde sessie Comment[nn]=Aktivitet oppdaga i gøymd overvaka økt @@ -638,6 +640,7 @@ Name[ca]=Silenci en una sessió controlada oculta Name[ca@valencia]=Silenci en una sessió controlada oculta Name[cs]=Ticho ve skrytém monitorovaném sezení Name[es]=Silencio en sesión oculta monitorizada +Name[et]=Vaikus peidetud jälgitavas seansis Name[it]=Silenzio in una sessione sorvegliata nascosta Name[nl]=Stilte in verborgen gevolgde sessie Name[nn]=Stille i gøymd overvaka økt @@ -657,6 +660,7 @@ Comment[ca]=Silenci detectat en una sessió controlada oculta Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení Comment[es]=Silencio detectado en una sesión oculta monitorizada +Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie Comment[nn]=Stille oppdaga i gøymd overvaka økt diff --git a/desktop/konsolehere.desktop b/desktop/konsolehere.desktop index 7388f689..a9548e86 100644 --- a/desktop/konsolehere.desktop +++ b/desktop/konsolehere.desktop @@ -110,6 +110,7 @@ Comment[de]=Öffnet ein Terminal in dem aktuellen Ordner Comment[el]=Ανοίγει τερματικό στον τρέχοντα φάκελο Comment[en_GB]=Opens a terminal at the current folder Comment[es]=Abre una terminal en la carpeta actual +Comment[et]=Terminali avamine aktiivses kataloogis Comment[fi]=Avaa päätteen nykyiseen kansioon Comment[fr]=Ouvre un terminal dans le dossier courant Comment[gl]=Abre un terminal no cartafol actual. diff --git a/desktop/konsolepart.desktop b/desktop/konsolepart.desktop index 29a9ae84..ffdaaad8 100644 --- a/desktop/konsolepart.desktop +++ b/desktop/konsolepart.desktop @@ -113,6 +113,7 @@ Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών Comment[en_GB]=Command line access Comment[es]=Acceso a la línea de órdenes +Comment[et]=Käsurea kasutamine Comment[fi]=Pääsy komentoriville Comment[fr]=Ligne de commande Comment[gl]=Acceso á liña de ordes. diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index bac6fe93..14b03612 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -66,6 +66,7 @@ Comment[de]=In Konsole ausführen Comment[el]=Εκτέλεση από την Κονσόλα Comment[en_GB]=Run within Konsole Comment[es]=Ejecutar en Konsole +Comment[et]=Konsoolis käivitamine Comment[fi]=Suorita Konsolessa Comment[fr]=Exécuter dans Konsole Comment[gl]=Executar dentro de Konsole. diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index d4beac84..73581254 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -197,6 +197,7 @@ Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών Comment[en_GB]=Command line access Comment[es]=Acceso a la línea de órdenes +Comment[et]=Käsurea kasutamine Comment[fi]=Pääsy komentoriville Comment[fr]=Ligne de commande Comment[gl]=Acceso á liña de ordes. @@ -280,6 +281,7 @@ Name[de]=Ein neues Unterfenster öffnen Name[el]=Άνοιγμα νέας καρτέλας Name[en_GB]=Open a New Tab Name[es]=Abrir una nueva pestaña +Name[et]=Ava uuel kaardil Name[fi]=Avaa uusi välilehti Name[fr]=Ouvrir un nouvel onglet Name[gl]=Abrir unha lapela nova diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop index 0318ca5c..e9f19f0e 100644 --- a/desktop/terminalemulator.desktop +++ b/desktop/terminalemulator.desktop @@ -104,6 +104,7 @@ Comment[de]=Zugriff auf die Befehlszeile Comment[el]=Πρόσβαση από τη γραμμή εντολών Comment[en_GB]=Command line access Comment[es]=Acceso a la línea de órdenes +Comment[et]=Käsurea kasutamine Comment[fi]=Pääsy komentoriville Comment[fr]=Ligne de commande Comment[gl]=Acceso á liña de ordes. From 06f0ccbd92841ff645f499770ac4ff9bc46db975 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Aug 2016 13:51:45 +0000 Subject: [PATCH 07/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 8dcf1aec..62e578e5 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -431,6 +431,7 @@ Name=Activity in Hidden Monitored Session Name[ca]=Activitat en una sessió controlada oculta Name[ca@valencia]=Activitat en una sessió controlada oculta Name[cs]=Aktivita ve skrytém monitorovaném sezení +Name[de]=Aktivität in ausgeblendeter überwachter Sitzung Name[es]=Actividad en sesión oculta monitorizada Name[et]=Aktiivsus peidetud jälgitavas seansis Name[it]=Attività in sessione sorvegliata nascosta @@ -451,6 +452,7 @@ Comment=Activity detected in a hidden monitored session Comment[ca]=Activitat detectada en una sessió controlada oculta Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení +Comment[de]=In einer ausgeblendeten überwachten Sitzung wird Aktivität festgestellt Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis Comment[it]=Attività rilevata in una sessione sorvegliata nascosta @@ -639,6 +641,7 @@ Name=Silence in Hidden Monitored Session Name[ca]=Silenci en una sessió controlada oculta Name[ca@valencia]=Silenci en una sessió controlada oculta Name[cs]=Ticho ve skrytém monitorovaném sezení +Name[de]=Keine Aktivität in ausgeblendeter überwachter Sitzung Name[es]=Silencio en sesión oculta monitorizada Name[et]=Vaikus peidetud jälgitavas seansis Name[it]=Silenzio in una sessione sorvegliata nascosta @@ -659,6 +662,7 @@ Comment=Silence detected in a hidden monitored session Comment[ca]=Silenci detectat en una sessió controlada oculta Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení +Comment[de]=In einer ausgeblendeten überwachten Sitzung wird keine Aktivität festgestellt Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta From d2e51127647bcd21e1b764a681b99ef3023d7b67 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 2 Aug 2016 19:54:52 +0200 Subject: [PATCH 08/33] GIT_SILENT Upgrade KDE Applications version to 16.07.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4b282c9..0f277880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 11b822c71b58fe78ccdbc21c6cfe345083f986e8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Aug 2016 12:29:56 +0000 Subject: [PATCH 09/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 62e578e5..0c7784a6 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -431,6 +431,7 @@ Name=Activity in Hidden Monitored Session Name[ca]=Activitat en una sessió controlada oculta Name[ca@valencia]=Activitat en una sessió controlada oculta Name[cs]=Aktivita ve skrytém monitorovaném sezení +Name[da]=Aktivitet i skjult overvåget session Name[de]=Aktivität in ausgeblendeter überwachter Sitzung Name[es]=Actividad en sesión oculta monitorizada Name[et]=Aktiivsus peidetud jälgitavas seansis @@ -452,6 +453,7 @@ Comment=Activity detected in a hidden monitored session Comment[ca]=Activitat detectada en una sessió controlada oculta Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení +Comment[da]=Aktivitet detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird Aktivität festgestellt Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis @@ -641,6 +643,7 @@ Name=Silence in Hidden Monitored Session Name[ca]=Silenci en una sessió controlada oculta Name[ca@valencia]=Silenci en una sessió controlada oculta Name[cs]=Ticho ve skrytém monitorovaném sezení +Name[da]=Inaktivitetet i skjult overvåget session Name[de]=Keine Aktivität in ausgeblendeter überwachter Sitzung Name[es]=Silencio en sesión oculta monitorizada Name[et]=Vaikus peidetud jälgitavas seansis @@ -662,6 +665,7 @@ Comment=Silence detected in a hidden monitored session Comment[ca]=Silenci detectat en una sessió controlada oculta Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení +Comment[da]=Stilhed detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird keine Aktivität festgestellt Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis From b5c18ef208841c555248b153d27b1bab5556f211 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Aug 2016 12:40:04 +0000 Subject: [PATCH 10/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 0c7784a6..bf6f0b28 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -433,6 +433,7 @@ Name[ca@valencia]=Activitat en una sessió controlada oculta Name[cs]=Aktivita ve skrytém monitorovaném sezení Name[da]=Aktivitet i skjult overvåget session Name[de]=Aktivität in ausgeblendeter überwachter Sitzung +Name[en_GB]=Activity in Hidden Monitored Session Name[es]=Actividad en sesión oculta monitorizada Name[et]=Aktiivsus peidetud jälgitavas seansis Name[it]=Attività in sessione sorvegliata nascosta @@ -455,6 +456,7 @@ Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení Comment[da]=Aktivitet detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird Aktivität festgestellt +Comment[en_GB]=Activity detected in a hidden monitored session Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis Comment[it]=Attività rilevata in una sessione sorvegliata nascosta @@ -645,6 +647,7 @@ Name[ca@valencia]=Silenci en una sessió controlada oculta Name[cs]=Ticho ve skrytém monitorovaném sezení Name[da]=Inaktivitetet i skjult overvåget session Name[de]=Keine Aktivität in ausgeblendeter überwachter Sitzung +Name[en_GB]=Silence in Hidden Monitored Session Name[es]=Silencio en sesión oculta monitorizada Name[et]=Vaikus peidetud jälgitavas seansis Name[it]=Silenzio in una sessione sorvegliata nascosta @@ -667,6 +670,7 @@ Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení Comment[da]=Stilhed detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird keine Aktivität festgestellt +Comment[en_GB]=Silence detected in a hidden monitored session Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta From 468817123b56db6e2794191402032e28f6411691 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 10 Aug 2016 01:01:34 +0200 Subject: [PATCH 11/33] GIT_SILENT Upgrade KDE Applications version to 16.08.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f277880..cefde379 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "90") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From ef6f69703ca50114dce2814955fbbc6acc9b456a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Aug 2016 12:04:46 +0000 Subject: [PATCH 12/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsolerun.desktop | 1 + desktop/org.kde.konsole.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index 14b03612..bd1f6546 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -79,6 +79,7 @@ Comment[nn]=Køyr inni konsoll Comment[pl]=Uruchom wewnątrz konsoli Comment[pt]=Executar no Konsole Comment[pt_BR]=Executar no Konsole +Comment[ru]=Выполнить команду в Konsole Comment[sk]=Spustiť v Konsole Comment[sl]=Zaženi znotraj Konsole Comment[sr]=Изврши у Конзоли diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index 73581254..583fa3b4 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -294,6 +294,7 @@ Name[nn]=Opna ny fane Name[pl]=Otwórz nową kartę Name[pt]=Abrir uma Nova Página Name[pt_BR]=Abre uma nova aba +Name[ru]=Открыть новую вкладку Name[sk]=Otvoriť novú kartu Name[sl]=Odpri nov zavihek Name[sr]=Отвори нови језичак From 7b8f3a18aad97e13d6b6199c89ce42ce0b7f7f27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Aug 2016 12:13:56 +0000 Subject: [PATCH 13/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index bf6f0b28..a2dbc9ce 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -441,6 +441,7 @@ Name[nl]=Activiteit in een verborgen gevolgde sessie Name[nn]=Aktivitet i gøymd overvaka økt Name[pl]=Aktywność w ukrytej monitorowanej sesji Name[pt]=Actividade em Sessão Vigiada Escondida +Name[sk]=Aktivita v skrytom monitorovanom sedení Name[sl]=Dejavnost v skriti nadzorovani seji Name[sr]=Активност у скривеној надгледаној сесији Name[sr@ijekavian]=Активност у скривеној надгледаној сесији @@ -464,6 +465,7 @@ Comment[nl]=Activiteit ontdekt in een verborgen gevolgde sessie Comment[nn]=Aktivitet oppdaga i gøymd overvaka økt Comment[pl]=Wykryto aktywność w ukrytej monitorowanej sesji Comment[pt]=Actividade detectada numa sessão vigiada que esteja escondida +Comment[sk]=Zistená aktivita v skrytom monitorovanom sedení Comment[sl]=V skriti nadzorovani seji je bila zaznana dejavnost Comment[sr]=Уочена је активност скривеној у надгледаној сесији Comment[sr@ijekavian]=Уочена је активност скривеној у надгледаној сесији @@ -655,6 +657,7 @@ Name[nl]=Stilte in verborgen gevolgde sessie Name[nn]=Stille i gøymd overvaka økt Name[pl]=Cisza w ukrytej monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Escondida +Name[sk]=Nečinnosť v skrytom monitorovanom sedení Name[sl]=Nedejavnost v skriti nadzorovani seji Name[sr]=Тишина у скривеној надгледаној сесији Name[sr@ijekavian]=Тишина у скривеној надгледаној сесији @@ -678,6 +681,7 @@ Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie Comment[nn]=Stille oppdaga i gøymd overvaka økt Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida +Comment[sk]=Zistená nečinnosť v skrytom monitorovanom sedení Comment[sl]=V skriti nadzorovani seji je bila zaznana nedejavnost Comment[sr]=Уочена је тишина скривеној у надгледаној сесији Comment[sr@ijekavian]=Уочена је тишина скривеној у надгледаној сесији From f028f17bee9694954ea78ba03589ba7bdbc9aa39 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 18:20:53 +0200 Subject: [PATCH 14/33] Fix crash when failing to restore session REVIEW: 128670 BUG: 366217 (cherry picked from commit 13684bebe2a421157032bc3cfaf28e468d0c1eef) --- src/ViewManager.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index 90ef863b..b1efc0a3 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -941,6 +941,14 @@ void ViewManager::restoreSessions(const KConfigGroup& group) int tab = 1; foreach(int id, ids) { Session* session = SessionManager::instance()->idToSession(id); + + if (!session) { + qWarning() << "Unable to load session with id" << id; + // Force a creation of a default session below + ids.clear(); + break; + } + createView(session); if (!session->isRunning()) session->run(); From fca305ebffd331701b59e68ab446db9618987b6f Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 15:41:31 +0200 Subject: [PATCH 15/33] Fix transparent backgrounds It's apparently not possible to set WA_TranslucentBackground after show(). The MainWindow constructor calls applyKonsoleSettings() which calls KMainWindow::setAutoSaveSettings() which in turn calls setVisible(true), which makes any calls to setTransparency() from the Application::newMainWindow() irrelevant, even if updateUseTransparency() is called from it. REVIEW: 128669 BUG: 366368 (cherry picked from commit a28902e9120798c67844864a11bbe3f1c2549b74) --- src/Application.cpp | 4 +++- src/MainWindow.cpp | 15 +++++---------- src/MainWindow.h | 2 -- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index cbd13735..d5dbbd6c 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -40,6 +40,7 @@ #include "KonsoleSettings.h" #include "ViewManager.h" #include "SessionController.h" +#include "WindowSystemInfo.h" using namespace Konsole; @@ -56,8 +57,9 @@ Application::~Application() MainWindow* Application::newMainWindow() { + WindowSystemInfo::HAVE_TRANSPARENCY = !m_parser.isSet(QStringLiteral("notransparency")); + MainWindow* window = new MainWindow(); - window->setTransparency(!m_parser.isSet(QStringLiteral("notransparency"))); connect(window, &Konsole::MainWindow::newWindowRequest, this, &Konsole::Application::createWindow); connect(window, &Konsole::MainWindow::viewDetached, this, &Konsole::Application::detachView); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index cae8a54f..9107939d 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -64,7 +64,6 @@ MainWindow::MainWindow() , _pluggedController(0) , _menuBarInitialVisibility(true) , _menuBarInitialVisibilityApplied(false) - , _useTransparency(false) { if (!KonsoleSettings::saveGeometryOnExit()) { // If we are not using the global Konsole save geometry on exit, @@ -83,8 +82,6 @@ MainWindow::MainWindow() } } - connect(KWindowSystem::self(), &KWindowSystem::compositingChanged, this, &MainWindow::updateUseTransparency); - updateUseTransparency(); // create actions for menus @@ -129,11 +126,14 @@ MainWindow::MainWindow() void MainWindow::updateUseTransparency() { - bool useTranslucency = KWindowSystem::compositingActive() && _useTransparency; + if (!WindowSystemInfo::HAVE_TRANSPARENCY) { + return; + } + + bool useTranslucency = KWindowSystem::compositingActive(); setAttribute(Qt::WA_TranslucentBackground, useTranslucency); setAttribute(Qt::WA_NoSystemBackground, false); - WindowSystemInfo::HAVE_TRANSPARENCY = useTranslucency; } @@ -765,11 +765,6 @@ void MainWindow::setShowQuickButtons(bool show) _viewManager->setShowQuickButtons(show); } -void MainWindow::setTransparency(bool useTransparency) -{ - _useTransparency = useTransparency; -} - void MainWindow::activateMenuBar() { const QList menuActions = menuBar()->actions(); diff --git a/src/MainWindow.h b/src/MainWindow.h index 978bd936..500b3956 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -109,7 +109,6 @@ public: void setNavigationStyleSheetFromFile(const QUrl& stylesheetfile); void setNavigationBehavior(int behavior); void setShowQuickButtons(bool show); - void setTransparency(bool useTransparency); signals: @@ -211,7 +210,6 @@ private: bool _menuBarInitialVisibility; bool _menuBarInitialVisibilityApplied; - bool _useTransparency; }; } From 1f06b971042e275cd50aaa298d18b495cc3c8aba Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 20:51:06 +0200 Subject: [PATCH 16/33] Avoid asking the user a second time for confirmation of closing an active tab (cherry picked from commit 6c23f43ec314ea196c8a42682f91467778a67e54) --- src/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 9107939d..6f560144 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -581,7 +581,7 @@ bool MainWindow::queryClose() case KMessageBox::No: if (_pluggedController && _pluggedController->session()) { disconnectController(_pluggedController); - _pluggedController->closeSession(); + _pluggedController->session()->closeInNormalWay(); } return false; case KMessageBox::Cancel: From 5b725423058143ad2c6f5d33d62a551434ccdbe3 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 21:23:23 +0200 Subject: [PATCH 17/33] Fix regexpfilter matching with an empty regex (cherry picked from commit 9175663f216a85f7c81c8080adbab872c74b6bd4) --- src/Filter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Filter.cpp b/src/Filter.cpp index 062a459a..e261879f 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -337,7 +337,7 @@ void RegExpFilter::process() Q_ASSERT(text); - if (!_searchText.isValid()) { + if (!_searchText.isValid() || _searchText.pattern().isEmpty()) { return; } From 0303a98a29ef22364f688b307f2c5c62312e7f6a Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 21:26:27 +0200 Subject: [PATCH 18/33] Only try to send EOF to the shell, not other processes (cherry picked from commit c6c09ce7a38fccdc1cbbc847a80b98f107349fc7) --- src/Session.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Session.cpp b/src/Session.cpp index 65bb220d..14a0fbbf 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -822,13 +822,18 @@ bool Session::closeInNormalWay() return true; } - _shellProcess->sendEof(); + // Check if the default shell is running, in that case try sending an EOF for a clean exit + const QString defaultProc = program().split('/').last(); + const QString currentProc = foregroundProcessName().split('/').last(); + if (defaultProc == currentProc) { + _shellProcess->sendEof(); - if (_shellProcess->waitForFinished(1000)) { - return true; + if (_shellProcess->waitForFinished(1000)) { + return true; + } + qWarning() << "shell did not close, sending SIGHUP"; } - qWarning() << "shell did not close, sending SIGHUP"; // We tried asking nicely, ask a bit less nicely if (kill(SIGHUP)) { From 1c04f8296df3b8787279ea2fbd8505a94d5fd917 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Aug 2016 10:32:33 +0000 Subject: [PATCH 19/33] SVN_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index a783827c..f5b76e95 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -15,6 +15,7 @@ Konsole Konsole Konsole + Konsool Konsole Konsole Konsole @@ -55,6 +56,7 @@ Τερματικό Terminal Terminal + Terminal Pääteikkuna Terminal Terminal @@ -94,6 +96,7 @@

Το Konsole είναι ένας εξομοιωτής τερματικού.

Konsole is a terminal emulator.

Konsole es un emulador de terminal.

+

Konsool on terminaliemulaator.

Konsole on pääte-emulaattori.

Konsole est un émulateur de terminal.

Konsole é un emulador de terminal.

@@ -133,6 +136,7 @@

Χαρακτηριστικά:

Features:

Funcionalidades:

+

Omadused:

Ominaisuuksia:

Fonctionnalités :

Funcionalidades:

@@ -174,6 +178,7 @@
  • Καρτέλες
  • Tabs
  • Pestañas
    • +
  • Kaardid
  • Välilehdet
  • Onglets
  • Lapelas.
    • @@ -212,6 +217,7 @@
  • Πολλαπλά προφίλ
  • Multiple profiles
  • Perfiles múltiples
    • +
  • Mitme profiili võimalus
  • Useat profiilit
  • Multi profiles
  • Varios perfís.
    • @@ -249,6 +255,7 @@
  • Παρακολούθηση κατάστασης αδράνειας και δραστηριοτήτων
  • Silence and Activity monitoring
  • Supervisión de silencios y actividad
    • +
  • Vaikuse ja aktiivsuse jälgimine
  • Hiljaisuuden ja aktiivisuuden tarkkailu
  • Détection d'activité et de non activité
  • Control de actividade e inactividade.
    • @@ -285,6 +292,7 @@
  • υποστήριξη σελιδοδεικτών
  • Bookmark support
  • Uso de marcadores
    • +
  • Järjehoidjate toetus
  • Kirjanmerkkituki
  • Prise en charge des signets
  • Marcadores.
    • @@ -322,6 +330,7 @@
  • Αναζήτηση
  • Searching
  • Búsqueda
    • +
  • Otsimine
  • Haku
  • Recherche
  • Busca.
    • @@ -361,6 +370,7 @@
  • Αποθήκευση αποτελέσματος
  • Saving output
  • Guardar la salida
    • +
  • Väljundi salvestamine
  • Tulosteen tallennus
  • Enregistrement de la sortie
  • Posibilidade de gardar a saída.
    • From 738fd485d7c7d4da8c40c9c10566570e23d30a65 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sat, 13 Aug 2016 13:01:07 +0200 Subject: [PATCH 20/33] Fix crash when closing session Instead of manually deleting the output suspended label let the QObject cleanup handle it. Now it is first deleted manually by us, leading to a potential crash, and afterwards the QObject cleanup runs, but luckily it doesn' try to destroy it again. REVIEW: 128667 BUG: 366706 (cherry picked from commit b2b852cfd7b10fc2ffb668ac87f8ca9236a134e3) --- src/TerminalDisplay.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 4f28837d..555a9913 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -429,7 +429,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) // that TerminalDisplay will handle repainting its entire area. setAttribute(Qt::WA_OpaquePaintEvent); - _gridLayout = new QGridLayout(this); + _gridLayout = new QGridLayout; _gridLayout->setContentsMargins(0, 0, 0, 0); setLayout(_gridLayout); @@ -448,9 +448,6 @@ TerminalDisplay::~TerminalDisplay() disconnect(_blinkCursorTimer); delete[] _image; - - delete _gridLayout; - delete _outputSuspendedLabel; delete _filterChain; } @@ -3067,8 +3064,7 @@ void TerminalDisplay::outputSuspended(bool suspended) "suspended" " by pressing Ctrl+S." " Press Ctrl+Q to resume." - " Click here to dismiss this message."), - this); + " Click here to dismiss this message.")); QPalette palette(_outputSuspendedLabel->palette()); KColorScheme::adjustBackground(palette, KColorScheme::NeutralBackground); From 133fae6ab106be145f9e91a496dd00de345022b9 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 27 Aug 2016 11:41:51 -0400 Subject: [PATCH 21/33] Fix issues where --tabs-from-file doesn't exist or is invalid Cleanly exit if there are any issues with the given file for --tabs-from-file option. BUG: 367855 (cherry picked from commit d73270a470680e4b796372a3196d15053d50029b) --- src/Application.cpp | 34 +++++++++++++++++++--------------- src/Application.h | 2 +- src/main.cpp | 4 +++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index d5dbbd6c..e903981b 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -108,21 +108,23 @@ int Application::newInstance() if (m_parser.isSet(QStringLiteral("tabs-from-file"))) { // create new session(s) as described in file - processTabsFromFileArgs(window); - } else { - // select profile to use - Profile::Ptr baseProfile = processProfileSelectArgs(); + if (!processTabsFromFileArgs(window)) { + return 0; + } + } - // process various command-line options which cause a property of the - // selected profile to be changed - Profile::Ptr newProfile = processProfileChangeArgs(baseProfile); + // select profile to use + Profile::Ptr baseProfile = processProfileSelectArgs(); - // create new session - Session* session = window->createSession(newProfile, QString()); + // process various command-line options which cause a property of the + // selected profile to be changed + Profile::Ptr newProfile = processProfileChangeArgs(baseProfile); - if (m_parser.isSet(QStringLiteral("noclose"))) { - session->setAutoClose(false); - } + // create new session + Session* session = window->createSession(newProfile, QString()); + + if (m_parser.isSet(QStringLiteral("noclose"))) { + session->setAutoClose(false); } // if the background-mode argument is supplied, start the background @@ -171,7 +173,7 @@ title: Top this!;; command: top command: ssh earth profile: Zsh */ -void Application::processTabsFromFileArgs(MainWindow* window) +bool Application::processTabsFromFileArgs(MainWindow* window) { // Open tab configuration file const QString tabsFileName(m_parser.value(QStringLiteral("tabs-from-file"))); @@ -179,7 +181,7 @@ void Application::processTabsFromFileArgs(MainWindow* window) if (!tabsFile.open(QFile::ReadOnly)) { qWarning() << "ERROR: Cannot open tabs file " << tabsFileName.toLocal8Bit().data(); - return; + return false; } unsigned int sessions = 0; @@ -209,8 +211,10 @@ void Application::processTabsFromFileArgs(MainWindow* window) if (sessions < 1) { qWarning() << "No valid lines found in " << tabsFileName.toLocal8Bit().data(); - return; + return false; } + + return true; } void Application::createTabFromArgs(MainWindow* window, diff --git a/src/Application.h b/src/Application.h index 431071ef..2f32fda7 100644 --- a/src/Application.h +++ b/src/Application.h @@ -81,7 +81,7 @@ private: MainWindow* processWindowArgs(bool &createdNewMainWindow); Profile::Ptr processProfileSelectArgs(); Profile::Ptr processProfileChangeArgs(Profile::Ptr baseProfile); - void processTabsFromFileArgs(MainWindow* window); + bool processTabsFromFileArgs(MainWindow* window); void createTabFromArgs(MainWindow* window, const QHash&); void finalizeNewMainWindow(MainWindow* window); diff --git a/src/main.cpp b/src/main.cpp index 9b3a4f17..c7d797c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -159,7 +159,9 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[]) QObject::connect(&dbusService, &KDBusService::activateRequested, &konsoleApp, &Application::slotActivateRequested); if (!konsoleApp.newInstance()) { - // An argument that printed something and mean we should just quit was passed. + // Do not finish starting Konsole + // 1. An argument was given to just printed info + // 2. An invalid situation ocurred delete app; return 0; } From 17cf652a9cd2f2c2c35b20c42cfcbfad8b83cb43 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 28 Aug 2016 09:08:02 -0400 Subject: [PATCH 22/33] Prevent 2 windows from opening upon session restore Session management would start 2 konsole windows upon login. Thanks John Stanley (jpsinthemix gmail com) for patch BUG: 367447 (cherry picked from commit 5b11fd593b954504343bdb418c54a8e7913d9c7c) --- src/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c7d797c3..2b70aff3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -158,7 +158,9 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[]) // of Konsole is started. QObject::connect(&dbusService, &KDBusService::activateRequested, &konsoleApp, &Application::slotActivateRequested); - if (!konsoleApp.newInstance()) { + if (app->isSessionRestored()) { + restoreSession(konsoleApp); + } else if (!konsoleApp.newInstance()) { // Do not finish starting Konsole // 1. An argument was given to just printed info // 2. An invalid situation ocurred @@ -166,9 +168,6 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[]) return 0; } - if (app->isSessionRestored()) - restoreSession(konsoleApp); - // Since we've allocated the QApplication on the heap for the KDBusService workaround, // we need to delete it manually before returning from main(). int ret = app->exec(); From 17a3ee5dfa1fc99776a015b31e5862ce82ab1a56 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sun, 28 Aug 2016 14:41:42 +0200 Subject: [PATCH 23/33] Fix checking of foreground process The old method of checking it has unnecessary overhead (doing a full process info update), and wasn't very reliable. Instead just get the original shell PID from QProcess (via KProcess), and the foreground process from the PTY. CCBUG: 367746 REVIEW: 128789 (cherry picked from commit 79ca76a94696eda408927b122b0b531676d4ba93) --- src/MainWindow.cpp | 3 ++- src/Session.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 6f560144..803eeaf8 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -536,8 +536,9 @@ bool MainWindow::queryClose() QStringList processesRunning; foreach(Session *session, _viewManager->sessions()) { - if (!session) + if (!session || !session->isForegroundProcessActive()) { continue; + } const QString defaultProc = session->program().split('/').last(); const QString currentProc = session->foregroundProcessName().split('/').last(); diff --git a/src/Session.cpp b/src/Session.cpp index 14a0fbbf..ae539cdc 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -823,9 +823,7 @@ bool Session::closeInNormalWay() } // Check if the default shell is running, in that case try sending an EOF for a clean exit - const QString defaultProc = program().split('/').last(); - const QString currentProc = foregroundProcessName().split('/').last(); - if (defaultProc == currentProc) { + if (!isForegroundProcessActive()) { _shellProcess->sendEof(); if (_shellProcess->waitForFinished(1000)) { @@ -992,6 +990,9 @@ ProcessInfo* Session::getProcessInfo() ProcessInfo* process = 0; if (isForegroundProcessActive()) { + if (_foregroundProcessInfo == nullptr) { + updateForegroundProcessInfo(); + } process = _foregroundProcessInfo; } else { updateSessionProcessInfo(); @@ -1469,7 +1470,7 @@ int Session::foregroundProcessId() bool Session::isForegroundProcessActive() { // foreground process info is always updated after this - return updateForegroundProcessInfo() && (processId() != _foregroundPid); + return (_shellProcess->pid() != _shellProcess->foregroundProcessGroup()); } QString Session::foregroundProcessName() From 391828aa2313f06b0ccc3ad2c60bf0661703e236 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 28 Aug 2016 15:05:21 -0400 Subject: [PATCH 24/33] Add KCrash code so krkonqi crash dialog works again BUG: 367006 (cherry picked from commit 30fe2a0b9d93617c80f6e3d5a61d845a5fb526ab) --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 1 + src/main.cpp | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cefde379..94d99786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Bookmarks Completion Config ConfigWidgets - CoreAddons GuiAddons DBusAddons + CoreAddons Crash GuiAddons DBusAddons I18n IconThemes Init KIO Notifications NotifyConfig Parts Pty Service TextWidgets WidgetsAddons WindowSystem XmlGui DBusAddons diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6bcd68fd..25f6e570 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -175,6 +175,7 @@ target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::WindowSyst KF5::I18n KF5::KIOWidgets KF5::NotifyConfig + KF5::Crash ) install(TARGETS kdeinit_konsole konsole diff --git a/src/main.cpp b/src/main.cpp index 2b70aff3..29f6f2b1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,6 +31,7 @@ // KDE #include #include +#include #include #include #include @@ -106,6 +107,8 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[]) KAboutData::setApplicationData(about); + KCrash::initialize(); + QCommandLineParser parser; parser.setApplicationDescription(about.shortDescription()); parser.addHelpOption(); From 7cecfc078e49e1a8654a759481be31e335be2b09 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sun, 28 Aug 2016 19:29:08 +0200 Subject: [PATCH 25/33] Only send EOF to known shells The only processes that are "safe" or require us to send an EOF to terminate cleanly are shells, so verify that people didn't run with -e tmux or similar. REVIEW: 128791 BUG: 367746 (cherry picked from commit ce4ab922496cb9e133f96db78c5b67bc01429512) --- src/Session.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Session.cpp b/src/Session.cpp index ae539cdc..b8b42ab6 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -822,8 +822,10 @@ bool Session::closeInNormalWay() return true; } - // Check if the default shell is running, in that case try sending an EOF for a clean exit - if (!isForegroundProcessActive()) { + static QSet knownShells({"ash", "bash", "csh", "dash", "fish", "hush", "ksh", "mksh", "pdksh", "tcsh", "zsh"}); + + // If only the session's shell is running, try sending an EOF for a clean exit + if (!isForegroundProcessActive() && knownShells.contains(QFileInfo(_program).fileName())) { _shellProcess->sendEof(); if (_shellProcess->waitForFinished(1000)) { From b0390a2c7225f91cdbd5342d7051c069749bfea7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Sep 2016 12:35:03 +0000 Subject: [PATCH 26/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index a2dbc9ce..1772c4b8 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -441,6 +441,7 @@ Name[nl]=Activiteit in een verborgen gevolgde sessie Name[nn]=Aktivitet i gøymd overvaka økt Name[pl]=Aktywność w ukrytej monitorowanej sesji Name[pt]=Actividade em Sessão Vigiada Escondida +Name[pt_BR]=Atividade na sessão oculta monitorada Name[sk]=Aktivita v skrytom monitorovanom sedení Name[sl]=Dejavnost v skriti nadzorovani seji Name[sr]=Активност у скривеној надгледаној сесији @@ -465,6 +466,7 @@ Comment[nl]=Activiteit ontdekt in een verborgen gevolgde sessie Comment[nn]=Aktivitet oppdaga i gøymd overvaka økt Comment[pl]=Wykryto aktywność w ukrytej monitorowanej sesji Comment[pt]=Actividade detectada numa sessão vigiada que esteja escondida +Comment[pt_BR]=Atividade detectada em uma sessão oculta monitorada Comment[sk]=Zistená aktivita v skrytom monitorovanom sedení Comment[sl]=V skriti nadzorovani seji je bila zaznana dejavnost Comment[sr]=Уочена је активност скривеној у надгледаној сесији @@ -657,6 +659,7 @@ Name[nl]=Stilte in verborgen gevolgde sessie Name[nn]=Stille i gøymd overvaka økt Name[pl]=Cisza w ukrytej monitorowanej sesji Name[pt]=Silêncio em Sessão Vigiada Escondida +Name[pt_BR]=Silêncio na sessão oculta monitorada Name[sk]=Nečinnosť v skrytom monitorovanom sedení Name[sl]=Nedejavnost v skriti nadzorovani seji Name[sr]=Тишина у скривеној надгледаној сесији @@ -681,6 +684,7 @@ Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie Comment[nn]=Stille oppdaga i gøymd overvaka økt Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida +Comment[pt_BR]=Silêncio detectado em uma sessão oculta monitorada Comment[sk]=Zistená nečinnosť v skrytom monitorovanom sedení Comment[sl]=V skriti nadzorovani seji je bila zaznana nedejavnost Comment[sr]=Уочена је тишина скривеној у надгледаној сесији From 07cbdbcd128781fe77d78533436ef2172dcc5993 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 3 Sep 2016 17:34:43 -0400 Subject: [PATCH 27/33] Change the default to not underline links Set UnderlineLinksEnabled to false for now. Users can alway enable in profile settings. CCBUG:367882 --- src/Profile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Profile.cpp b/src/Profile.cpp index 06fe5b1e..3e0eb4cb 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -178,7 +178,7 @@ FallbackProfile::FallbackProfile() setProperty(FlowControlEnabled, true); setProperty(EnableUrlHints, false); setProperty(BlinkingTextEnabled, true); - setProperty(UnderlineLinksEnabled, true); + setProperty(UnderlineLinksEnabled, false); setProperty(OpenLinksByDirectClickEnabled, false); setProperty(CtrlRequiredForDrag, true); setProperty(AutoCopySelectedText, false); From 7c3591dddad7c956bea6c65fb0c66b68c93f840f Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 5 Sep 2016 00:29:26 +0200 Subject: [PATCH 28/33] GIT_SILENT Upgrade KDE Applications version to 16.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94d99786..ebe9c39a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 94599dae7ca925b1e9dcf666a30a8cf32f63c332 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Sep 2016 12:06:06 +0000 Subject: [PATCH 29/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 1772c4b8..8ff8a0f3 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -433,6 +433,7 @@ Name[ca@valencia]=Activitat en una sessió controlada oculta Name[cs]=Aktivita ve skrytém monitorovaném sezení Name[da]=Aktivitet i skjult overvåget session Name[de]=Aktivität in ausgeblendeter überwachter Sitzung +Name[el]=Δραστηριότητα σε κρυμμένη συνεδρία υπό εποπτεία Name[en_GB]=Activity in Hidden Monitored Session Name[es]=Actividad en sesión oculta monitorizada Name[et]=Aktiivsus peidetud jälgitavas seansis @@ -458,6 +459,7 @@ Comment[ca@valencia]=Activitat detectada en una sessió controlada oculta Comment[cs]=Detekována aktivita ve skrytém monitorovaném sezení Comment[da]=Aktivitet detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird Aktivität festgestellt +Comment[el]=Εντοπίστηκε δραστηριότητα σε μια κρυμμένη συνεδρία υπό εποπτεία Comment[en_GB]=Activity detected in a hidden monitored session Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis @@ -651,6 +653,7 @@ Name[ca@valencia]=Silenci en una sessió controlada oculta Name[cs]=Ticho ve skrytém monitorovaném sezení Name[da]=Inaktivitetet i skjult overvåget session Name[de]=Keine Aktivität in ausgeblendeter überwachter Sitzung +Name[el]=Ησυχία σε κρυμμένη συνεδρία υπό εποπτεία Name[en_GB]=Silence in Hidden Monitored Session Name[es]=Silencio en sesión oculta monitorizada Name[et]=Vaikus peidetud jälgitavas seansis @@ -676,6 +679,7 @@ Comment[ca@valencia]=Silenci detectat en una sessió controlada oculta Comment[cs]=Detekováno ticho ve skrytém monitorovaném sezení Comment[da]=Stilhed detekteret i en skjult overvåget session Comment[de]=In einer ausgeblendeten überwachten Sitzung wird keine Aktivität festgestellt +Comment[el]=Επικρατεί ησυχία σε μια κρυμμένη συνεδρία υπό εποπτεία Comment[en_GB]=Silence detected in a hidden monitored session Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis From dca6479a86f17b357365f1a598b8deeb0d602dbe Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 17 Sep 2016 12:40:54 -0400 Subject: [PATCH 30/33] Fix updating of tab title Update the tab title to current program running. Martin, this "if" was committed in 79ca76a94696eda408927b122b0b531676d4ba93. For now, I removed the "if" CCBUG: 368785 (cherry picked from commit 3747ecfde0800804717203d7f5fa0f96c0791052) --- src/Session.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Session.cpp b/src/Session.cpp index b8b42ab6..6ba9f9b0 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -992,9 +992,7 @@ ProcessInfo* Session::getProcessInfo() ProcessInfo* process = 0; if (isForegroundProcessActive()) { - if (_foregroundProcessInfo == nullptr) { - updateForegroundProcessInfo(); - } + updateForegroundProcessInfo(); process = _foregroundProcessInfo; } else { updateSessionProcessInfo(); From b075c4f0774cec4a065e784a3f81f544475504ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 5 Oct 2016 11:58:19 +0000 Subject: [PATCH 31/33] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 8ff8a0f3..c8afbdb0 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -452,6 +452,7 @@ Name[sr@latin]=Aktivnost u skrivenoj nadgledanoj sesiji Name[sv]=Aktivitet i dold bevakad session Name[uk]=Дії у прихованому сеансі спостереження Name[x-test]=xxActivity in Hidden Monitored Sessionxx +Name[zh_CN]=被监视隐藏会话中的活动 Name[zh_TW]=隱藏的監控工作階段的活動 Comment=Activity detected in a hidden monitored session Comment[ca]=Activitat detectada en una sessió controlada oculta @@ -478,6 +479,7 @@ Comment[sr@latin]=Uočena je aktivnost skrivenoj u nadgledanoj sesiji Comment[sv]=Aktivitet funnen i en dold bevakad session Comment[uk]=У прихованому сеансі спостереження виявлено дії Comment[x-test]=xxActivity detected in a hidden monitored sessionxx +Comment[zh_CN]=被监视隐藏会话中检测到的活动 Comment[zh_TW]=隱藏的監控工作階段中偵測到的活動 Action=Popup @@ -672,6 +674,7 @@ Name[sr@latin]=Tišina u skrivenoj nadgledanoj sesiji Name[sv]=Tystnad i dold bevakad session Name[uk]=Тиша у прихованому сеансі спостереження Name[x-test]=xxSilence in Hidden Monitored Sessionxx +Name[zh_CN]=被监视隐藏会话中的缄默 Name[zh_TW]=隱藏的監控工作階段的靜默 Comment=Silence detected in a hidden monitored session Comment[ca]=Silenci detectat en una sessió controlada oculta @@ -698,6 +701,7 @@ Comment[sr@latin]=Uočena je tišina skrivenoj u nadgledanoj sesiji Comment[sv]=Tystnad funnen i en dold bevakad session Comment[uk]=У прихованому сеансі спостереження виявлено тишу Comment[x-test]=xxSilence detected in a hidden monitored sessionxx +Comment[zh_CN]=被监视隐藏会话中检测到的缄默 Comment[zh_TW]=隱藏的監控工作階段中偵測到靜默時的行為 Action=Popup From abb60a6aecf87415f439eee230796e283cf324f7 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 7 Oct 2016 00:56:04 +0200 Subject: [PATCH 32/33] GIT_SILENT Upgrade KDE Applications version to 16.08.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebe9c39a..18b6e493 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 5080af97975b8ab57562d87df389066434da0203 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 13 Oct 2016 00:30:07 +0200 Subject: [PATCH 33/33] Fix typo in CMakeLists.txt option Make it match the expected ifdef value CCMAIL: kurt.hindenburg@gmail.com --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25f6e570..e7891f77 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,7 @@ if(BUILD_TESTING) endif() ### Security concerns about sendText and runCommand dbus methods being public -option(REMOVE_SENDTEXT_RUNNCOMMAND_METHODS "Konsole: remove sendText and runCommand dbus methods" OFF) +option(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS "Konsole: remove sendText and runCommand dbus methods" OFF) ### Font Embedder and LineFont.h option(KONSOLE_BUILD_FONTEMBEDDER "Konsole: build fontembedder executable" OFF)