Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-11-25 14:07:29 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-12-14 14:44:00 (GMT) |
| commit | b4a54583c4d575fe152122c21da616c3c942bbfd (patch) | |
| tree | 7e558fd9cb75291f4d5eec90da9d8dd5650ceea2 /Swift/QtUI/QtLoginWindow.cpp | |
| parent | 92672e17a52d0c86e693183627c8c6b8fa44fb86 (diff) | |
| download | swift-b4a54583c4d575fe152122c21da616c3c942bbfd.zip swift-b4a54583c4d575fe152122c21da616c3c942bbfd.tar.bz2 | |
Add support for new trellis layout for chat windows.
This includes dynamic customizable grid layouting of chat tabs including:
- arrengement of tabs via menu, keyboard shortcuts or drag'n'drop
- change of grid size via mouse or keyboard
- save/restore of grid size and positions of chats inside the grid
Test-Information:
Tested on OS X 10.9.8.
Change-Id: I43f94293a1c672971640c3000abfc6530f2ea7a8
Diffstat (limited to 'Swift/QtUI/QtLoginWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index eeb4317..21095f6 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -490,7 +490,9 @@ void QtLoginWindow::morphInto(MainWindow *mainWindow) { stack_->setCurrentWidget(qtMainWindow); setEnabled(true); setInitialMenus(); - foreach (QMenu* menu, qtMainWindow->getMenus()) { + std::vector<QMenu*> mainWindowMenus = qtMainWindow->getMenus(); + viewMenu_ = mainWindowMenus[0]; + foreach (QMenu* menu, mainWindowMenus) { menuBar_->addMenu(menu); } setFocus(); |