Hello community,
here is the log from the commit of package konsole for openSUSE:Factory checked in at 2015-10-03 20:22:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/konsole (Old)
and /work/SRC/openSUSE:Factory/.konsole.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole"
Changes:
--------
--- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2015-07-14 17:41:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2015-10-03 20:22:50.000000000 +0200
@@ -1,0 +2,23 @@
+Sun Sep 13 19:21:40 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.08.1
+ * KDE Applications 15.08.1
+ * https://www.kde.org/announcements/announce-applications-15.08.1.php
+
+
+-------------------------------------------------------------------
+Wed Aug 19 19:43:43 UTC 2015 - cgiboudeaux@gmx.com
+
+- Update to KDE Applications 15.08.0
+ * KDE Applications 15.08.0
+ * https://www.kde.org/announcements/announce-applications-15.08.0.php
+
+-------------------------------------------------------------------
+Fri Aug 7 07:08:32 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.07.90
+ * KDE Applications 15.08.0 RC1
+ * https://www.kde.org/announcements/announce-applications-15.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
konsole-15.04.3.tar.xz
New:
----
konsole-15.08.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ konsole.spec ++++++
--- /var/tmp/diff_new_pack.SPlajj/_old 2015-10-03 20:22:51.000000000 +0200
+++ /var/tmp/diff_new_pack.SPlajj/_new 2015-10-03 20:22:51.000000000 +0200
@@ -17,7 +17,7 @@
Name: konsole
-Version: 15.04.3
+Version: 15.08.1
Release: 0
Summary: KDE Terminal
License: GPL-2.0+
++++++ konsole-15.04.3.tar.xz -> konsole-15.08.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/CMakeLists.txt new/konsole-15.08.1/CMakeLists.txt
--- old/konsole-15.04.3/CMakeLists.txt 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/CMakeLists.txt 2015-08-25 16:55:12.000000000 +0200
@@ -1,7 +1,7 @@
# Konsole project
project(Konsole)
set(Konsole_VERSION_MAJOR 15)
-set(Konsole_VERSION_MINOR 04)
+set(Konsole_VERSION_MINOR 08)
set(Konsole_VERSION_PATCH 0)
set(Konsole_VERSION "${Konsole_VERSION_MAJOR}.${Konsole_VERSION_MINOR}.${Konsole_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/data/profiles/Shell.profile new/konsole-15.08.1/data/profiles/Shell.profile
--- old/konsole-15.04.3/data/profiles/Shell.profile 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/data/profiles/Shell.profile 2015-08-25 16:55:12.000000000 +0200
@@ -3,7 +3,7 @@
Name[af]=Tolk
Name[ar]=الصدفة
Name[as]=শ্বেল
-Name[ast]=Intérprete d'órdenes
+Name[ast]=Shell
Name[be@latin]=Abałonka
Name[bg]=Обвивка
Name[bn]=শেল
@@ -91,7 +91,7 @@
Comment[af]=Konsole verstekprofiel
Comment[ar]=لوحة الإعدادات المبدئية
Comment[as]=Konsole ৰ অবিকল্পিত পাৰ্শ্বৰূপ
-Comment[ast]=Perfil predetermináu de Konsole
+Comment[ast]=Perfil por defeutu de Konsole
Comment[be@latin]=Zmoŭčany profil prahramy „Konsole”
Comment[bg]=Профил по подразбиране за Konsole
Comment[bn]=কনসোল ডিফল্ট প্রোফাইল
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/desktop/konsole.notifyrc new/konsole-15.08.1/desktop/konsole.notifyrc
--- old/konsole-15.04.3/desktop/konsole.notifyrc 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/desktop/konsole.notifyrc 2015-08-25 16:55:12.000000000 +0200
@@ -95,7 +95,7 @@
Name[af]=Klokkie in die sigbare sessie
Name[ar]=الجرس في الجلسة الظاهرة
Name[as]=দেখি পোৱা অধিবেশনত ঘন্টা
-Name[ast]=Campana en sesión visible
+Name[ast]=Pitar nuna sesión visible
Name[be@latin]=Syhnał u dziejnaj sesii
Name[bg]=Звук във видимата сесия
Name[bn]=প্রদর্শিত সেশন-এ ঘণ্টা
@@ -175,7 +175,7 @@
Comment=Bell emitted within a visible session
Comment[af]=Klokkie word gelui in die sigbare sessie
Comment[ar]=الجرس المُصدر في جلسة ظاهرة
-Comment[ast]=Campana dada na sesión visible
+Comment[ast]=Pitíu emitíu dientro d'una sesión visible
Comment[be@latin]=U bačnaj sesii ŭźnik syhnał.
Comment[bg]=Изпълнение на звук във видимата сесия
Comment[bn]=একটি দৃশ্যমান সেশন-এ ঘণ্টা বেজেছে
@@ -262,7 +262,7 @@
Name=Bell in Non-Visible Session
Name[af]=Klokkie in nie-sigbare sessie
Name[ar]=الجرس في جلسة غير ظاهرة
-Name[ast]=Campana en sesión non visible
+Name[ast]=Pitar nuna sesión non visible
Name[be@latin]=Syhnał u niadziejnaj sesii
Name[bg]=Звук в невидима сесия
Name[bn]=আবৃত সেশন-এ ঘণ্টা
@@ -342,7 +342,7 @@
Comment=Bell emitted within a non-visible session
Comment[af]=Klokkie word gelui in die nie-sigbare sessie
Comment[ar]=جرس المُصدر في جلسة غير ظاهرة
-Comment[ast]=Campana dada nuna sesión non visible
+Comment[ast]=Pitíu emitíu dientro d'una sesión non visible
Comment[be@latin]=U niabačnaj sesii ŭźnik syhnał.
Comment[bg]=Изпълнение на звук в невидима сесия
Comment[bn]=একটি অদৃশ্য সেশন-এ ঘণ্টা বেজেছে
@@ -430,7 +430,7 @@
Name=Activity in Monitored Session
Name[af]=Aktiwiteit in gemonitorde sessie
Name[ar]=نشاط في الجلسة المُراقبة
-Name[ast]=Xera en sesión monitorizada
+Name[ast]=Actividá na sesión monitorizada
Name[be@latin]=Pieramieny ŭ adsočvanaj sesii
Name[bg]=Активност в наблюдаваната сесия
Name[bn]=মনিটর করা সেশন-এ ঘটনা
@@ -452,7 +452,7 @@
Name[fr]=Activité dans la session surveillée
Name[fy]=Aktiviteit yn observearre sesje
Name[ga]=Gníomhaíocht i Seisiún Monatóirithe
-Name[gl]=Actividade na sesión vixiada
+Name[gl]=Actividade na sesión supervisada
Name[gu]=દેખરેખ રાખેલ સત્રમાં ક્રિયા
Name[he]=פעילות בהפעלה מנוטרת
Name[hi]=मॉनीटर किए जा रहे सत्र में क्रियाकलाप
@@ -509,7 +509,7 @@
Comment=Activity detected in a monitored session
Comment[af]=Aktiwiteit bespeur in 'n sessie wat gemonitor word
Comment[ar]=تم اكتشاف نشاط في جلسةٍ مُراقبة
-Comment[ast]=Xera detectada nuna sesión monitorizada
+Comment[ast]=Actividá deteutada nuna sesión monitorizada
Comment[be@latin]=U adsočvanaj sesii zaŭvažanyja pieramieny.
Comment[bg]=Засечена е активност в наблюдаваната сесия
Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটেছে
@@ -532,7 +532,7 @@
Comment[fr]=Activité détectée dans une session surveillée
Comment[fy]=Aktiviteit ûntdutsen yn observearre sesje
Comment[ga]=Braitheadh gníomhaíocht i seisiún monatóirithe
-Comment[gl]=Detectouse actividade na sesión baixo seguimento
+Comment[gl]=Detectouse actividade na sesión supervisada
Comment[gu]=દેખરેખ રાખેલ સત્રમાં ક્રિયા નોંધાઇ
Comment[he]=זוהתה פעילות בהפעלה מנוטרת
Comment[hi]=मॉनीटर किए जा रहे सत्र में क्रियाकलाप का पता चला
@@ -596,7 +596,7 @@
Name=Silence in Monitored Session
Name[af]=Stilte in gemonitorde sessie
Name[ar]=لا نشاط في الجلسة المُراقبة
-Name[ast]=Silenciu en sesión monitorizada
+Name[ast]=Silenciu na sesión monitorizada
Name[be@latin]=Cišynia ŭ adsočvanaj sesii
Name[bg]=Неактивност в наблюдаваната сесия
Name[bn]=মনিটর করা সেশন চুপচাপ
@@ -618,7 +618,7 @@
Name[fr]=Inactivité dans la session surveillée
Name[fy]=Stilte yn observearre sesje
Name[ga]=Ciúnas i Seisiún Monatóirithe
-Name[gl]=Silencio na sesión vixiada
+Name[gl]=Silencio na sesión supervisada
Name[gu]=દેખરેખ રાખેલ સત્રમાં શાંતિ
Name[he]=שקט בהפעלה מנוטרת
Name[hi]=मॉनीटर किए जा रहे सत्र में शांति
@@ -675,7 +675,7 @@
Comment=Silence detected in a monitored session
Comment[af]=Stilte bespeur in 'n sessie wat gemonitor word
Comment[ar]=تم توقف النشاط في جلسةٍ مُراقبة
-Comment[ast]=Silenciu detectáu nuna sesión monitorizada
+Comment[ast]=Silenciu deteutáu nuna sesión monitorizada
Comment[be@latin]=U adsočvanaj sesii zaŭvažanaja cišynia.
Comment[bg]=Не е засечена активност в наблюдаваната сесия
Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটছে না
@@ -698,7 +698,7 @@
Comment[fr]=Inactivité détectée dans une session surveillée
Comment[fy]=Stilte ûntdutsen yn observearre sesje
Comment[ga]=Braitheadh ciúnas i seisiún monatóirithe
-Comment[gl]=Detectouse silencio nunha sesión baixo seguimento
+Comment[gl]=Detectouse silencio nunha sesión supervisada
Comment[gu]=દેખરેખ રાખેલ સત્રમાં શાંતિ નોંધાઇ
Comment[he]=התגלה שקט בהפעלה מנוטרת
Comment[hi]=मॉनीटर किए जा रहे सत्र में शांति का पता चला
@@ -761,7 +761,7 @@
Name=Session Finished With Non-Zero Status
Name[af]=Sessie het geëindig met nie-zero status
Name[ar]=انتهت الجلسة بحالة غير الصِفر
-Name[ast]=La sesión finó con un estáu distintu de cero
+Name[ast]=Sesión finada con un estáu distintu de cero
Name[be@latin]=Sesija skončyłasia ź nienulovym kodam stanu
Name[bg]=Сесия с изход, различен от 0
Name[bn]=সেশন নন-জিরো স্ট্যাটাস সমেত সমাপ্ত
@@ -843,7 +843,7 @@
Comment=A session has exited with non-zero status
Comment[af]='n Sessie het met 'n nie-zero status geëindig
Comment[ar]=خرجت جلسة بحالة تدل على حدوث خلل
-Comment[ast]=La sesión finó con un estáu distintu de cero
+Comment[ast]=Una sesión coló con un estáu distintu de cero
Comment[be@latin]=Sesija skončyłasia ź nienulovym kodam stanu.
Comment[bg]=Сесията е приключила със състояние, различно от 0
Comment[bn]=একটি সেশন নন-জিরো স্ট্যাটাস সমেত সমাপ্ত হয়েছে
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/desktop/konsolerun.desktop new/konsole-15.08.1/desktop/konsolerun.desktop
--- old/konsole-15.04.3/desktop/konsolerun.desktop 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/desktop/konsolerun.desktop 2015-08-25 16:55:12.000000000 +0200
@@ -12,6 +12,7 @@
Name=Run In Konsole
Name[ar]=شغل في كونسول
+Name[ast]=Executar en Konsole
Name[ca]=Executa en el Konsole
Name[ca@valencia]=Executa en el Konsole
Name[cs]=Spustit v Konsoli
@@ -32,6 +33,7 @@
Name[it]=Esegui in Konsole
Name[ja]=Konsole で実行
Name[ko]=Konsole에서 실행
+Name[lt]=Paleisti konsolėje
Name[nb]=Kjør i Konsole
Name[nds]=Binnen Konsole lopen
Name[nl]=In Konsole uitvoeren
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/desktop/org.kde.konsole.appdata.xml new/konsole-15.08.1/desktop/org.kde.konsole.appdata.xml
--- old/konsole-15.04.3/desktop/org.kde.konsole.appdata.xml 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/desktop/org.kde.konsole.appdata.xml 2015-08-25 16:55:12.000000000 +0200
@@ -13,7 +13,9 @@
<name xml:lang="en-GB">Konsole</name>
<name xml:lang="es">Konsole</name>
<name xml:lang="fi">Konsole</name>
+ <name xml:lang="gl">Konsole</name>
<name xml:lang="hu">Konsole</name>
+ <name xml:lang="ia">Konsole</name>
<name xml:lang="it">Konsole</name>
<name xml:lang="ko">Konsole</name>
<name xml:lang="nb">Konsole</name>
@@ -44,7 +46,9 @@
<summary xml:lang="en-GB">Terminal</summary>
<summary xml:lang="es">Terminal</summary>
<summary xml:lang="fi">Pääteikkuna</summary>
+ <summary xml:lang="gl">Terminal</summary>
<summary xml:lang="hu">Terminál</summary>
+ <summary xml:lang="ia">Terminal</summary>
<summary xml:lang="it">Terminale</summary>
<summary xml:lang="ko">터미널</summary>
<summary xml:lang="nb">Terminal</summary>
@@ -75,6 +79,7 @@
<p xml:lang="en-GB">Konsole is a terminal emulator.</p>
<p xml:lang="es">Konsole es un emulador de terminal.</p>
<p xml:lang="fi">Konsole on pääte-emulaattori.</p>
+ <p xml:lang="gl">Konsole é un emulador de terminal.</p>
<p xml:lang="hu">A Konsole egy terminálemulátor.</p>
<p xml:lang="it">Konsole è un emulatore di terminale.</p>
<p xml:lang="ko">Konsole은 터미널 에뮬레이터입니다.</p>
@@ -106,7 +111,9 @@
<p xml:lang="en-GB">Features:</p>
<p xml:lang="es">Funcionalidades:</p>
<p xml:lang="fi">Ominaisuuksia:</p>
+ <p xml:lang="gl">Funcionalidades:</p>
<p xml:lang="hu">Szolgáltatások:</p>
+ <p xml:lang="ia">Characteristicas:</p>
<p xml:lang="it">Funzionalità:</p>
<p xml:lang="ko">기능:</p>
<p xml:lang="nb">Funksjoner:</p>
@@ -138,7 +145,9 @@
<li xml:lang="en-GB">Tabs</li>
<li xml:lang="es">Pestañas</li>
<li xml:lang="fi">Välilehdet</li>
+ <li xml:lang="gl">Lapelas.</li>
<li xml:lang="hu">Lapok</li>
+ <li xml:lang="ia">Schedas</li>
<li xml:lang="it">Schede</li>
<li xml:lang="ko">탭</li>
<li xml:lang="nb">Faner</li>
@@ -161,12 +170,14 @@
<li xml:lang="zh-CN">标签</li>
<li xml:lang="zh-TW">分頁</li>
<li>Multiple profiles</li>
+ <li xml:lang="ast">Perfiles múltiples</li>
<li xml:lang="ca">Perfils múltiples</li>
<li xml:lang="cs">Možnost mít několik profilů</li>
<li xml:lang="de">Mehrere Profile</li>
<li xml:lang="en-GB">Multiple profiles</li>
<li xml:lang="es">Perfiles múltiples</li>
<li xml:lang="fi">Useat profiilit</li>
+ <li xml:lang="gl">Varios perfís.</li>
<li xml:lang="hu">Több profil használatának lehetősége</li>
<li xml:lang="it">Profili multipli</li>
<li xml:lang="ko">다중 프로필</li>
@@ -196,6 +207,7 @@
<li xml:lang="en-GB">Silence and Activity monitoring</li>
<li xml:lang="es">Supervisión de silencios y actividad</li>
<li xml:lang="fi">Hiljaisuuden ja aktiivisuuden tarkkailu</li>
+ <li xml:lang="gl">Control de actividade e inactividade.</li>
<li xml:lang="hu">Üresjárat- és aktivitásmonitorozás</li>
<li xml:lang="it">Monitoraggio del silenzio e dell'attività</li>
<li xml:lang="ko">무음 및 활동 모니터링</li>
@@ -219,12 +231,14 @@
<li xml:lang="zh-CN">沉默和活动监视</li>
<li xml:lang="zh-TW">靜音與活動監控</li>
<li>Bookmark support</li>
+ <li xml:lang="ast">Sofitu de marcadores</li>
<li xml:lang="ca">Implementació de punts</li>
<li xml:lang="cs">Podpora záložek</li>
<li xml:lang="de">Lesezeichen-Unterstützung</li>
<li xml:lang="en-GB">Bookmark support</li>
<li xml:lang="es">Uso de marcadores</li>
<li xml:lang="fi">Kirjanmerkkituki</li>
+ <li xml:lang="gl">Marcadores.</li>
<li xml:lang="hu">Könyvjelzők támogatása</li>
<li xml:lang="it">Supporto dei segnalibri</li>
<li xml:lang="ko">책갈피 지원</li>
@@ -248,13 +262,16 @@
<li xml:lang="zh-CN">书签支持</li>
<li xml:lang="zh-TW">書籤支援</li>
<li>Searching</li>
+ <li xml:lang="ast">Gueta</li>
<li xml:lang="ca">Cerques</li>
<li xml:lang="cs">Hledání</li>
<li xml:lang="de">Suchen</li>
<li xml:lang="en-GB">Searching</li>
<li xml:lang="es">Búsqueda</li>
<li xml:lang="fi">Haku</li>
+ <li xml:lang="gl">Busca.</li>
<li xml:lang="hu">Keresés</li>
+ <li xml:lang="ia">Cercante</li>
<li xml:lang="it">Ricerca</li>
<li xml:lang="ko">찾기</li>
<li xml:lang="nb">Søking</li>
@@ -283,6 +300,7 @@
<li xml:lang="en-GB">Saving output</li>
<li xml:lang="es">Guardar la salida</li>
<li xml:lang="fi">Tulosteen tallennus</li>
+ <li xml:lang="gl">Posibilidade de gardar a saída.</li>
<li xml:lang="hu">Kimenet mentése</li>
<li xml:lang="it">Salvataggio del risultato</li>
<li xml:lang="ko">출력 저장</li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/desktop/org.kde.konsole.desktop new/konsole-15.08.1/desktop/org.kde.konsole.desktop
--- old/konsole-15.04.3/desktop/org.kde.konsole.desktop 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/desktop/org.kde.konsole.desktop 2015-08-25 16:55:12.000000000 +0200
@@ -191,6 +191,7 @@
[Desktop Action NewWindow]
Name=Open a New Window
Name[ar]=افتح نافذة جديدة
+Name[ast]=Abrir una ventana nueva
Name[bs]=Otvori u novom prozoru
Name[ca]=Obre una finestra nova
Name[ca@valencia]=Obri una finestra nova
@@ -211,6 +212,7 @@
Name[is]=Opna nýjan glugga
Name[it]=Apri in una nuova finestra
Name[ko]=새 창 열기
+Name[lt]=Atverti naujame lange
Name[nb]=Åpne et nytt vindu
Name[nds]=En nieg Finster opmaken
Name[nl]=Een nieuw venster openen
Files old/konsole-15.04.3/doc/manual/draganddrop-contextmenu.png and new/konsole-15.08.1/doc/manual/draganddrop-contextmenu.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/doc/manual/index.docbook new/konsole-15.08.1/doc/manual/index.docbook
--- old/konsole-15.04.3/doc/manual/index.docbook 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/doc/manual/index.docbook 2015-08-25 16:55:12.000000000 +0200
@@ -46,8 +46,8 @@
<legalnotice>&FDLNotice;</legalnotice>
-<date>2014-02-09</date>
-<releaseinfo>2.13 (&kde; 4.13)</releaseinfo>
+<date>2015-05-27</date>
+<releaseinfo>15.04</releaseinfo>
<abstract><para>&konsole; is &kde;'s terminal emulator.</para></abstract>
@@ -384,7 +384,9 @@
</varlistentry>
<varlistentry>
-<term><menuchoice><guimenu>File</guimenu>
+<term><menuchoice>
+<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo></shortcut>
+<guimenu>File</guimenu>
<guimenuitem>Save Output As...</guimenuitem></menuchoice></term>
<listitem><para><action>Saves the current scrollback as a text or html
file</action></para></listitem>
@@ -424,7 +426,7 @@
<term><menuchoice>
<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Q</keycap></keycombo></shortcut>
<guimenu>File</guimenu>
-<guimenuitem>Quit</guimenuitem></menuchoice>
+<guimenuitem>Close Window</guimenuitem></menuchoice>
</term>
<listitem><para><action>Quits &konsole;</action></para>
<note><para>&konsole; will display a confirmation dialog if there is more than one
@@ -610,7 +612,7 @@
<guimenu>Edit</guimenu><guimenuitem>Find
Next</guimenuitem></menuchoice></term>
<listitem><para><action>Moves to the next search instance
-</action></para></listitem>
+</action>. If the search bar has the focus, you can use the shortcut &Enter; as well.</para></listitem>
</varlistentry>
<varlistentry>
@@ -619,7 +621,7 @@
<guimenu>Edit</guimenu><guimenuitem>Find
Previous</guimenuitem></menuchoice></term>
<listitem><para><action>Moves to the previous search instance
-</action></para></listitem>
+</action>. If the search bar has the focus, you can use the shortcut <keycombo action="simul">&Shift;&Enter;</keycombo> as well.</para></listitem>
</varlistentry>
@@ -852,11 +854,11 @@
<guimenu>Settings</guimenu><guimenuitem>Show
Menu Bar</guimenuitem></menuchoice></term>
<listitem><para><action>Toggles the menubar being visible</action></para></listitem>
-<!-- http://forum.kde.org/viewtopic.php?f=227&t=107321&p=262667&view=lastpost#p248129 -->
</varlistentry>
<varlistentry>
<term><menuchoice>
+<shortcut><keycap>F11</keycap></shortcut>
<guimenu>Settings</guimenu><guimenuitem>Full Screen Mode</guimenuitem></menuchoice></term>
<listitem><para><action>Toggles &konsole; filling the entire screen</action></para></listitem>
</varlistentry>
@@ -1165,7 +1167,8 @@
</para>
<para>
For more information, please visit
-<ulink url="http://api.kde.org/4.x-api/kde-baseapps-apidocs/konsole/html/classKonsole_1_1Profile.html#a57848e15fe69d3f27565851fe7cda429">&konsole; API Reference</ulink>.
+<ulink url="http://api.kde.org/4.14-api/applications-apidocs/konsole/html/classKonsole_1_1Profile.html#a57848e15fe69d3f27565851fe7cda429">&konsole; API Reference</ulink>.
+<!--FIXME update url to kf5 if available on api.kde.org-->
</para>
</listitem>
</varlistentry>
@@ -1262,8 +1265,7 @@
<chapter id="scripting">
<title>Scripting &konsole;</title>
-<para>For &kde; 4, the old &DCOP; has been replaced with &DBus;.
-&konsole; does support numerous methods that can be used with &DBus;.
+<para>&konsole; does support numerous methods that can be used with &DBus;.
</para>
<para>There are two ways to use the &DBus; interface: &Qt;'s &GUI;
<application>qdbusviewer</application>
@@ -1486,7 +1488,7 @@
</listitem>
<listitem><para>
-In KDE3, each tab had its own process ID. However, in KDE4, all the tabs use the same process ID. This has the side-effect that if one tab's process has issues, all the other tabs may experience issues as well.
+Since KDE4 all the tabs use the same process ID. This has the side-effect that if one tab's process has issues, all the other tabs may experience issues as well.
</para>
<para>
This is most noticeable when a command that connects to an external device or system (ssh, nfs) has issues.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/Application.cpp new/konsole-15.08.1/src/Application.cpp
--- old/konsole-15.04.3/src/Application.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/Application.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -26,7 +26,6 @@
#include
// KDE
-#include <KAction>
#include <KActionCollection>
#include <KCmdLineArgs>
#include <QDebug>
@@ -49,6 +48,9 @@
{
_backgroundInstance = 0;
+ // enable high dpi support
+ setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+
#if defined(Q_OS_MAC)
// this ensures that Ctrl and Meta are not swapped, so CTRL-C and friends
// will work correctly in the terminal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/CMakeLists.txt new/konsole-15.08.1/src/CMakeLists.txt
--- old/konsole-15.04.3/src/CMakeLists.txt 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/CMakeLists.txt 2015-08-25 16:55:12.000000000 +0200
@@ -131,7 +131,6 @@
KF5::Bookmarks
KF5::I18n
KF5::Pty
- KF5::KDELibs4Support
KF5::KIOWidgets
)
@@ -155,11 +154,9 @@
settings/GeneralSettings.ui
settings/TabBarSettings.ui)
-add_library(konsoleprivate SHARED ${konsoleprivate_SRCS})
+add_library(konsoleprivate ${konsoleprivate_SRCS})
generate_export_header(konsoleprivate BASE_NAME konsoleprivate)
-target_link_libraries(konsoleprivate ${konsole_LIBS}
-)
-target_link_libraries(konsoleprivate LINK_INTERFACE_LIBRARIES ${konsole_LIBS})
+target_link_libraries(konsoleprivate PUBLIC ${konsole_LIBS})
set_target_properties(konsoleprivate PROPERTIES
VERSION ${KONSOLEPRIVATE_VERSION_STRING}
@@ -184,6 +181,7 @@
KF5::I18n
KF5::KIOWidgets
KF5::NotifyConfig
+ KF5::KDELibs4Support
)
install(TARGETS kdeinit_konsole konsole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/Character.h new/konsole-15.08.1/src/Character.h
--- old/konsole-15.04.3/src/Character.h 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/Character.h 2015-08-25 16:55:12.000000000 +0200
@@ -49,24 +49,14 @@
* Unicode character in the range of U+2500 ~ U+257F are known as line
* characters, or box-drawing characters. Currently, konsole draws those
* characters itself, instead of using the glyph provided by the font.
- * Unfortunately, some line characters can't be simulated by the existing 5x5
- * pixel matrix. Typical examples are ╳(U+2573) and ╰(U+2570). So those
- * unsupported line characters should be drawn in the normal way .
+ * Unfortunately, the triple and quadruple dash lines (┄┅┆┇┈┉┊┋) are too
+ * detailed too be drawn cleanly at normal font scales without anti
+ * -aliasing, so those are drawn as regular characters.
*/
inline bool isSupportedLineChar(quint16 codePoint)
{
- if ((codePoint & 0xFF80) != 0x2500) {
- return false;
- }
-
- uchar index = (codePoint & 0x007F);
- if ((index >= 0x04 && index <= 0x0B) ||
- (index >= 0x4C && index <= 0x4F) ||
- (index >= 0x6D && index <= 0x73)) {
- return false;
- } else {
- return true;
- }
+ return (codePoint & 0xFF80) == 0x2500 // Unicode block: Mathematical Symbols - Box Drawing
+ && !(0x2504 <= codePoint && codePoint <= 0x250B); // Triple and quadruple dash range
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/ColorSchemeEditor.cpp new/konsole-15.08.1/src/ColorSchemeEditor.cpp
--- old/konsole-15.04.3/src/ColorSchemeEditor.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/ColorSchemeEditor.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -183,9 +183,9 @@
fileFormats += ")";
const QString fileName = QFileDialog::getOpenFileName(this,
- i18nc("@action:button", "Select wallpaper image file"),
+ i18nc("@title:window", "Select wallpaper image file"),
_ui->wallpaperPath->text(),
- i18nc("@action:button", "Supported Images") + fileFormats);
+ i18nc("Filter in file open dialog", "Supported Images") + fileFormats);
if (!fileName.isEmpty())
_ui->wallpaperPath->setText(fileName);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/History.h new/konsole-15.08.1/src/History.h
--- old/konsole-15.04.3/src/History.h 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/History.h 2015-08-25 16:55:12.000000000 +0200
@@ -83,7 +83,7 @@
//////////////////////////////////////////////////////////////////////
class HistoryType;
-class HistoryScroll
+class KONSOLEPRIVATE_EXPORT HistoryScroll
{
public:
explicit HistoryScroll(HistoryType*);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/MainWindow.cpp new/konsole-15.08.1/src/MainWindow.cpp
--- old/konsole-15.04.3/src/MainWindow.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/MainWindow.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -25,7 +25,6 @@
// KDE
#include <KAcceleratorManager>
-#include <KAction>
#include <KActionCollection>
#include <KActionMenu>
#include <KCmdLineArgs>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/Profile.cpp new/konsole-15.08.1/src/Profile.cpp
--- old/konsole-15.04.3/src/Profile.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/Profile.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -142,8 +142,8 @@
: Profile()
{
// Fallback settings
- setProperty(Name, i18n("Shell"));
- setProperty(UntranslatedName, "Shell");
+ setProperty(Name, i18nc("Name of the default/builtin profile", "Default"));
+ setProperty(UntranslatedName, "Default");
// magic path for the fallback profile which is not a valid
// non-directory file name
setProperty(Path, "FALLBACK/");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/ProfileManager.cpp new/konsole-15.08.1/src/ProfileManager.cpp
--- old/konsole-15.04.3/src/ProfileManager.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/ProfileManager.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -33,6 +33,7 @@
#include <KConfig>
#include <QDebug>
#include <KConfigGroup>
+#include <KLocalizedString>
// Konsole
#include "ProfileReader.h"
@@ -342,6 +343,37 @@
// never save a profile with empty name into disk!
persistent = persistent && !profile->name().isEmpty();
+ // If we are asked to store the fallback profile (which has an
+ // invalid path by design), we reset the path to an empty string
+ // which will make the profile writer automatically generate a
+ // proper path.
+ if (persistent && profile->path() == _fallbackProfile->path()) {
+ profile = new Profile(profile);
+
+ // Generate a new name, so it is obvious what is actually built-in
+ // in the profile manager
+ QListProfile::Ptr existingProfiles = allProfiles();
+ QStringList existingProfileNames;
+ foreach(Profile::Ptr existingProfile, existingProfiles) {
+ existingProfileNames.append(existingProfile->name());
+ }
+
+ int nameSuffix = 1;
+ QString newName;
+ QString newTranslatedName;
+ do {
+ newName = QStringLiteral("Profile ") + QString::number(nameSuffix);
+ newTranslatedName = i18nc("The default name of a profile", "Profile #%1", nameSuffix);
+ nameSuffix++;
+ } while (existingProfileNames.contains(newName));
+
+ profile->setProperty(Profile::UntranslatedName, newName);
+ profile->setProperty(Profile::Name, newTranslatedName);
+
+ addProfile(profile);
+ setDefaultProfile(profile);
+ }
+
// when changing a group, iterate through the profiles
// in the group and call changeProfile() on each of them
//
@@ -356,14 +388,14 @@
return;
}
- // notify the world about the change
- emit profileChanged(profile);
-
// save changes to disk, unless the profile is hidden, in which case
// it has no file on disk
if (persistent && !profile->isHidden()) {
profile->setProperty(Profile::Path, saveProfile(profile));
}
+
+ // notify the world about the change
+ emit profileChanged(profile);
}
void ProfileManager::addProfile(Profile::Ptr profile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/SessionController.cpp new/konsole-15.08.1/src/SessionController.cpp
--- old/konsole-15.04.3/src/SessionController.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/SessionController.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -435,7 +435,7 @@
void SessionController::configureWebShortcuts()
{
- KToolInvocation::kdeinitExec("kcmshell4", QStringList() << "ebrowsing");
+ KToolInvocation::kdeinitExec("kcmshell5", QStringList() << "webshortcuts");
}
void SessionController::sendSignal(QAction* action)
@@ -1576,7 +1576,7 @@
}
if (!zmodem.isEmpty()) {
const QString path = QFileDialog::getExistingDirectory(_view,
- i18n("Save ZModem Download to ..."),
+ i18n("Save ZModem Download to..."),
QDir::homePath(),
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
@@ -1716,10 +1716,11 @@
// from.
// this is set to -1 to indicate the job has just been started
- if ((dialog->mimeTypeFilters()).contains("text/html"), Qt::CaseInsensitive)
+ if ((dialog->selectedNameFilter()).contains("html", Qt::CaseInsensitive)) {
jobInfo.decoder = new HTMLDecoder();
- else
+ } else {
jobInfo.decoder = new PlainTextDecoder();
+ }
_jobSession.insert(job, jobInfo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/TerminalCharacterDecoder.cpp new/konsole-15.08.1/src/TerminalCharacterDecoder.cpp
--- old/konsole-15.04.3/src/TerminalCharacterDecoder.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/TerminalCharacterDecoder.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -152,16 +152,6 @@
QString text;
- text.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n");
- text.append("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
- text.append("http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n");
- text.append("<head>\n");
- text.append("<title>Konsole output</title>\n");
- text.append("\n");
- text.append("</head>\n");
- text.append("<body>\n");
- text.append("<div>\n");
-
//open monospace span
openSpan(text, "font-family:monospace");
@@ -175,9 +165,6 @@
QString text;
closeSpan(text);
- text.append("</div>\n");
- text.append("</body>\n");
- text.append("</html>\n");
*_output << text;
@@ -275,7 +262,7 @@
}
//start new line
- text.append("<br />");
+ text.append("<br>");
*_output << text;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/TerminalDisplay.cpp new/konsole-15.08.1/src/TerminalDisplay.cpp
--- old/konsole-15.04.3/src/TerminalDisplay.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/TerminalDisplay.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -70,6 +70,7 @@
#include "TerminalDisplayAccessible.h"
#include "SessionManager.h"
#include "Session.h"
+#include "WindowSystemInfo.h"
using namespace Konsole;
@@ -542,6 +543,87 @@
paint.drawPoint(cx + 1, cy + 1);
}
+static void drawOtherChar(QPainter& paint, int x, int y, int w, int h, uchar code)
+{
+ //Calculate cell midpoints, end points.
+ const int cx = x + w / 2;
+ const int cy = y + h / 2;
+ const int ex = x + w - 1;
+ const int ey = y + h - 1;
+
+ // Double dashes
+ if (0x4C <= code && code <= 0x4F) {
+ const int xHalfGap = qMax(w / 15, 1);
+ const int yHalfGap = qMax(h / 15, 1);
+ switch (code) {
+ case 0x4D: // BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL
+ paint.drawLine(x, cy - 1, cx - xHalfGap - 1, cy - 1);
+ paint.drawLine(x, cy + 1, cx - xHalfGap - 1, cy + 1);
+ paint.drawLine(cx + xHalfGap, cy - 1, ex, cy - 1);
+ paint.drawLine(cx + xHalfGap, cy + 1, ex, cy + 1);
+ // No break!
+ case 0x4C: // BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL
+ paint.drawLine(x, cy, cx - xHalfGap - 1, cy);
+ paint.drawLine(cx + xHalfGap, cy, ex, cy);
+ break;
+ case 0x4F: // BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL
+ paint.drawLine(cx - 1, y, cx - 1, cy - yHalfGap - 1);
+ paint.drawLine(cx + 1, y, cx + 1, cy - yHalfGap - 1);
+ paint.drawLine(cx - 1, cy + yHalfGap, cx - 1, ey);
+ paint.drawLine(cx + 1, cy + yHalfGap, cx + 1, ey);
+ // No break!
+ case 0x4E: // BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL
+ paint.drawLine(cx, y, cx, cy - yHalfGap - 1);
+ paint.drawLine(cx, cy + yHalfGap, cx, ey);
+ break;
+ }
+ }
+
+ // Rounded corner characters
+ else if (0x6D <= code && code <= 0x70) {
+ const int r = w * 3 / 8;
+ const int d = 2 * r;
+ switch (code) {
+ case 0x6D: // BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
+ paint.drawLine(cx, cy + r, cx, ey);
+ paint.drawLine(cx + r, cy, ex, cy);
+ paint.drawArc(cx, cy, d, d, 90 * 16, 90 * 16);
+ break;
+ case 0x6E: // BOX DRAWINGS LIGHT ARC DOWN AND LEFT
+ paint.drawLine(cx, cy + r, cx, ey);
+ paint.drawLine(x, cy, cx - r, cy);
+ paint.drawArc(cx - d, cy, d, d, 0 * 16, 90 * 16);
+ break;
+ case 0x6F: // BOX DRAWINGS LIGHT ARC UP AND LEFT
+ paint.drawLine(cx, y, cx, cy - r);
+ paint.drawLine(x, cy, cx - r, cy);
+ paint.drawArc(cx - d, cy - d, d, d, 270 * 16, 90 * 16);
+ break;
+ case 0x70: // BOX DRAWINGS LIGHT ARC UP AND RIGHT
+ paint.drawLine(cx, y, cx, cy - r);
+ paint.drawLine(cx + r, cy, ex, cy);
+ paint.drawArc(cx, cy - d, d, d, 180 * 16, 90 * 16);
+ break;
+ }
+ }
+
+ // Diagonals
+ else if (0x71 <= code && code <= 0x73) {
+ switch (code) {
+ case 0x71: // BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
+ paint.drawLine(ex, y, x, ey);
+ break;
+ case 0x72: // BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
+ paint.drawLine(x, y, ex, ey);
+ break;
+ case 0x73: // BOX DRAWINGS LIGHT DIAGONAL CROSS
+ paint.drawLine(ex, y, x, ey);
+ paint.drawLine(x, y, ex, ey);
+ break;
+ }
+ }
+}
+
void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const QString& str,
const Character* attributes)
{
@@ -557,6 +639,8 @@
const uchar code = str[i].cell();
if (LineChars[code])
drawLineChar(painter, x + (_fontWidth * i), y, _fontWidth, _fontHeight, code);
+ else
+ drawOtherChar(painter, x + (_fontWidth * i), y, _fontWidth, _fontHeight, code);
}
painter.setPen(originalPen);
@@ -653,8 +737,9 @@
if (_cursorBlinking)
return;
- QRect cursorRect = rect;
- cursorRect.setHeight(_fontHeight - _lineSpacing - 1);
+ // shift rectangle top down one pixel to leave some space
+ // between top and bottom
+ QRect cursorRect = rect.adjusted(0, 1, 0, 0);
QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor;
painter.setPen(cursorColor);
@@ -974,7 +1059,8 @@
// optimization - scroll the existing image where possible and
// avoid expensive text drawing for parts of the image that
// can simply be moved up or down
- if (_wallpaper->isNull()) {
+ // disable this shortcut for transparent konsole with scaled pixels, otherwise we get rendering artefacts, see BUG 350651
+ if (!(WindowSystemInfo::HAVE_TRANSPARENCY && (qApp->devicePixelRatio() > 1.0)) && _wallpaper->isNull()) {
scrollImage(_screenWindow->scrollCount() ,
_screenWindow->scrollRegion());
_screenWindow->resetScrollCount();
@@ -2398,7 +2484,7 @@
_sessionController->setSearchStartToWindowCurrentLine();
}
-/* Moving left/up from the line containing pnt, return the starting
+/* Moving left/up from the line containing pnt, return the starting
offset point which the given line is continiously wrapped
(top left corner = 0,0; previous line not visible = 0,-1).
*/
@@ -2431,7 +2517,7 @@
return QPoint(0, lineInHistory - topVisibleLine);
}
-/* Moving right/down from the line containing pnt, return the ending
+/* Moving right/down from the line containing pnt, return the ending
offset point which the given line is continiously wrapped.
*/
QPoint TerminalDisplay::findLineEnd(const QPoint &pnt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/ViewContainer.cpp new/konsole-15.08.1/src/ViewContainer.cpp
--- old/konsole-15.04.3/src/ViewContainer.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/ViewContainer.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -264,9 +264,7 @@
connect(_tabBar, &Konsole::ViewContainerTabBar::moveViewRequest, this, &Konsole::TabbedViewContainer::onMoveViewRequest);
connect(_tabBar, &Konsole::ViewContainerTabBar::customContextMenuRequested, this, &Konsole::TabbedViewContainer::openTabContextMenu);
- // The below need converted to work with Qt5 QTabBar
- //connect(_tabBar, &Konsole::ViewContainerTabBar::wheelDelta, this, &Konsole::TabbedViewContainer::wheelScrolled);
- //connect(_tabBar, &Konsole::ViewContainerTabBar::initiateDrag, this, &Konsole::TabbedViewContainer::startTabDrag);
+ connect(_tabBar, &Konsole::ViewContainerTabBar::initiateDrag, this, &Konsole::TabbedViewContainer::startTabDrag);
// The context menu of tab bar
_contextPopupMenu = new QMenu(_tabBar);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/ViewContainerTabBar.cpp new/konsole-15.08.1/src/ViewContainerTabBar.cpp
--- old/konsole-15.04.3/src/ViewContainerTabBar.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/ViewContainerTabBar.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -30,6 +30,7 @@
#include
#include
#include <QTabBar>
+#include <QApplication>
// KDE
#include <KLocalizedString>
@@ -50,11 +51,37 @@
setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
setElideMode(Qt::ElideLeft);
+ setAcceptDrops(true);
+ setMouseTracking(true);
+
setWhatsThis(xi18nc("@info:whatsthis",
"<title>Tab Bar</title>"
"<para>The tab bar allows you to switch and move tabs. You can double-click a tab to change its name.</para>"));
}
+void ViewContainerTabBar::mousePressEvent(QMouseEvent* event)
+{
+ if (event->buttons() == Qt::LeftButton) {
+ _dragStart = event->pos();
+ }
+ QTabBar::mousePressEvent(event);
+}
+
+void ViewContainerTabBar::mouseMoveEvent(QMouseEvent* event)
+{
+ if (event->buttons() == Qt::LeftButton) {
+ QPoint dragPos = _dragStart - event->pos();
+ if (dragPos.manhattanLength() > QApplication::startDragDistance()) {
+ int tab = tabAt(_dragStart);
+ if (tab != -1) {
+ emit initiateDrag(tab);
+ }
+ }
+ }
+ QTabBar::mouseMoveEvent(event);
+}
+
+
void ViewContainerTabBar::dragEnterEvent(QDragEnterEvent* event)
{
if (event->mimeData()->hasFormat(_supportedMimeType) &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/ViewContainerTabBar.h new/konsole-15.08.1/src/ViewContainerTabBar.h
--- old/konsole-15.04.3/src/ViewContainerTabBar.h 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/ViewContainerTabBar.h 2015-08-25 16:55:12.000000000 +0200
@@ -47,14 +47,17 @@
TabbedViewContainer* connectedTabbedViewContainer();
signals:
+ void initiateDrag(int index);
void querySourceIndex(const QDropEvent* event, int& sourceIndex) const;
void moveViewRequest(int index, const QDropEvent* event, bool& success, TabbedViewContainer* sourceTabbedContainer);
protected:
- virtual void dragEnterEvent(QDragEnterEvent* event);
- virtual void dragLeaveEvent(QDragLeaveEvent* event);
- virtual void dragMoveEvent(QDragMoveEvent* event);
- virtual void dropEvent(QDropEvent* event);
+ void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+ virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
+ virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
+ virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
+ virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
private:
// show the indicator arrow which shows where a dropped tab will
@@ -74,6 +77,8 @@
bool _drawIndicatorDisabled;
QString _supportedMimeType;
TabbedViewContainer* _connectedContainer;
+ QPoint _dragStart;
+
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/autotests/CMakeLists.txt new/konsole-15.08.1/src/autotests/CMakeLists.txt
--- old/konsole-15.04.3/src/autotests/CMakeLists.txt 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/autotests/CMakeLists.txt 2015-08-25 16:55:12.000000000 +0200
@@ -19,13 +19,13 @@
add_executable(DBusTest DBusTest.cpp)
ecm_mark_as_test(DBusTest)
add_test(DBusTest DBusTest)
- target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS} Qt5::DBus)
+ target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS} Qt5::DBus KF5::KDELibs4Support)
endif()
add_executable(HistoryTest HistoryTest.cpp)
ecm_mark_as_test(HistoryTest)
add_test(HistoryTest HistoryTest)
-target_link_libraries(HistoryTest ${KONSOLE_TEST_LIBS})
+target_link_libraries(HistoryTest ${KONSOLE_TEST_LIBS} KF5::KDELibs4Support)
add_executable(KeyboardTranslatorTest KeyboardTranslatorTest.cpp)
@@ -37,7 +37,7 @@
add_executable(PartTest PartTest.cpp)
ecm_mark_as_test(PartTest)
add_test(PartTest PartTest)
- target_link_libraries(PartTest KF5::XmlGui KF5::Parts KF5::Pty
+ target_link_libraries(PartTest KF5::XmlGui KF5::Parts KF5::Pty KF5::KDELibs4Support
${KONSOLE_TEST_LIBS})
endif()
@@ -54,7 +54,7 @@
add_executable(SessionTest SessionTest.cpp)
ecm_mark_as_test(SessionTest)
add_test(SessionTest SessionTest)
-target_link_libraries(SessionTest ${KONSOLE_TEST_LIBS})
+target_link_libraries(SessionTest ${KONSOLE_TEST_LIBS} KF5::KDELibs4Support)
add_executable(ShellCommandTest ShellCommandTest.cpp)
ecm_mark_as_test(ShellCommandTest)
@@ -70,7 +70,7 @@
add_executable(TerminalTest TerminalTest.cpp)
ecm_mark_as_test(TerminalTest)
add_test(TerminalTest TerminalTest)
-target_link_libraries(TerminalTest ${KONSOLE_TEST_LIBS})
+target_link_libraries(TerminalTest ${KONSOLE_TEST_LIBS} KF5::KDELibs4Support)
##add_executable(TerminalInterfaceTest TerminalInterfaceTest.cpp)
##ecm_mark_as_test(TerminalInterface)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/autotests/DBusTest.cpp new/konsole-15.08.1/src/autotests/DBusTest.cpp
--- old/konsole-15.04.3/src/autotests/DBusTest.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/autotests/DBusTest.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -20,6 +20,8 @@
// Own
#include "DBusTest.h"
#include "../Session.h"
+#include <KDebug>
+#include <KProcess>
using namespace Konsole;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/autotests/DBusTest.h new/konsole-15.08.1/src/autotests/DBusTest.h
--- old/konsole-15.04.3/src/autotests/DBusTest.h 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/autotests/DBusTest.h 2015-08-25 16:55:12.000000000 +0200
@@ -25,8 +25,6 @@
#include
#include
#include
-#include <KDebug>
-#include <KProcess>
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.04.3/src/main.cpp new/konsole-15.08.1/src/main.cpp
--- old/konsole-15.04.3/src/main.cpp 2015-05-30 13:45:09.000000000 +0200
+++ new/konsole-15.08.1/src/main.cpp 2015-08-25 16:55:12.000000000 +0200
@@ -24,6 +24,7 @@
// OS specific
#include
+#include <QDir>
// KDE
#include
@@ -31,7 +32,7 @@
#include <KLocalizedString>
#include
#include <Kdelibs4ConfigMigrator>
-
+#include <Kdelibs4Migration>
using Konsole::Application;
@@ -54,9 +55,31 @@
extern "C" int KDE_EXPORT kdemain(int argc, char** argv)
{
Kdelibs4ConfigMigrator migrate(QLatin1String("konsole"));
- migrate.setConfigFiles(QStringList() << QLatin1String("konsolerc") << QLatin1String("konsole.notifyrc"));
- migrate.setUiFiles(QStringList() << QLatin1String("sessionui.rc") << QLatin1String("partui.rc") << QLatin1String("konsoleui.rc"));
- migrate.migrate();
+ migrate.setConfigFiles(QStringList() << QStringLiteral("konsolerc") << QLatin1String("konsole.notifyrc"));
+ migrate.setUiFiles(QStringList() << QStringLiteral("sessionui.rc") << QLatin1String("partui.rc") << QLatin1String("konsoleui.rc"));
+
+ if (migrate.migrate()) {
+ Kdelibs4Migration dataMigrator;
+ const QString sourceBasePath = dataMigrator.saveLocation("data", "konsole");
+ const QString targetBasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/konsole/");
+ QString targetFilePath;
+
+ QDir sourceDir(sourceBasePath);
+ QDir targetDir(targetBasePath);
+
+ if(sourceDir.exists()) {
+ if(!targetDir.exists()) {
+ QDir().mkpath(targetBasePath);
+ }
+ QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+ foreach (const QString &fileName, fileNames) {
+ targetFilePath = targetBasePath + fileName;
+ if(!QFile::exists(targetFilePath)) {
+ QFile::copy(sourceBasePath + fileName, targetFilePath);
+ }
+ }
+ }
+ }
K4AboutData about("konsole",
0,