Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules (>= 1.3.0~),
- kdoctools-dev (>= 5.6.0~),
- kinit-dev (>= 5.6.0~),
- kio-dev (>= 5.6.0~),
+ extra-cmake-modules (>= 5.24.0~),
+ kdoctools-dev (>= 5.24.0~),
+ kinit-dev (>= 5.24.0~),
+ kio-dev (>= 5.24.0~),
libgit2-dev,
- libkf5activities-dev (>= 5.6.0~),
- libkf5config-dev (>= 5.6.0~),
- libkf5crash-dev (>= 5.6.0~),
- libkf5dbusaddons-dev,
- libkf5guiaddons-dev (>= 5.6.0~),
- libkf5i18n-dev (>= 5.6.0~),
- libkf5iconthemes-dev (>= 5.6.0~),
- libkf5itemmodels-dev,
- libkf5jobwidgets-dev (>= 5.6.0~),
- libkf5newstuff-dev,
- libkf5notifications-dev,
- libkf5parts-dev (>= 5.6.0~),
- libkf5service-dev,
- libkf5texteditor-dev (>= 5.6.0~),
- libkf5threadweaver-dev,
- libkf5wallet-dev,
- libkf5windowsystem-dev (>= 5.6.0~),
- libkf5xmlgui-dev (>= 5.6.0~),
+ libkf5activities-dev (>= 5.24.0~),
+ libkf5config-dev (>= 5.24.0~),
+ libkf5crash-dev (>= 5.24.0~),
+ libkf5dbusaddons-dev (>= 5.24.0~),
+ libkf5guiaddons-dev (>= 5.24.0~),
+ libkf5i18n-dev (>= 5.24.0~),
+ libkf5iconthemes-dev (>= 5.24.0~),
+ libkf5itemmodels-dev (>= 5.24.0~),
+ libkf5jobwidgets-dev (>= 5.24.0~),
+ libkf5newstuff-dev (>= 5.24.0~),
+ libkf5notifications-dev (>= 5.24.0~),
+ libkf5parts-dev (>= 5.24.0~),
+ libkf5service-dev (>= 5.24.0~),
+ libkf5texteditor-dev (>= 5.24.0~),
+ libkf5threadweaver-dev (>= 5.24.0~),
+ libkf5wallet-dev (>= 5.24.0~),
+ libkf5windowsystem-dev (>= 5.24.0~),
+ libkf5xmlgui-dev (>= 5.24.0~),
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
- plasma-framework-dev,
- qtbase5-dev (>= 5.4),
- qtscript5-dev (>= 5.4)
+ plasma-framework-dev (>= 5.24.0~),
+ qtbase5-dev (>= 5.6.1~),
+ qtscript5-dev (>= 5.6.1~)
Standards-Version: 3.9.6
Homepage: http://kate-editor.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kate.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/kate.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kate
+Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kate
Package: kate
Section: editors
@@ -84,12 +84,3 @@
KWrite is a simple text editor built on the KDE Platform. It uses the Kate
editor component, so it supports powerful features such as flexible syntax
highlighting, automatic indentation, and numerous other text tools.
-
-Package: kate-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: kate | kwrite, ${misc:Depends}
-Description: debugging symbols for Kate
- This package contains debugging files used to investigate problems with
- binaries included in Kate.
diff -Nru kate-15.12.3/debian/kate5-data.maintscript kate-16.04.3/debian/kate5-data.maintscript
--- kate-15.12.3/debian/kate5-data.maintscript 1970-01-01 00:00:00.000000000 +0000
+++ kate-16.04.3/debian/kate5-data.maintscript 2016-09-30 04:40:13.000000000 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/xdg/katerc 4:15.12.0-1~~
+rm_conffile /etc/xdg/ktexteditor_codesnippets_core.knsrc 4:15.12.0-1~~
diff -Nru kate-15.12.3/debian/kate.install kate-16.04.3/debian/kate.install
--- kate-15.12.3/debian/kate.install 2016-04-14 22:03:10.000000000 +0000
+++ kate-16.04.3/debian/kate.install 2016-09-30 04:40:13.000000000 +0000
@@ -1,7 +1,7 @@
usr/bin/kate
usr/lib/*/qt5/plugins/ktexteditor/
usr/lib/*/qt5/plugins/plasma/dataengine/plasma_engine_katesessions.so
-usr/share/appdata/org.kde.kate.appdata.xml
+usr/share/*/*kate*.appdata.xml
usr/share/applications/org.kde.kate.desktop
usr/share/doc/HTML/*/kate/
usr/share/kservices5/plasma-dataengine-katesessions.desktop
diff -Nru kate-15.12.3/debian/kwrite.install kate-16.04.3/debian/kwrite.install
--- kate-15.12.3/debian/kwrite.install 2016-04-14 22:03:10.000000000 +0000
+++ kate-16.04.3/debian/kwrite.install 2016-09-30 04:40:13.000000000 +0000
@@ -1,4 +1,4 @@
usr/bin/kwrite
-usr/share/appdata/org.kde.kwrite.appdata.xml
+usr/share/*/org.kde.kwrite.appdata.xml
usr/share/applications/org.kde.kwrite.desktop
usr/share/doc/HTML/*/kwrite/
diff -Nru kate-15.12.3/debian/rules kate-16.04.3/debian/rules
--- kate-15.12.3/debian/rules 2016-04-14 22:03:10.000000000 +0000
+++ kate-16.04.3/debian/rules 2016-09-30 04:40:13.000000000 +0000
@@ -23,4 +23,4 @@
find debian/tmp/usr/lib -maxdepth 1 -name '*.so' -type l -delete
override_dh_strip:
- $(overridden_command) --dbg-package=kate-dbg
+ $(overridden_command) --ddeb-migration='kate-dbg (<= 4:15.12.1-1~~)'
diff -Nru kate-15.12.3/kate/data/MacOSXBundleInfo.plist.in kate-16.04.3/kate/data/MacOSXBundleInfo.plist.in
--- kate-15.12.3/kate/data/MacOSXBundleInfo.plist.in 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/data/MacOSXBundleInfo.plist.in 2016-07-02 15:55:37.000000000 +0000
@@ -6,35 +6,50 @@
NSApplication
NSHighResolutionCapable
True
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${MACOSX_BUNDLE_EXECUTABLE_NAME}
- CFBundleGetInfoString
- ${MACOSX_BUNDLE_INFO_STRING}
- CFBundleIconFile
- ${MACOSX_BUNDLE_ICON_FILE}
- CFBundleIdentifier
- ${MACOSX_BUNDLE_GUI_IDENTIFIER}
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleLongVersionString
- ${MACOSX_BUNDLE_LONG_VERSION_STRING}
- CFBundleName
- ${MACOSX_BUNDLE_BUNDLE_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
- CFBundleSignature
- ????
- CFBundleVersion
- ${MACOSX_BUNDLE_BUNDLE_VERSION}
- CSResourcesFileMapped
-
- LSRequiresCarbon
-
- NSHumanReadableCopyright
- ${MACOSX_BUNDLE_COPYRIGHT}
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleGetInfoString
+ ${MACOSX_BUNDLE_INFO_STRING}
+ CFBundleIconFile
+ ${MACOSX_BUNDLE_ICON_FILE}
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ CSResourcesFileMapped
+
+ LSRequiresCarbon
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
+ LSMultipleInstancesProhibited
+
+ CFBundleDocumentTypes
+
+
+ CFBundleTypeExtensions
+
+ *
+
+ CFBundleTypeName
+ NSStringPboardType
+ CFBundleTypeRole
+ Editor
+
+
diff -Nru kate-15.12.3/kate/data/org.kde.kate.appdata.xml kate-16.04.3/kate/data/org.kde.kate.appdata.xml
--- kate-15.12.3/kate/data/org.kde.kate.appdata.xml 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/data/org.kde.kate.appdata.xml 2016-07-02 15:55:37.000000000 +0000
@@ -4,6 +4,8 @@
CC0-1.0
LGPL-2.1+
Kate
+ كيت
+ Kate
Kate
Kate
Kate
@@ -13,7 +15,6 @@
Kate
Kate
Kate
- Kate
Kate
Kate
Kate
@@ -41,6 +42,8 @@
Kate
Kate
Advanced Text Editor
+ محرّر نصوص متقدّم
+ Editor de testu avanzáu
Napredni uređivač teksta
Editor de text avançat
Editor de text avançat
@@ -50,7 +53,6 @@
Προηγμένος επεξεργαστής κειμένου
Advanced Text Editor
Editor de texto avanzado
- Täiustatud tekstiredaktor
Kehittynyt tekstimuokkain
Editor avanzado de textos
Speciális szövegszerkesztő
@@ -82,13 +84,13 @@
Kate is a multi-document, multi-view text editor for KDE. It features stuff like codefolding, syntaxhighlighting,
dynamic word wrap, an embedded console, an extensive plugin interface and some preliminary scripting support.
+ «كيت» هو محرّر نصوص لكدي يدعم عدّة مستندات وعدّة عروض. يقدّم «كيت» مزايا عديدة كلفّ الأكواد، وإبراز الصّياغة، ولفّ الكلمات الحركيّ، ومعراض مضمّن، وواجهة ملحقات واسعة ودعم بسيط للسّكربتة.
El Kate és un editor de text multidocument, i multivista pel KDE. Té funcionalitats com el plegat de codi, ressaltat de sintaxi, ajust dinàmic de les paraules, una consola incrustada, una interfície extensa de connectors i una implementació preliminar per crear scripts.
El Kate és un editor de text multidocument, i multivista pel KDE. Té funcionalitats com el plegat de codi, ressaltat de sintaxi, ajust dinàmic de les paraules, una consola incrustada, una interfície extensa de connectors i una implementació preliminar per crear scripts.
Kate ist ein KDE-Editor für mehrere Dokumente und Ansichten. Funktionen wie Quelltextausblendung, Syntaxhervorhebung, dynamischer Zeilenumbruch, eine eingebettete Konsole und eine umfangreiche Schnittstelle für Module sowie vorläufige Unterstützung für Skripte sind enthalten.
Το Kate είναι ένας πολλών εγγράφων, πολλών προβολών επεξεργαστής κειμένου για το KDE. Περιέχει λειτουργίες όπως απόκρυψη κώδικα, επισήμανση σύνταξης, δυναμική αναδίπλωση λέξεων, ενσωματωμένη κονσόλα, εκτεταμένο περιβάλλον χρήσης προσθέτων και κάποια βασική υποστήριξη συγγραφής σεναρίων.
Kate is a multi-document, multi-view text editor for KDE. It features stuff like codefolding, syntaxhighlighting, dynamic word wrap, an embedded console, an extensive plugin interface and some preliminary scripting support.
Kate es un editor de texto para KDE que puede abrir varios documentos a la vez y que cuenta con varios modos de vista. Entre otras funcionalidades dispone de plegado de código, resaltado de sintaxis, justificado de línea dinámico, consola integrada, una amplia interfaz para complementos y admite scripts de manera preliminar.
- Kate on KDE mitut dokumenti redigeerida võimaldav mitme vaatega tekstiredaktor. See suudab koodi voltida, süntaksit esile tõsta, dünaamiliselt ridu murda, pakub põimitud konsooli, ulatuslikult pluginaid ja mõningat skriptimise toetust.
Kate on usean tiedoston ja usean näkymän tekstimuokkain eli tekstieditori KDE:lle. Siinä on koodin laskostus, syntaksin korostus, dynaaminen rivitys, upotettu konsoli, kattava liitännäisrajapinta sekä alustava skriptaustuki.
Kate é un editor de texto para KDE que permite traballar en varios documentos e con varias vistas ao mesmo tempo. Conta con moitas funcionalidades, como pregado de código, salientado de sintaxe, axuste dinámico de texto, un terminal integrado, unha extensa interface para o desenvolvemento de complementos e funcionalidades preliminares de scripting.
A Kate egy többdokumentumos, többnézetes szövegszerkesztő a KDE-hez. A szolgáltatásai közé tartozik például a kódösszecsukás, szintaxiskiemelés, dinamikus szótördelés, beágyazott konzol, bővíthető bővítmény-interfész és a szkriptelés támogatása.
@@ -114,6 +116,8 @@
Kate 是一个多文档，多视图的文本编辑器，是 KDE 的一部分。它的特性包括代码折叠，语法高亮，动态文字折行，嵌入式命令行终端，可扩展的插件接口和一些初步的脚本支持。
Kate 是 KDE 內的進階編輯器，可同時編輯多個文件。它的功能包括像是源碼封裝，語法突顯，動態折行，嵌入主控台，延伸外掛程式介面與一些基本的文稿支援等等。
Features:
+ الميزات:
+ Carauterístiques
Svojstva:
Característiques:
Característiques:
@@ -123,7 +127,6 @@
Χαρακτηριστικά:
Features:
Funcionalidades:
- Omadused:
Ominaisuuksia:
Funcionalidades:
Szolgáltatások:
@@ -152,13 +155,13 @@
功能：
- MDI, window splitting, window tabbing
+ - واجهة لعدّة مستندات، تقسيم وتلسين للنّوافذ
- MDI, divisió de finestres, canvi de finestres per pestanyes
- MDI, divisió de finestres, canvi de finestres per pestanyes
- MDI (Multiple Document Interface = Benutzeroberfläche mit mehreren gleichzeitig geöffneten Dokumenten), geteilte Fenster, Unterfenster
- MDI, διαίρεση παραθύρων, παραθυρικές καρτέλες
- MDI, window splitting, window tabbing
- MDI, división de ventana, pestañas de ventana
- - MDI, akende poolitamine, akende esitamine kaartidena
- Monen tiedoston käyttöliittymä (MDI), ikkunoiden jakaminen ja välilehdet
- Capacidade para traballar en varios documentos á vez, coa posibilidade de dividir a xanela e usar lapelas.
- MDI, ablakfelosztás, ablaklapok
@@ -185,6 +188,7 @@
- 多文档界面 (MDI)，窗口分割，标签页
- MDI，視窗分割，視窗分頁
- Spell checking
+ - تدقيق الهجاء
- Provjera ispravnog pisanja riječi
- Verificació ortogràfica
- Verificació ortogràfica
@@ -194,7 +198,6 @@
- Ορθογραφία
- Spell checking
- Revisión de la ortografía
- - Õigekirja kontroll
- Oikeinkirjoituksen tarkistus
- Corrección ortográfica.
- Helyesírás-ellenőrzés
@@ -222,13 +225,13 @@
- 拼写检查
- 拼字檢查
- CR, CRLF, LF newline support
- - Implementació per línia nova CR, CRLF, LF
- - Implementació per línia nova CR, CRLF, LF
+ - دعم أسطر CR، وCRLF وLF الجديدة
+ - Implementació de línia nova CR, CRLF, LF
+ - Implementació de línia nova CR, CRLF, LF
- Unterstützung für CR, CRLF, LF am Zeilenende
- CR, CRLF, LF για υποστήριξη αλλαγής γραμμής
- CR, CRLF, LF newline support
- Admite fin de línea CR, CRLF, LF
- - CR, CRLF, LF reavahetuse toetus
- Tuki useille rivinvaihdoille: CR, CRLF ja LF
- Compatíbel cos fins de liña CR, CRLF e LF.
- CR, CRLF, LF új sor támogatás
@@ -255,13 +258,13 @@
- CR, CRLF, LF 换行支持
- CR, CRLF, LF 等換行符號支援
- Encoding support (utf-8, utf-16, ascii etc.)
- - Implementació de codificacions (UTF-8, UTF-16, ASCII, etc.)
- - Implementació de codificacions (UTF-8, UTF-16, ASCII, etc.)
+ - دعم التّرميز (utf-8، وutf-16 وآسكي وغيرها)
+ - Admet codificacions (UTF-8, UTF-16, ASCII, etc.)
+ - Admet codificacions (UTF-8, UTF-16, ASCII, etc.)
- Unterstützung für Kodierungen (utf-8, utf-16, ascii usw.)
- Υποστήριξη κωδικοποίησης (utf-8, utf-16, ascii etc.)
- Encoding support (utf-8, utf-16, ascii etc.)
- Admite codificación ( (utf-8, utf-16, ascii, etc.)
- - Kodeeringute toetus (utf-8, utf-16, ascii jne.)
- Merkistökoodaustuki (UTF-8, UTF-16, ASCII jne.)
- Compatíbel con varios sistemas de codificación de texto (UTF-8, UTF-16, ASCII, etc.).
- Különböző kódolások támogatása (UTF-8, UTF-16, ASCII, stb)
@@ -288,13 +291,13 @@
- 编码支持 (utf-8，utf-16，ascii 等。)
- 編碼支援（UTF-8，UTF-16，ASCII 等）
- Encoding conversion
+ - التّحويل بين التّرميزات
- Conversió de codificació
- Conversió de codificació
- Umwandlung von Kodierungen
- Μετατροπή κωδικοποίησης
- Encoding conversion
- Conversión de codificación
- - Kodeeringute teisendamine
- Merkistökoodauksen muuntaminen
- Conversión entre sistemas de codificación.
- Kódolások közti konverzió
@@ -321,13 +324,13 @@
- 编码转换
- 編碼轉換
- Regular expression based find & replace
+ - بحث واستبدال مبنيّ على التّعابير النّمطيّة
- Expressió regular basada en cerca i substitució
- Expressió regular basada en cerca i substitució
- Reguläre Ausdrücke für Suchen und Ersetzen
- Κανονικές εκφράσεις σε find & replace
- Regular expression based find & replace
- Función de buscar y remplazar basada en expresiones regulares
- - Regulaaravaldiste põhine otsimine ja asendamine
- Säännöllisiin lausekkeisiin perustuva Etsi ja korvaa
- Funcionalidade de buscar e substituír baseada en expresións regulares.
- Reguláris kifejezéseken alapuló keresés és csere
@@ -354,13 +357,13 @@
- 基于正则表达式的查找和替换
- 搜尋與取代支援正規表示式
- Powerful syntax highlighting and bracket matching
+ - دعم قويّ لإبراز الصّياغة ومطابقة الأقواس
- Ressaltat potent de sintaxi i concordança de parèntesis
- Ressaltat potent de sintaxi i concordança de parèntesis
- Leistungsfähige Syntaxhervorhebung und Übereinstimmung von Klammern
- Ισχυρό εργαλείο επισήμανσης σύνταξης και ταιριάσματος αγκυλών
- Powerful syntax highlighting and bracket matching
- Potente resaltado de sintaxis y de emparejado de paréntesis
- - Võimas süntaksi esiletõstmine ja sulgude sobitamine
- Tehokas syntaksin korostus; mukana myös toisiaan vastaavien sulkeiden korostus
- Potente salientado de sintaxe e de parellas de parénteses.
- Hatékony szintaxiskiemelés és zárójel-párosítás
@@ -386,13 +389,13 @@
- 强大的语法高亮和括号配对
- 強大的語法突顯與括號對應
- Code and text folding
+ - لفّ النّصوص والأكواد
- Plegat de codi i text
- Plegat de codi i text
- Quelltext- und Textausblendung
- Απόκρυψη κώδικα και κειμένου
- Code and text folding
- Plegado de código y de texto
- - Koodi ja teksti voltimine
- Koodin ja tekstin laskostus
- Pregado de código e texto.
- Kód- és szövegösszecsukás
@@ -419,13 +422,13 @@
- 代码和文本折叠
- 程式碼與文字封裝
- Infinite undo/redo support
- - Implementació de desfer/refer infinits
- - Implementació de desfer/refer infinits
+ - دعم عدد متناهٍ من الإعادات والتّكرارات
+ - Admet desfer/refer infinits
+ - Admet desfer/refer infinits
- Unterstützung für unbegrenztes Zurücknehmen und Wiederherstellen
- Υποστήριξη για απεριόριστη αναίρεση/επαναφορά
- Infinite undo/redo support
- Función hacer y deshacer infinita
- - Piiranguteta tagasivõtmiste ja uuestitegemiste toetus
- Tuki rajattomalle kumoamiselle ja uudelleen tekemiselle
- Funcionalidade de desfacer e refacer sen limitacións.
- Végtelen visszavonás/újra végrehajtás
@@ -452,6 +455,7 @@
- 无限制撤消/重做支持
- 無限的復原/重做支援
- Block selection mode
+ - وضع تحديد الكتل
- Mode de selecció per blocs
- Mode de selecció per blocs
- Blokmarkeringstilstand
@@ -459,7 +463,6 @@
- Λειτουργία επιλογής μπλοκ
- Block selection mode
- Modo de selección de bloque
- - Blokivaliku režiim
- Lohkovalintatila
- Modo de selección por bloques.
- Blokkos kijelölési mód
@@ -485,6 +488,7 @@
- 块选择模式
- 區塊選擇模式
- Auto indentation
+ - الإزاحة الآليّة
- Automatsko uvlačenje
- Sagnat automàtic
- Sagnat automàtic
@@ -494,7 +498,6 @@
- Αυτόματη χρήση εσοχών
- Auto indentation
- Sangrado automático
- - Automaatne taandus
- Automaattinen sisennys
- Sangrado automático.
- Automatikus behúzás
@@ -520,13 +523,13 @@
- 自动缩进
- 自動縮排
- Auto completion support
- - Implementació de compleció automàtica
- - Implementació de compleció automàtica
+ - دعم الإكمال الآليّ
+ - Admet compleció automàtica
+ - Admet compleció automàtica
- Unterstützung für Autovervollständigung
- Υποστήριξη αυτόματης συμπλήρωσης
- Auto completion support
- Completado automático
- - Automaatse lõpetamise toetus
- Automaattitäydennyksen tuki
- Completación automática.
- Automatikus kiegészítés
@@ -552,13 +555,13 @@
- 自动补全支持
- 自動補完支援
- Shell integration
+ - التّكامل مع الصّدفة
- Integració de l'intèrpret d'ordres
- Integració de l'intèrpret d'ordes
- Einbindung einer Shell
- Ενοποίηση κελύφους
- Shell integration
- Integración con la línea de órdenes
- - Shelliga lõimimine
- Komentotulkki-integraatio
- Integración coa shell.
- Parancsértelmező integrációja
@@ -590,7 +593,6 @@
- Ευρεία υποστήριξη σε πρωτόκολλα (http, ftp, ssh, webdav κτλ.) με χρήση kioslaves
- Wide protocol support (http, ftp, ssh, webdav etc.) using kioslaves
- Admite numerosos protocolos mediante el uso de kioslaves (http, ftp, ssh, webdav, etc.)
- - Laialdane protokollide (http, ftp, ssh, webdav jne.) toetus KIO moodulite vahendusel
- Laaja yhteyskäytäntötuki (HTTP, FTP, SSH, WebDAV jne.) käyttäen KIO-palveluita
- Compatibilidade con numerosos protocolos (HTTP, FTP, SSH, WebDAV, etc.) mediante KIO.
- Protokollok (HTTP, FTP, SSH, Webdav, stb) széleskörű támogatása KIO-szolgáltatások használatával
@@ -616,13 +618,13 @@
- 通过 kioslaves 支持广泛的协议 (HTTP, FTP, SSH, WebDAV 等)
- 用 kioslave 提供廣泛的協定支援（http, ftp, ssh, webdav 等等）
- Plugin architecture for the application and editor component
+ - بنية ملحقات للتّطبيق ومكوّن المحرّر
- Arquitectura de connectors per a l'aplicació i el component d'edició
- Arquitectura de connectors per a l'aplicació i el component d'edició
- Modul-Architektur für das Programm und die Editorkomponente
- Αρχιτεκτονική προσθέτων για το συστατικό της εφαρμογής και του επεξεργαστή
- Plugin architecture for the application and editor component
- Arquitectura de complementos para el componente de aplicación y de editor.
- - Pluginapõhine ülesehitus nii rakenduses kui ka redaktorikomponendis
- Liitännäisarkkitehtuuri sovellukselle ja muokkainosalle
- Arquitectura de complementos para o programa e mailo compoñente do editor.
- Bővítmények támogatása az alkalmazásban és a szerkesztő komponensben
@@ -649,13 +651,13 @@
- 为应用程序和编辑器组件而生的插件架构
- 用於應用程式與編輯器組件的外掛架構
- Customizable shortcuts
+ - اختصارات يمكن تخصيصها
- Dreceres personalitzables
- Dreceres personalitzables
- Benutzerdefinierte Kurzbefehle
- Προσαρμόσιμες συντομεύσεις
- Customisable shortcuts
- Accesos rápidos personalizables
- - Kohandatavad kiirklahvid
- Mukautettavat pikanäppäimet
- Atallos personalizábeis.
- Testre szabható gyorsbillentyűk
@@ -681,13 +683,13 @@
- 自定义快捷键
- 自定快捷鍵
- Integrated command line
+ - سطر أوامر مدمج
- Línia d'ordres integrada
- Línia d'ordes integrada
- Integrierte Befehlszeile
- Ενοποιημένη γραμμή εντολών
- Integrated command line
- Línea de órdenes integrada
- - Lõimitud käsurida
- Integroitu komentorivi
- Liña de ordes integrada.
- Integrált parancssor
@@ -714,13 +716,13 @@
- 集成命令行
- 整合指令行
- Scriptable using JavaScript
+ - يمكن سكربتته عبر جافاسكربت
- Es pot crear scripts usant JavaScript
- Es pot crear scripts usant JavaScript
- Skriptfähig über JavaScript
- Συγγραφή σεναρίων με JavaScript
- Scriptable using JavaScript
- Uso de scripts de JavaScript
- - Skriptimine JavaScriptiga
- Skriptattavissa JavaScriptillä
- A súa funcionalidade pódese ampliar mediante scripts escritos en JavaScript.
- Szkriptelhetőség JavaScripttel
diff -Nru kate-15.12.3/kate/data/org.kde.kate.desktop kate-16.04.3/kate/data/org.kde.kate.desktop
--- kate-15.12.3/kate/data/org.kde.kate.desktop 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/data/org.kde.kate.desktop 2016-07-02 15:55:37.000000000 +0000
@@ -1,6 +1,6 @@
[Desktop Entry]
GenericName=Advanced Text Editor
-GenericName[ar]=محرر نصوص متقدّم
+GenericName[ar]=محرّر نصوص متقدّم
GenericName[ast]=Editor de testu avanzáu
GenericName[bg]=Усъвършенстван текстов редактор
GenericName[bs]=Napredni uređivač teksta
@@ -120,6 +120,8 @@
Name[zh_CN]=Kate
Name[zh_TW]=Kate
Comment=KDE Advanced Text Editor
+Comment[ar]=كيت محرّر النّصوص المتقدّم
+Comment[ast]=Editor de testu avanzáu de KDE
Comment[ca]=Editor avançat de text pel KDE
Comment[ca@valencia]=Editor avançat de text pel KDE
Comment[cs]=Pokročilý textový editor pro KDE
@@ -128,12 +130,14 @@
Comment[el]=Προχωρημένος επεξεργαστής κειμένου για το KDE
Comment[en_GB]=KDE Advanced Text Editor
Comment[es]=Editor de texto avanzado de KDE
-Comment[et]=KDE täiustatud tekstiredaktor
Comment[fi]=KDE:n kehittynyt tekstimuokkain
Comment[fr]=Éditeur de texte avancé de KDE
Comment[gl]=Editor avanzado de textos de KDE
+Comment[ia]=KDE Advanced Text Editor, i.e. Editor avantiate de texto de KDE
Comment[it]=Editor di testi avanzato di KDE
Comment[ko]=KDE 고급 텍스트 편집기
+Comment[lt]=Sudėtingesnė KDE rašyklė
+Comment[nb]=Avansert skriveprogram for KDE
Comment[nl]=KDE geavanceerde tekstbewerker
Comment[nn]=Avansert skriveprogram for KDE
Comment[pl]=Zaawansowany edytor tekstu KDE
diff -Nru kate-15.12.3/kate/kateapp.cpp kate-16.04.3/kate/kateapp.cpp
--- kate-15.12.3/kate/kateapp.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateapp.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include "../../urlinfo.h"
@@ -48,9 +49,9 @@
: m_args(args)
, m_wrapper(appSelf = this)
, m_docManager(this)
+ , m_adaptor(this)
, m_pluginManager(this)
, m_sessionManager(this)
- , m_adaptor(this)
{
/**
* re-route some signals to application wrapper
@@ -60,6 +61,11 @@
connect(&m_docManager, &KateDocManager::documentDeleted, &m_wrapper, &KTextEditor::Application::documentDeleted);
connect(&m_docManager, &KateDocManager::aboutToCreateDocuments, &m_wrapper, &KTextEditor::Application::aboutToCreateDocuments);
connect(&m_docManager, &KateDocManager::documentsCreated, &m_wrapper, &KTextEditor::Application::documentsCreated);
+
+ /**
+ * handle mac os x like file open request via event filter
+ */
+ qApp->installEventFilter(this);
}
KateApp::~KateApp()
@@ -386,3 +392,26 @@
return m_pluginManager.plugin(name);
}
+bool KateApp::eventFilter(QObject *obj, QEvent *event)
+{
+ /**
+ * handle mac os like file open
+ */
+ if (event->type() == QEvent::FileOpen) {
+ /**
+ * try to open and activate the new document, like we would do for stuff
+ * opened via dbus
+ */
+ QFileOpenEvent *foe = static_cast(event);
+ KTextEditor::Document *doc = openDocUrl(foe->url(), QString(), false);
+ if (doc && activeKateMainWindow()) {
+ activeKateMainWindow()->viewManager()->activateView(doc);
+ }
+ return true;
+ }
+
+ /**
+ * else: pass over to default implementation
+ */
+ return QObject::eventFilter(obj, event);
+}
diff -Nru kate-15.12.3/kate/kateapp.h kate-16.04.3/kate/kateapp.h
--- kate-15.12.3/kate/kateapp.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateapp.h 2016-07-02 15:55:37.000000000 +0000
@@ -310,6 +310,12 @@
shutdownKate(activeKateMainWindow());
return true;
}
+
+protected:
+ /**
+ * Event filter for QApplication to handle mac os like file open
+ */
+ bool eventFilter(QObject *obj, QEvent *event);
private:
/**
@@ -318,6 +324,11 @@
const QCommandLineParser &m_args;
/**
+ * known main windows
+ */
+ QList m_mainWindows;
+
+ /**
* Wrapper of application for KTextEditor
*/
KTextEditor::Application m_wrapper;
@@ -328,6 +339,11 @@
KateDocManager m_docManager;
/**
+ * dbus interface
+ */
+ KateAppAdaptor m_adaptor;
+
+ /**
* plugin manager
*/
KatePluginManager m_pluginManager;
@@ -336,17 +352,6 @@
* session manager
*/
KateSessionManager m_sessionManager;
-
- /**
- * dbus interface
- */
- KateAppAdaptor m_adaptor;
-
- /**
- * known main windows
- */
- QList m_mainWindows;
-
};
#endif
diff -Nru kate-15.12.3/kate/kateconfigdialog.cpp kate-16.04.3/kate/kateconfigdialog.cpp
--- kate-15.12.3/kate/kateconfigdialog.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateconfigdialog.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -65,6 +65,8 @@
KPageWidgetItem *applicationItem = addPage(new QWidget, i18n("Application"));
applicationItem->setIcon(QIcon::fromTheme(QStringLiteral("preferences-other")));
applicationItem->setHeader(i18n("Application Options"));
+ applicationItem->setCheckable(false);
+ applicationItem->setEnabled(false);
m_applicationPage = applicationItem;
//BEGIN General page
@@ -191,6 +193,8 @@
m_editorPage = addPage(new QWidget, i18n("Editor Component"));
m_editorPage->setIcon(QIcon::fromTheme(QStringLiteral("accessories-text-editor")));
m_editorPage->setHeader(i18n("Editor Component Options"));
+ m_editorPage->setCheckable(false);
+ m_editorPage->setEnabled(false);
addEditorPages();
diff -Nru kate-15.12.3/kate/kateconfigplugindialogpage.cpp kate-16.04.3/kate/kateconfigplugindialogpage.cpp
--- kate-15.12.3/kate/kateconfigplugindialogpage.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateconfigplugindialogpage.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -105,7 +105,10 @@
void KateConfigPluginPage::loadPlugin(KatePluginListItem *item)
{
- KateApp::self()->pluginManager()->loadPlugin(item->info());
+ const bool ok = KateApp::self()->pluginManager()->loadPlugin(item->info());
+ if (!ok) {
+ return;
+ }
KateApp::self()->pluginManager()->enablePluginGUI(item->info());
myDialog->addPluginPage(item->info()->plugin);
diff -Nru kate-15.12.3/kate/katemainwindow.cpp kate-16.04.3/kate/katemainwindow.cpp
--- kate-15.12.3/kate/katemainwindow.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katemainwindow.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -232,11 +232,13 @@
QAction * a = actionCollection()->addAction(KStandardAction::Back, QStringLiteral("view_prev_tab"));
a->setText(i18n("&Previous Tab"));
a->setWhatsThis(i18n("Focus the previous tab."));
+ actionCollection()->setDefaultShortcuts(a, a->shortcuts() << KStandardShortcut::tabPrev());
connect(a, SIGNAL(triggered()), this, SLOT(slotFocusPrevTab()));
a = actionCollection()->addAction(KStandardAction::Forward, QStringLiteral("view_next_tab"));
a->setText(i18n("&Next Tab"));
a->setWhatsThis(i18n("Focus the next tab."));
+ actionCollection()->setDefaultShortcuts(a, a->shortcuts() << KStandardShortcut::tabNext());
connect(a, SIGNAL(triggered()), this, SLOT(slotFocusNextTab()));
// the quick open action is used by the KateViewSpace "quick open button"
@@ -304,8 +306,9 @@
connect(a, SIGNAL(triggered()), KateApp::self()->documentManager(), SLOT(closeOrphaned()));
a->setWhatsThis(i18n("Close all documents in the file list that could not be reopened, because they are not accessible anymore."));
- actionCollection()->addAction(KStandardAction::Close, QStringLiteral("file_close"), m_viewManager, SLOT(slotDocumentClose()))
- ->setWhatsThis(i18n("Close the current document."));
+ a = actionCollection()->addAction(KStandardAction::Close, QStringLiteral("file_close"), m_viewManager, SLOT(slotDocumentClose()));
+ a->setIcon(QIcon::fromTheme(QStringLiteral("document-close")));
+ a->setWhatsThis(i18n("Close the current document."));
a = actionCollection()->addAction(QStringLiteral("file_close_other"));
a->setText(i18n("Close Other"));
diff -Nru kate-15.12.3/kate/katemdi.cpp kate-16.04.3/kate/katemdi.cpp
--- kate-15.12.3/kate/katemdi.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katemdi.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -217,7 +217,9 @@
, persistent(false)
{
// try to fix resize policy
- setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ policy.setRetainSizeWhenHidden(true);
+ setSizePolicy(policy);
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
m_toolbar = new KToolBar(this);
@@ -225,6 +227,16 @@
m_toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
}
+QSize ToolView::sizeHint() const
+{
+ return size();
+}
+
+QSize ToolView::minimumSizeHint() const
+{
+ return QSize(160, 160);
+}
+
ToolView::~ToolView()
{
m_mainWin->toolViewDeleted(this);
@@ -289,7 +301,6 @@
{
m_splitter = sp;
m_ownSplit = new QSplitter((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
- m_ownSplit->setOpaqueResize(style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, m_ownSplit));
m_ownSplit->setChildrenCollapsible(false);
m_ownSplit->hide();
}
@@ -357,8 +368,8 @@
QMapIterator it(m_idToWidget);
while (it.hasNext()) {
it.next();
- if (!anyVis) {
- anyVis = it.value()->isVisible();
+ if ((anyVis = it.value()->isVisible())) {
+ break;
}
}
@@ -383,34 +394,29 @@
while (it.hasNext()) {
it.next();
if ((it.value() != widget) && !it.value()->persistent) {
- it.value()->hide();
- setTab(it.key(), false);
- it.value()->setToolVisible(false);
+ hideWidget(it.value());
}
}
setTab(m_widgetToId[widget], true);
- // set minimum size again to 80,80!
- // we changed that on hide!
- widget->setMinimumSize(80, 80);
-
/**
* resize to right size again and show, else artefacts
*/
if (m_widgetToSize[widget].isValid()) {
widget->resize(m_widgetToSize[widget]);
}
- widget->show();
/**
* resize to right size again and show, else artefacts
* same as for widget, both needed
*/
if (m_preHideSize.isValid()) {
+ widget->resize(m_preHideSize);
m_ownSplit->resize(m_preHideSize);
}
m_ownSplit->show();
+ widget->show();
/**
* we are visible again!
@@ -437,14 +443,13 @@
if (widget->isVisible()) {
m_widgetToSize[widget] = widget->size();
}
- continue;
- }
-
- if (!anyVis) {
- anyVis = it.value()->isVisible();
+ } else if ((anyVis = it.value()->isVisible())) {
+ break;
}
}
+ widget->hide();
+
// lower tab
setTab(m_widgetToId[widget], false);
@@ -455,14 +460,7 @@
m_ownSplit->hide();
}
- // set minimum size == size, this avoid artifical resizes on show
- // there we will reset this again to 80,80!
- widget->setMinimumSize(widget->size());
-
- widget->hide();
-
widget->setToolVisible(false);
-
return true;
}
@@ -733,7 +731,6 @@
hlayout->addWidget(m_sidebars[KMultiTabBar::Left]);
m_hSplitter = new QSplitter(Qt::Horizontal, hb);
- m_hSplitter->setOpaqueResize(style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, m_hSplitter));
hlayout->addWidget(m_hSplitter);
m_sidebars[KMultiTabBar::Left]->setSplitter(m_hSplitter);
@@ -751,7 +748,6 @@
m_vSplitter = new QSplitter(Qt::Vertical, vb);
vlayout->addWidget(m_vSplitter);
- m_vSplitter->setOpaqueResize(style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, m_vSplitter));
m_sidebars[KMultiTabBar::Top]->setSplitter(m_vSplitter);
@@ -811,7 +807,6 @@
ToolView *v = m_sidebars[pos]->addWidget(icon, text, 0);
v->id = identifier;
v->plugin = plugin;
- v->setMinimumSize(80, 80);
m_idToWidget.insert(identifier, v);
m_toolviews.push_back(v);
diff -Nru kate-15.12.3/kate/katemdi.h kate-16.04.3/kate/katemdi.h
--- kate-15.12.3/kate/katemdi.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katemdi.h 2016-07-02 15:55:37.000000000 +0000
@@ -144,10 +144,12 @@
public:
bool toolVisible() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
protected:
- void childEvent(QChildEvent *ev);
- void actionEvent(QActionEvent *event);
+ void childEvent(QChildEvent *ev) Q_DECL_OVERRIDE;
+ void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE;
private:
MainWindow *m_mainWin;
diff -Nru kate-15.12.3/kate/katemwmodonhddialog.cpp kate-16.04.3/kate/katemwmodonhddialog.cpp
--- kate-15.12.3/kate/katemwmodonhddialog.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katemwmodonhddialog.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -61,7 +61,8 @@
KateMwModOnHdDialog::KateMwModOnHdDialog(DocVector docs, QWidget *parent, const char *name)
: QDialog(parent),
m_proc(0),
- m_diffFile(0)
+ m_diffFile(0),
+ m_blockAddDocument(false)
{
setWindowTitle(i18n("Documents Modified on Disk"));
setObjectName(QString::fromLatin1(name));
@@ -175,6 +176,9 @@
void KateMwModOnHdDialog::handleSelected(int action)
{
+ // don't alter the treewidget via addDocument, we modify it here!
+ m_blockAddDocument = true;
+
// collect all items we can remove
QList itemsToDelete;
for (QTreeWidgetItemIterator it(twDocuments); *it; ++it) {
@@ -215,7 +219,7 @@
}
}
- // remove the marked items
+ // remove the marked items, addDocument is blocked, this is save!
for (int i = 0; i < itemsToDelete.count(); ++i) {
delete itemsToDelete[i];
}
@@ -224,6 +228,9 @@
if (! twDocuments->topLevelItemCount()) {
accept();
}
+
+ // allow addDocument again
+ m_blockAddDocument = false;
}
void KateMwModOnHdDialog::slotSelectionChanged(QTreeWidgetItem *current, QTreeWidgetItem *)
@@ -326,6 +333,10 @@
void KateMwModOnHdDialog::addDocument(KTextEditor::Document *doc)
{
+ // guard this e.g. during handleSelected
+ if (m_blockAddDocument)
+ return;
+
for (QTreeWidgetItemIterator it(twDocuments); *it; ++it) {
KateDocItem *item = (KateDocItem *) * it;
if (item->document == doc) {
diff -Nru kate-15.12.3/kate/katemwmodonhddialog.h kate-16.04.3/kate/katemwmodonhddialog.h
--- kate-15.12.3/kate/katemwmodonhddialog.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katemwmodonhddialog.h 2016-07-02 15:55:37.000000000 +0000
@@ -61,6 +61,7 @@
KProcess *m_proc;
QTemporaryFile *m_diffFile;
QStringList m_stateTexts;
+ bool m_blockAddDocument;
protected:
virtual void closeEvent(QCloseEvent *e);
diff -Nru kate-15.12.3/kate/katepluginmanager.cpp kate-16.04.3/kate/katepluginmanager.cpp
--- kate-15.12.3/kate/katepluginmanager.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katepluginmanager.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -176,19 +176,25 @@
}
}
-void KatePluginManager::loadPlugin(KatePluginInfo *item)
+bool KatePluginManager::loadPlugin(KatePluginInfo *item)
{
/**
* try to load the plugin
*/
- item->load = (item->plugin = KPluginLoader(item->metaData.fileName()).factory()->create(this, QVariantList() << item->saveName()));
-
+ auto factory = KPluginLoader(item->metaData.fileName()).factory();
+ if (factory) {
+ item->plugin = factory->create(this, QVariantList() << item->saveName());
+ }
+ item->load = item->plugin != nullptr;
+
/**
* tell the world about the success
*/
if (item->plugin) {
emit KateApp::self()->wrapper()->pluginCreated(item->saveName(), item->plugin);
}
+
+ return item->plugin != nullptr;
}
void KatePluginManager::unloadPlugin(KatePluginInfo *item)
diff -Nru kate-15.12.3/kate/katepluginmanager.h kate-16.04.3/kate/katepluginmanager.h
--- kate-15.12.3/kate/katepluginmanager.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katepluginmanager.h 2016-07-02 15:55:37.000000000 +0000
@@ -37,6 +37,11 @@
class KatePluginInfo
{
public:
+ KatePluginInfo()
+ : load(false)
+ , defaultLoad(false)
+ , plugin(nullptr)
+ {}
bool load;
bool defaultLoad;
KPluginMetaData metaData;
@@ -62,7 +67,7 @@
void loadConfig(KConfig *);
void writeConfig(KConfig *);
- void loadPlugin(KatePluginInfo *item);
+ bool loadPlugin(KatePluginInfo *item);
void unloadPlugin(KatePluginInfo *item);
void enablePluginGUI(KatePluginInfo *item, KateMainWindow *win, KConfigBase *config = 0);
diff -Nru kate-15.12.3/kate/katerunninginstanceinfo.cpp kate-16.04.3/kate/katerunninginstanceinfo.cpp
--- kate-15.12.3/kate/katerunninginstanceinfo.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katerunninginstanceinfo.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -28,6 +28,9 @@
bool fillinRunningKateAppInstances(KateRunningInstanceMap *map)
{
QDBusConnectionInterface *i = QDBusConnection::sessionBus().interface();
+ if (!i) {
+ return true; // we do not know about any others...
+ }
// look up all running kate instances and there sessions
QDBusReply servicesReply = i->registeredServiceNames();
diff -Nru kate-15.12.3/kate/katetabbutton.cpp kate-16.04.3/kate/katetabbutton.cpp
--- kate-15.12.3/kate/katetabbutton.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/katetabbutton.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -166,7 +166,7 @@
const QString elidedText = QFontMetrics(font()).elidedText (text(), Qt::ElideMiddle, w);
const QRect textRect(leftMargin, 0, w, height());
const QPalette pal = QApplication::palette();
- style()->drawItemText(&p, textRect, Qt::AlignHCenter | Qt::AlignVCenter, pal, true, elidedText);
+ style()->drawItemText(&p, textRect, Qt::AlignHCenter | Qt::AlignVCenter, pal, true, elidedText, QPalette::WindowText);
}
void KateTabButton::mousePressEvent(QMouseEvent *ev)
diff -Nru kate-15.12.3/kate/kateviewmanager.cpp kate-16.04.3/kate/kateviewmanager.cpp
--- kate-15.12.3/kate/kateviewmanager.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateviewmanager.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -66,9 +66,6 @@
// important, set them up, as we use them in other methodes
setupActions();
- // resize mode
- setOpaqueResize(style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, this));
-
KateViewSpace *vs = new KateViewSpace(this, 0);
addWidget(vs);
@@ -433,10 +430,10 @@
}
}
-bool KateViewManager::createView(KTextEditor::Document *doc, KateViewSpace *vs)
+KTextEditor::View *KateViewManager::createView(KTextEditor::Document *doc, KateViewSpace *vs)
{
if (m_blockViewCreationAndActivation) {
- return false;
+ return nullptr;
}
// create doc
@@ -475,7 +472,7 @@
activateView(view);
}
- return true;
+ return view;
}
bool KateViewManager::deleteView(KTextEditor::View *view)
@@ -769,7 +766,6 @@
// create a new QSplitter and replace vs with the splitter. vs and newVS are
// the new children of the new QSplitter
QSplitter *newContainer = new QSplitter(o);
- newContainer->setOpaqueResize(style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, newContainer));
QList currentSizes = currentSplitter->sizes();
newContainer->addWidget(vs);
diff -Nru kate-15.12.3/kate/kateviewmanager.h kate-16.04.3/kate/kateviewmanager.h
--- kate-15.12.3/kate/kateviewmanager.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateviewmanager.h 2016-07-02 15:55:37.000000000 +0000
@@ -113,9 +113,10 @@
public:
/**
* create and activate a new view for doc, if doc == 0, then
- * create a new document
+ * create a new document.
+ * Can return NULL.
*/
- bool createView(KTextEditor::Document *doc = 0L, KateViewSpace *vs = nullptr);
+ KTextEditor::View *createView(KTextEditor::Document *doc = 0L, KateViewSpace *vs = nullptr);
private:
bool deleteView(KTextEditor::View *view);
diff -Nru kate-15.12.3/kate/kateviewspace.cpp kate-16.04.3/kate/kateviewspace.cpp
--- kate-15.12.3/kate/kateviewspace.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/kateviewspace.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -653,9 +653,10 @@
QString vgroup = QString::fromLatin1("%1 %2").arg(groupname).arg(fn);
KConfigGroup configGroup(config, vgroup);
- viewMan->createView(doc, this);
-
- viewMan->activeView()->readSessionConfig(configGroup);
+ auto view = viewMan->createView(doc, this);
+ if (view) {
+ view->readSessionConfig(configGroup);
+ }
}
}
diff -Nru kate-15.12.3/kate/main.cpp kate-16.04.3/kate/main.cpp
--- kate-15.12.3/kate/main.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kate/main.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -86,6 +86,7 @@
aboutData.addAuthor(i18n("Joseph Wenninger"), i18n("Core Developer"), QStringLiteral("jowenn@kde.org"), QStringLiteral("http://stud3.tuwien.ac.at/~e9925371"));
aboutData.addAuthor(i18n("Hamish Rodda"), i18n("Core Developer"), QStringLiteral("rodda@kde.org"));
aboutData.addAuthor(i18n("Dominik Haumann"), i18n("Developer & Highlight wizard"), QStringLiteral("dhdev@gmx.de"));
+ aboutData.addAuthor(i18n("Kåre Särs"), i18n("Developer"), QStringLiteral("kare.sars@iki.fi"));
aboutData.addAuthor(i18n("Alexander Neundorf"), i18n("Developer"), QStringLiteral("neundorf@kde.org"));
aboutData.addAuthor(i18n("Waldo Bastian"), i18n("The cool buffersystem"), QStringLiteral("bastian@kde.org"));
aboutData.addAuthor(i18n("Charles Samuels"), i18n("The Editing Commands"), QStringLiteral("charles@kde.org"));
diff -Nru kate-15.12.3/kwrite/data/MacOSXBundleInfo.plist.in kate-16.04.3/kwrite/data/MacOSXBundleInfo.plist.in
--- kate-15.12.3/kwrite/data/MacOSXBundleInfo.plist.in 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kwrite/data/MacOSXBundleInfo.plist.in 2016-07-02 15:55:37.000000000 +0000
@@ -6,35 +6,48 @@
NSApplication
NSHighResolutionCapable
True
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${MACOSX_BUNDLE_EXECUTABLE_NAME}
- CFBundleGetInfoString
- ${MACOSX_BUNDLE_INFO_STRING}
- CFBundleIconFile
- ${MACOSX_BUNDLE_ICON_FILE}
- CFBundleIdentifier
- ${MACOSX_BUNDLE_GUI_IDENTIFIER}
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleLongVersionString
- ${MACOSX_BUNDLE_LONG_VERSION_STRING}
- CFBundleName
- ${MACOSX_BUNDLE_BUNDLE_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
- CFBundleSignature
- ????
- CFBundleVersion
- ${MACOSX_BUNDLE_BUNDLE_VERSION}
- CSResourcesFileMapped
-
- LSRequiresCarbon
-
- NSHumanReadableCopyright
- ${MACOSX_BUNDLE_COPYRIGHT}
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleGetInfoString
+ ${MACOSX_BUNDLE_INFO_STRING}
+ CFBundleIconFile
+ ${MACOSX_BUNDLE_ICON_FILE}
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ CSResourcesFileMapped
+
+ LSRequiresCarbon
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
+ CFBundleDocumentTypes
+
+
+ CFBundleTypeExtensions
+
+ *
+
+ CFBundleTypeName
+ NSStringPboardType
+ CFBundleTypeRole
+ Editor
+
+
diff -Nru kate-15.12.3/kwrite/data/org.kde.kwrite.appdata.xml kate-16.04.3/kwrite/data/org.kde.kwrite.appdata.xml
--- kate-15.12.3/kwrite/data/org.kde.kwrite.appdata.xml 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kwrite/data/org.kde.kwrite.appdata.xml 2016-07-02 15:55:37.000000000 +0000
@@ -4,6 +4,7 @@
CC0-1.0
LGPL-2.1+
KWrite
+ كاتبك
KWrite
Kwrite
KWrite
@@ -14,7 +15,6 @@
KWrite
KWrite
KWrite
- KWrite
KWrite
KWrite
KWrite
@@ -44,6 +44,7 @@
KWrite
KWrite
Text Editor
+ محرّر نصوص
Editor de testu
Uređivač teksta
Editor de text
@@ -54,7 +55,6 @@
Επεξεργαστής κειμένου
Text Editor
Editor de texto
- Tekstiredaktor
Tekstimuokkain
Éditeur de texte
Editor de textos
@@ -87,6 +87,7 @@
KWrite is a text editor for KDE, based on the Kate's editor component.
+ «كاتبك» هو محرّر نصوص لكدي، مبنيّ على مكوّن المحرّر ل«كيت».
KWrite ye un editor de testu pa KDE, básase nel componente del editor Kate.
El KWrite és un editor de text pel KDE, basat en el component d'edició del Kate.
El KWrite és un editor de text pel KDE, basat en el component d'edició del Kate.
@@ -94,7 +95,6 @@
Το KWrite είναι ένας επεξεργαστής κειμένου για το KDE, με βάση το συστατικό επεξεργαστή του Kate.
KWrite is a text editor for KDE, based on the Kate's editor component.
KWrite es un editor de texto para KDE basado en el componente de edición de Kate.
- KWrite on KDE tekstiredaktor, mille aluseks on Kate redaktorikomponent.
KWrite on tekstimuokkain eli tekstieditori KDE:lle. Se perustuu Katen muokkainosaan.
KWrite est un éditeur de texte s'appuyant sur le composant éditeur de Kate.
KWrite é un editor de texto para KDE baseado no compoñente de editor de Kate.
@@ -122,6 +122,7 @@
KWrite 是 KDE 的文本编辑器，基于 Kate 的编辑器组件。
KWrite 是一套 KDE 的文字編輯器，基於 Kate 的編輯器組件。
Features:
+ الميزات:
Carauterístiques:
Svojstva:
Característiques:
@@ -132,7 +133,6 @@
Χαρακτηριστικά:
Features:
Funcionalidades:
- Omadused:
Ominaisuuksia:
Fonctionnalités :
Funcionalidades:
@@ -163,13 +163,13 @@
功能：
- Syntax highlighting according to the file type
+ - إبراز الصّياغة حسب نوع الملفّ
- Ressaltat de sintaxi d'acord amb el tipus de fitxer
- Ressaltat de sintaxi d'acord amb el tipus de fitxer
- Syntaxhervorhebung passend zum Dateityp
- Επισήμανση σύνταξης ανάλογα με τον τύπο αρχείου
- Syntax highlighting according to the file type
- Resaltado de sintaxis según el tipo de archivo
- - Süntaksi esiletõstmine vastavalt failitüübile
- Syntaksin korostus tiedostotyypin perusteella
- Coloration syntaxique selon le type de fichier
- Realce de sintaxe segundo o tipo do ficheiro.
@@ -197,6 +197,7 @@
- 按文件类型进行语法高亮
- 根據檔案型態做語法突顯
- Word completion
+ - إكمال الكلمات
- Completáu de pallabres
- Dopuna riječi
- Compleció de paraules
@@ -207,7 +208,6 @@
- Συμπλήρωση λέξεων
- Word completion
- Comletado de palabras
- - Sõnalõpetus
- Sanantäydennys
- Auto-complétion des mots
- Completado de palabras.
@@ -236,6 +236,7 @@
- 单词补全
- 文字補完
- Auto-indentation
+ - الإزاحة الآليّة
- Automatsko uvlačenje
- Sagnat automàtic
- Sagnat automàtic
@@ -245,7 +246,6 @@
- Αυτόματη εισαγωγή εσοχών
- Auto-indentation
- Sangrado automático
- - Automaatne taandus
- Automaattinen sisennys
- Indentation automatique
- Sangrado automático.
@@ -274,15 +274,15 @@
- 自动缩进
- 自動縮排
- Plugin support
+ - دعم الملحقات
- Sofitu de plugins
- - Implementació de connectors
- - Implementació de connectors
+ - Admet connectors
+ - Admet connectors
- Podpora modulů
- Unterstützung für Module
- Υποστήριξη προσθέτων
- Plugin support
- Uso de complementos
- - Pluginate toetus
- Liitännäistuki
- Gestion des extensions
- Compatibilidade con complementos.
@@ -311,6 +311,7 @@
- 插件支持
- 外掛程式支援
- Vi input mode
+ - وضع دخل ڤي-آي
- Mou d'entrada Vi
- Vi editor režim unosa
- Mode d'entrada del Vi
@@ -321,7 +322,6 @@
- Λειτουργία εισαγωγής vi
- Vi input mode
- Modo de entrada Vi
- - Vi sisestusrežiim
- VI-syöttötila
- Mode d'entrée Vi
- Modo de entrada de Vi.
diff -Nru kate-15.12.3/kwrite/data/org.kde.kwrite.desktop kate-16.04.3/kwrite/data/org.kde.kwrite.desktop
--- kate-15.12.3/kwrite/data/org.kde.kwrite.desktop 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kwrite/data/org.kde.kwrite.desktop 2016-07-02 15:55:37.000000000 +0000
@@ -1,5 +1,6 @@
[Desktop Entry]
GenericName=Text Editor
+GenericName[ar]=محرّر نصوص
GenericName[ast]=Editor de testu
GenericName[bg]=Текстов редактор
GenericName[bs]=Uređivač teksta
@@ -26,7 +27,7 @@
GenericName[kk]=Мәтін редакторы
GenericName[km]=កម្មវិធីនិពន្ធអត្ថបទ
GenericName[ko]=텍스트 편집기
-GenericName[lt]=Teksto redaktorius
+GenericName[lt]=Rašyklė
GenericName[lv]=Teksta redaktors
GenericName[mr]=पाठ्य संपादक
GenericName[ms]=Penyunting Teks
@@ -57,6 +58,7 @@
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
Name=KWrite
+Name[ar]=كاتبك
Name[ast]=KWrite
Name[bg]=KWrite
Name[bs]=Kwrite
@@ -113,6 +115,8 @@
Name[zh_CN]=KWrite
Name[zh_TW]=KWrite
Comment=KDE Text Editor
+Comment[ar]=محرّر نصوص لكدي
+Comment[ast]=Editor de testu de KDE
Comment[ca]=Editor de text pel KDE
Comment[ca@valencia]=Editor de text pel KDE
Comment[cs]=Textový editor pro KDE
@@ -121,12 +125,14 @@
Comment[el]=Επεξεργαστής κειμένου για το KDE
Comment[en_GB]=KDE Text Editor
Comment[es]=Editor de texto de KDE
-Comment[et]=KDE tekstiredaktor
Comment[fi]=KDE:n tekstimuokkain
Comment[fr]=Éditeur de texte de KDE
Comment[gl]=Editor de textos de KDE
+Comment[ia]=Editor de texto de KDE
Comment[it]=Editor di testo di KDE
Comment[ko]=KDE 텍스트 편집기
+Comment[lt]=KDE rašyklė
+Comment[nb]=KDE tekstredigering
Comment[nl]=KDE tekstbewerker
Comment[nn]=Skriveprogram for KDE
Comment[pl]=Edytor tekstu KDE
diff -Nru kate-15.12.3/kwrite/kwrite.cpp kate-16.04.3/kwrite/kwrite.cpp
--- kate-15.12.3/kwrite/kwrite.cpp 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kwrite/kwrite.cpp 2016-07-02 15:55:37.000000000 +0000
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
QList KWrite::docList;
QList KWrite::winList;
@@ -111,6 +112,11 @@
// give view focus
m_view->setFocus(Qt::OtherFocusReason);
+
+ /**
+ * handle mac os x like file open request via event filter
+ */
+ qApp->installEventFilter(this);
}
KWrite::~KWrite()
@@ -142,6 +148,7 @@
void KWrite::setupActions()
{
m_closeAction = actionCollection()->addAction(KStandardAction::Close, QStringLiteral("file_close"), this, SLOT(slotFlush()));
+ m_closeAction->setIcon(QIcon::fromTheme(QStringLiteral("document-close")));
m_closeAction->setWhatsThis(i18n("Use this command to close the current document"));
m_closeAction->setDisabled(true);
@@ -530,3 +537,24 @@
setCaption(c + readOnlyCaption + QStringLiteral(" [*]"), m_view->document()->isModified());
}
+
+bool KWrite::eventFilter(QObject *obj, QEvent *event)
+{
+ /**
+ * handle mac os like file open
+ */
+ if (event->type() == QEvent::FileOpen) {
+ /**
+ * try to open and activate the new document, like we would do for stuff
+ * opened via file dialog
+ */
+ QFileOpenEvent *foe = static_cast(event);
+ slotOpen(foe->url());
+ return true;
+ }
+
+ /**
+ * else: pass over to default implementation
+ */
+ return KParts::MainWindow::eventFilter(obj, event);
+}
diff -Nru kate-15.12.3/kwrite/kwrite.h kate-16.04.3/kwrite/kwrite.h
--- kate-15.12.3/kwrite/kwrite.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/kwrite/kwrite.h 2016-07-02 15:55:37.000000000 +0000
@@ -135,6 +135,12 @@
public Q_SLOTS:
void documentNameChanged();
+
+protected:
+ /**
+ * Event filter for QApplication to handle mac os like file open
+ */
+ bool eventFilter(QObject *obj, QEvent *event);
};
#endif
diff -Nru kate-15.12.3/urlinfo.h kate-16.04.3/urlinfo.h
--- kate-15.12.3/urlinfo.h 2016-03-09 20:37:33.000000000 +0000
+++ kate-16.04.3/urlinfo.h 2016-07-02 15:55:37.000000000 +0000
@@ -33,7 +33,7 @@
: cursor(KTextEditor::Cursor::invalid())
{
// convert to an url
- const QRegularExpression withProtocol(QStringLiteral("^[a-zA-Z]+:")); // TODO: remove after Qt supports this on its own
+ const QRegularExpression withProtocol(QStringLiteral("^[a-zA-Z]+://")); // TODO: remove after Qt supports this on its own
if (withProtocol.match(path).hasMatch()) {
url = QUrl::fromUserInput(path);
} else {
@@ -50,7 +50,7 @@
int line = match.captured(1).toInt() - 1;
// don't use an invalid column when the line is valid
int column = qMax(0, match.captured(2).toInt() - 1);
- url = QUrl::fromLocalFile(path);
+ url = QUrl::fromLocalFile(QDir::current().absoluteFilePath(path));
cursor = {line, column};
}
}