Merge lp://staging/~fboucault/ubuntu-terminal-app/tiled_view into lp://staging/ubuntu-terminal-app
Proposed by
Florian Boucault
| Status: | Merged |
|---|---|
| Merged at revision: | 325 |
| Proposed branch: | lp://staging/~fboucault/ubuntu-terminal-app/tiled_view |
| Merge into: | lp://staging/ubuntu-terminal-app |
| Diff against target: |
1857 lines (+1413/-150) 18 files modified
po/com.ubuntu.terminal.pot (+13/-5) src/app/qml/AlternateActionPopover.qml (+14/-1) src/app/qml/Settings/SettingsShortcutsSection.qml (+30/-0) src/app/qml/TabsModel.qml (+6/-5) src/app/qml/TabsPage.qml (+1/-1) src/app/qml/Terminal.qml (+117/-4) src/app/qml/TerminalPage.qml (+6/-127) src/app/qml/TerminalSettings.qml (+12/-0) src/app/qml/TerminalWindow.qml (+20/-5) src/app/qml/TiledTerminalView.qml (+96/-0) src/app/qml/TiledView.qml (+135/-0) src/app/qml/TiledViewSeparator.qml (+76/-0) src/app/qml/binarytree.js (+378/-0) src/plugin/qmltermwidget/lib/TerminalDisplay.h (+2/-2) tests/CMakeLists.txt (+1/-0) tests/qtquicktest/CMakeLists.txt (+20/-0) tests/qtquicktest/qtquicktest.cpp (+18/-0) tests/qtquicktest/tst_TiledView.qml (+468/-0) |
| To merge this branch: | bzr merge lp://staging/~fboucault/ubuntu-terminal-app/tiled_view |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Terminal Developers | Pending | ||
|
Review via email:
|
|||
Commit message
New feature: terminals can be organised as tiles.
Description of the change
New feature: terminals can be organised as tiles.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
