Merge lp://staging/~larryprice/ubuntu-terminal-app/update-qmltermwidget into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Proposed by
Larry Price
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~larryprice/ubuntu-terminal-app/update-qmltermwidget |
| Merge into: | lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot |
| Prerequisite: | lp://staging/~larryprice/ubuntu-terminal-app/fix-cmake-xenial |
| Diff against target: |
27374 lines (+2019/-24346) 109 files modified
src/app/qml/TerminalComponent.qml (+0/-4) src/plugin/konsole/BlockArray.cpp (+0/-377) src/plugin/konsole/BlockArray.h (+0/-126) src/plugin/konsole/CMakeLists.txt (+0/-93) src/plugin/konsole/Character.h (+0/-221) src/plugin/konsole/CharacterColor.h (+0/-294) src/plugin/konsole/ColorScheme.cpp (+0/-774) src/plugin/konsole/ColorScheme.h (+0/-342) src/plugin/konsole/ColorTables.h (+0/-55) src/plugin/konsole/DefaultTranslatorText.h (+0/-2) src/plugin/konsole/Emulation.cpp (+0/-458) src/plugin/konsole/Emulation.h (+0/-467) src/plugin/konsole/ExtendedDefaultTranslator.h (+0/-74) src/plugin/konsole/Filter.cpp (+0/-542) src/plugin/konsole/Filter.h (+0/-380) src/plugin/konsole/History.cpp (+0/-986) src/plugin/konsole/History.h (+0/-490) src/plugin/konsole/KeyboardTranslator.cpp (+0/-892) src/plugin/konsole/KeyboardTranslator.h (+0/-584) src/plugin/konsole/LineFont.h (+0/-21) src/plugin/konsole/LineFont.src (+0/-786) src/plugin/konsole/Pty.cpp (+0/-310) src/plugin/konsole/Pty.h (+0/-206) src/plugin/konsole/Screen.cpp (+0/-1360) src/plugin/konsole/Screen.h (+0/-672) src/plugin/konsole/ScreenWindow.cpp (+0/-292) src/plugin/konsole/ScreenWindow.h (+0/-257) src/plugin/konsole/Session.cpp (+0/-1064) src/plugin/konsole/Session.h (+0/-626) src/plugin/konsole/ShellCommand.cpp (+0/-167) src/plugin/konsole/ShellCommand.h (+0/-90) src/plugin/konsole/TerminalCharacterDecoder.cpp (+0/-251) src/plugin/konsole/TerminalCharacterDecoder.h (+0/-148) src/plugin/konsole/TerminalDisplay.cpp (+0/-2171) src/plugin/konsole/TerminalDisplay.h (+0/-715) src/plugin/konsole/Vt102Emulation.cpp (+0/-1221) src/plugin/konsole/Vt102Emulation.h (+0/-188) src/plugin/konsole/assets/color-schemes/BlackOnLightYellow.schema (+0/-42) src/plugin/konsole/assets/color-schemes/BlackOnRandomLight.colorscheme (+0/-104) src/plugin/konsole/assets/color-schemes/BlackOnWhite.schema (+0/-42) src/plugin/konsole/assets/color-schemes/DarkPastels.colorscheme (+0/-103) src/plugin/konsole/assets/color-schemes/GreenOnBlack.colorscheme (+0/-104) src/plugin/konsole/assets/color-schemes/Linux.colorscheme (+0/-100) src/plugin/konsole/assets/color-schemes/WhiteOnBlack.schema (+0/-42) src/plugin/konsole/assets/color-schemes/historic/BlackOnLightColor.schema (+0/-42) src/plugin/konsole/assets/color-schemes/historic/DarkPicture.schema (+0/-44) src/plugin/konsole/assets/color-schemes/historic/Example.Schema (+0/-47) src/plugin/konsole/assets/color-schemes/historic/GreenOnBlack.schema (+0/-42) src/plugin/konsole/assets/color-schemes/historic/GreenTint.schema (+0/-49) src/plugin/konsole/assets/color-schemes/historic/GreenTint_MC.schema (+0/-49) src/plugin/konsole/assets/color-schemes/historic/LightPicture.schema (+0/-44) src/plugin/konsole/assets/color-schemes/historic/Linux.schema (+0/-47) src/plugin/konsole/assets/color-schemes/historic/README.Schema (+0/-132) src/plugin/konsole/assets/color-schemes/historic/README.default.Schema (+0/-44) src/plugin/konsole/assets/color-schemes/historic/Transparent.schema (+0/-49) src/plugin/konsole/assets/color-schemes/historic/Transparent_MC.schema (+0/-51) src/plugin/konsole/assets/color-schemes/historic/Transparent_darkbg.schema (+0/-42) src/plugin/konsole/assets/color-schemes/historic/Transparent_lightbg.schema (+0/-51) src/plugin/konsole/assets/color-schemes/historic/XTerm.schema (+0/-46) src/plugin/konsole/assets/color-schemes/historic/syscolor.schema (+0/-44) src/plugin/konsole/assets/color-schemes/historic/vim.schema (+0/-40) src/plugin/konsole/assets/kb-layouts/README (+0/-72) src/plugin/konsole/assets/kb-layouts/default.keytab (+0/-169) src/plugin/konsole/assets/kb-layouts/historic/vt100.keytab (+0/-133) src/plugin/konsole/assets/kb-layouts/historic/x11r5.keytab (+0/-71) src/plugin/konsole/assets/kb-layouts/linux.keytab (+0/-164) src/plugin/konsole/assets/kb-layouts/macbook.keytab (+0/-175) src/plugin/konsole/assets/kb-layouts/solaris.keytab (+0/-108) src/plugin/konsole/assets/kb-layouts/vt420pc.keytab (+0/-168) src/plugin/konsole/default.keytab (+0/-128) src/plugin/konsole/konsole_wcwidth.cpp (+0/-224) src/plugin/konsole/konsole_wcwidth.h (+0/-24) src/plugin/konsole/kprocess.cpp (+0/-412) src/plugin/konsole/kprocess.h (+0/-372) src/plugin/konsole/kpty.cpp (+0/-701) src/plugin/konsole/kpty.h (+0/-191) src/plugin/konsole/kpty_p.h (+0/-50) src/plugin/konsole/kptydevice.cpp (+0/-422) src/plugin/konsole/kptydevice.h (+0/-360) src/plugin/konsole/kptyprocess.cpp (+0/-129) src/plugin/konsole/kptyprocess.h (+0/-178) src/plugin/konsole/ksession.cpp (+0/-242) src/plugin/konsole/ksession.h (+0/-132) src/plugin/konsole/plugin.cpp (+0/-63) src/plugin/konsole/plugin.h (+0/-46) src/plugin/konsole/plugins.qmltypes (+0/-169) src/plugin/konsole/qmldir (+0/-3) src/plugin/konsole/tools.cpp (+0/-80) src/plugin/konsole/tools.h (+0/-10) src/plugin/qmltermwidget/.gitignore (+0/-1) src/plugin/qmltermwidget/AUTHORS (+1/-0) src/plugin/qmltermwidget/lib.pri (+2/-1) src/plugin/qmltermwidget/lib/Emulation.cpp (+5/-0) src/plugin/qmltermwidget/lib/Emulation.h (+11/-1) src/plugin/qmltermwidget/lib/KeyboardTranslator.cpp (+1/-1) src/plugin/qmltermwidget/lib/ProcessInfo.cpp (+1174/-0) src/plugin/qmltermwidget/lib/ProcessInfo.h (+460/-0) src/plugin/qmltermwidget/lib/Session.cpp (+41/-4) src/plugin/qmltermwidget/lib/Session.h (+10/-1) src/plugin/qmltermwidget/lib/TerminalDisplay.cpp (+64/-51) src/plugin/qmltermwidget/lib/TerminalDisplay.h (+29/-25) src/plugin/qmltermwidget/lib/Vt102Emulation.cpp (+6/-3) src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme (+0/-138) src/plugin/qmltermwidget/lib/kpty.cpp (+6/-1) src/plugin/qmltermwidget/packaging/rpm/qmltermwidget.spec (+59/-0) src/plugin/qmltermwidget/qmltermwidget.pro (+20/-0) src/plugin/qmltermwidget/src/ksession.cpp (+70/-9) src/plugin/qmltermwidget/src/ksession.h (+37/-6) src/plugin/qmltermwidget/test-app/test-app.qml (+23/-2) |
| To merge this branch: | bzr merge lp://staging/~larryprice/ubuntu-terminal-app/update-qmltermwidget |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Terminal Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-09-19.
Commit message
Update QMLTermWidget to latest version and remove duplicate konsole application code.
Description of the change
Update QMLTermWidget to latest version and remove duplicate konsole application code.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
