summary refs log tree commit diff
path: root/src/MainWindow.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-04-23 19:22:54 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-04-23 19:22:54 -0400
commit619d9bc1858b12350d95f64a1340d56f32e28bfe (patch)
tree7c597bbe8f40059b8ef6c935d64f8a69ff107a94 /src/MainWindow.cpp
parentUpdate versions to 0.7.1 (diff)
parentMerge pull request #173 from Nheko-Reborn/decrypt-sidebar (diff)
downloadnheko-619d9bc1858b12350d95f64a1340d56f32e28bfe.tar.xz
Merge remote-tracking branch 'origin/master' into release-prep-0.7.1
Diffstat (limited to 'src/MainWindow.cpp')
-rw-r--r--src/MainWindow.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp

index fb64f0fe..c6abdca2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp
@@ -117,6 +117,10 @@ MainWindow::MainWindow(QWidget *parent) userSettingsPage_, SIGNAL(trayOptionChanged(bool)), trayIcon_, SLOT(setVisible(bool))); connect( userSettingsPage_, &UserSettingsPage::themeChanged, chat_page_, &ChatPage::themeChanged); + connect(userSettingsPage_, + &UserSettingsPage::decryptSidebarChanged, + chat_page_, + &ChatPage::decryptSidebarChanged); connect(trayIcon_, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this,