summaryrefslogtreecommitdiffstats
path: root/pica-client/mainwindow.cpp
diff options
context:
space:
mode:
authorAnton <anton@picapica>2017-12-01 21:55:53 +0400
committerAnton <anton@picapica>2017-12-01 21:55:53 +0400
commitac041927bc0c82e33acaa9e15fd46ecca0b77172 (patch)
tree742f1bf43917e79dae43c78684a2a3d055214e76 /pica-client/mainwindow.cpp
parent32e742ed040c5a70edb4cbfb947581f1e192d5a6 (diff)
parent9c0a5bf2bbd94539427ece7eb1cb8ea82c6c3dec (diff)
downloadpica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.tar.gz
pica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.zip
Merge branch 'direct_c2c_connections'
Diffstat (limited to 'pica-client/mainwindow.cpp')
-rw-r--r--pica-client/mainwindow.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/pica-client/mainwindow.cpp b/pica-client/mainwindow.cpp
index c440e20..8f4702f 100644
--- a/pica-client/mainwindow.cpp
+++ b/pica-client/mainwindow.cpp
@@ -111,6 +111,9 @@ void MainWindow::createMenus()
nodesMenu=menuBar()->addMenu(tr("&Nodes"));
+ settingsMenu = menuBar()->addMenu(tr("&Settings"));
+ settingsMenu->addAction(action_center->SettingsAct());
+
helpMenu=menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(action_center->AboutAct());
@@ -138,11 +141,13 @@ void MainWindow::showhide_click()
hide_notifications();
}
-void MainWindow::AddNotification(QString &text)
+void MainWindow::AddNotification(QString &text, bool is_critical)
{
notifications->addItem(text);
notifications->item(notifications->count() -1) ->setForeground(QBrush(QColor(230, 10, 10, 196)));
- show_notifications();
+
+ if (is_critical)
+ show_notifications();
}