Merge lp://staging/~vthompson/ubuntu-terminal-app/testing-fix into lp://staging/ubuntu-terminal-app
Proposed by
spookje
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~vthompson/ubuntu-terminal-app/testing-fix |
| Merge into: | lp://staging/ubuntu-terminal-app |
| Diff against target: |
24755 lines (+24263/-0) (has conflicts) 96 files modified
.bzrignore (+11/-0) README (+11/-0) assets/color-schemes/BlackOnLightYellow.schema (+42/-0) assets/color-schemes/BlackOnRandomLight.colorscheme (+104/-0) assets/color-schemes/BlackOnWhite.schema (+42/-0) assets/color-schemes/DarkPastels.colorscheme (+103/-0) assets/color-schemes/GreenOnBlack.colorscheme (+104/-0) assets/color-schemes/Linux.colorscheme (+100/-0) assets/color-schemes/WhiteOnBlack.schema (+42/-0) assets/color-schemes/historic/BlackOnLightColor.schema (+42/-0) assets/color-schemes/historic/DarkPicture.schema (+44/-0) assets/color-schemes/historic/Example.Schema (+47/-0) assets/color-schemes/historic/GreenOnBlack.schema (+42/-0) assets/color-schemes/historic/GreenTint.schema (+49/-0) assets/color-schemes/historic/GreenTint_MC.schema (+49/-0) assets/color-schemes/historic/LightPicture.schema (+44/-0) assets/color-schemes/historic/Linux.schema (+47/-0) assets/color-schemes/historic/README.Schema (+132/-0) assets/color-schemes/historic/README.default.Schema (+44/-0) assets/color-schemes/historic/Transparent.schema (+49/-0) assets/color-schemes/historic/Transparent_MC.schema (+51/-0) assets/color-schemes/historic/Transparent_darkbg.schema (+42/-0) assets/color-schemes/historic/Transparent_lightbg.schema (+51/-0) assets/color-schemes/historic/XTerm.schema (+46/-0) assets/color-schemes/historic/syscolor.schema (+44/-0) assets/color-schemes/historic/vim.schema (+40/-0) assets/kb-layouts/README (+72/-0) assets/kb-layouts/default.keytab (+169/-0) assets/kb-layouts/historic/vt100.keytab (+133/-0) assets/kb-layouts/historic/x11r5.keytab (+71/-0) assets/kb-layouts/linux.keytab (+164/-0) assets/kb-layouts/macbook.keytab (+175/-0) assets/kb-layouts/solaris.keytab (+108/-0) assets/kb-layouts/vt420pc.keytab (+168/-0) debian/changelog (+29/-0) debian/compat (+1/-0) debian/control (+40/-0) debian/copyright (+50/-0) debian/rules (+21/-0) debian/source/format (+1/-0) konsole-qml-plugin.pro (+97/-0) src/BlockArray.cpp (+377/-0) src/BlockArray.h (+126/-0) src/Character.h (+221/-0) src/CharacterColor.h (+294/-0) src/ColorScheme.cpp (+774/-0) src/ColorScheme.h (+342/-0) src/ColorTables.h (+55/-0) src/DefaultTranslatorText.h (+2/-0) src/Emulation.cpp (+458/-0) src/Emulation.h (+467/-0) src/ExtendedDefaultTranslator.h (+74/-0) src/Filter.cpp (+542/-0) src/Filter.h (+380/-0) src/History.cpp (+986/-0) src/History.h (+490/-0) src/KeyboardTranslator.cpp (+892/-0) src/KeyboardTranslator.h (+584/-0) src/LineFont.h (+21/-0) src/LineFont.src (+786/-0) src/Pty.cpp (+310/-0) src/Pty.h (+206/-0) src/Screen.cpp (+1360/-0) src/Screen.h (+672/-0) src/ScreenWindow.cpp (+292/-0) src/ScreenWindow.h (+257/-0) src/Session.cpp (+1064/-0) src/Session.h (+626/-0) src/ShellCommand.cpp (+167/-0) src/ShellCommand.h (+90/-0) src/TerminalCharacterDecoder.cpp (+251/-0) src/TerminalCharacterDecoder.h (+148/-0) src/TerminalDisplay.cpp (+2168/-0) src/TerminalDisplay.h (+715/-0) src/Vt102Emulation.cpp (+1221/-0) src/Vt102Emulation.h (+188/-0) src/default.keytab (+128/-0) src/konsole_wcwidth.cpp (+224/-0) src/konsole_wcwidth.h (+24/-0) src/kprocess.cpp (+412/-0) src/kprocess.h (+372/-0) src/kpty.cpp (+701/-0) src/kpty.h (+191/-0) src/kpty_p.h (+50/-0) src/kptydevice.cpp (+422/-0) src/kptydevice.h (+360/-0) src/kptyprocess.cpp (+129/-0) src/kptyprocess.h (+178/-0) src/ksession.cpp (+242/-0) src/ksession.h (+132/-0) src/plugin.cpp (+63/-0) src/plugin.h (+46/-0) src/plugins.qmltypes (+169/-0) src/qmldir (+3/-0) src/tools.cpp (+80/-0) src/tools.h (+10/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file src. Moved existing file to src.moved. |
| To merge this branch: | bzr merge lp://staging/~vthompson/ubuntu-terminal-app/testing-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Terminal Developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 14. By Victor Thompson
-
Initial fix for backspace and enter
- 13. By Dmitry Zagnoyko
-
Fixed text displaying bug (LP: #1182503). Fixes: https:/
/bugs.launchpad .net/bugs/ 1182503. Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 12. By Francis Ginther
-
Version bump.
Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 11. By Dmitry Zagnoyko
-
Added virtual key press events and fixed widget size properties. Fixes: https:/
/bugs.launchpad .net/bugs/ 1177155. Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 10. By Dmitry Zagnoyko
-
changed project structure.
Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 9. By Dmitry Zagnoyko
-
Fixed focus accept and VKB events
- 8. By Dmitry Zagnoyko
-
Added KSession signal for direct commands sending to terminal emu from qml
- 7. By Dmitry Zagnoyko
-
Added missing properties for KTerminal
- 6. By Dmitry Zagnoyko
-
Fixed issue with QtCreator
- 5. By Dmitry Zagnoyko
-
Object visibility scope fix: removed konsole namespace
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
