setupTopicWidget();
setupChatMonitor();
setupInputWidget();
-
- QAction *toggleLockDocksAction = ui.menuViews->addAction(tr("Lock dock positions"));
- toggleLockDocksAction->setCheckable(true);
- connect(toggleLockDocksAction, SIGNAL(toggled(bool)), this, SLOT(lockVerticalDocks(bool)));
- toggleLockDocksAction->setChecked(s.value("LockDocks", false).toBool());
-
setupStatusBar();
setupSystray();
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
+ // restore locked state of docks
+ ui.actionLockDockPositions->setChecked(s.value("LockDocks", false).toBool());
+
+
setDisconnectedState(); // Disable menus and stuff
showCoreConnectionDlg(true); // autoconnect if appropriate
actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this);
ui.menuNetworks->addAction(actionEditNetworks);
connect(actionEditNetworks, SIGNAL(triggered()), this, SLOT(showNetworkDlg()));
- connect(ui.actionManageViews, SIGNAL(triggered()), this, SLOT(showManageViewsDlg()));
}
void MainWin::setupViews() {
- QAction *separator = ui.menuViews->addSeparator();
- separator->setData("__EOBV__");
addBufferView();
}
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
-
- QAction *endOfBufferViews = 0;
- foreach(QAction *action, ui.menuViews->actions()) {
- if(action->data().toString() == "__EOBV__") {
- endOfBufferViews = action;
- break;
- }
- }
- Q_CHECK_PTR(endOfBufferViews);
- ui.menuViews->insertAction(endOfBufferViews, dock->toggleViewAction());
+ ui.menuBufferViews->addAction(dock->toggleViewAction());
_netViews.append(dock);
}
void MainWin::removeBufferView(int bufferViewConfigId) {
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() == bufferViewConfigId) {
dlg.exec();
}
-void MainWin::showManageViewsDlg() {
+void MainWin::on_actionManageViews_triggered() {
SettingsPageDlg dlg(new BufferViewSettingsPage(this), this);
dlg.exec();
}
-void MainWin::lockVerticalDocks(bool lock) {
+void MainWin::on_actionLockDockPositions_toggled(bool lock) {
QList<VerticalDock *> docks = findChildren<VerticalDock *>();
foreach(VerticalDock *dock, docks) {
dock->showTitle(!lock);
saveLayout();
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() != -1) {
<property name="title" >
<string>&Views</string>
</property>
- <addaction name="actionManageViews" />
+ <widget class="QMenu" name="menuBufferViews" >
+ <property name="title" >
+ <string>Buffer Views</string>
+ </property>
+ <addaction name="actionManageViews" />
+ <addaction name="separator" />
+ </widget>
+ <addaction name="menuBufferViews" />
<addaction name="separator" />
+ <addaction name="actionLockDockPositions" />
</widget>
<widget class="QMenu" name="menuHelp" >
<property name="title" >
<string>F7</string>
</property>
</action>
- <action name="actionManageViews" >
+ <action name="actionManageViews2" >
<property name="enabled" >
<bool>true</bool>
</property>
<string>&Edit Networks...</string>
</property>
</action>
+ <action name="actionManageViews" >
+ <property name="icon" >
+ <iconset resource="../../icons/icons.qrc" >
+ <normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Manage Buffer Views</string>
+ </property>
+ </action>
+ <action name="actionLockDockPositions" >
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ <property name="text" >
+ <string>Lock Dock Positions</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>