diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index fa1f0ea12..b3c746fee 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -1498,6 +1498,7 @@ void MainWindow::switchVisibilityStatus(StatusElement e,bool b) case StatusGrpStatus : getInstance()->statusBar() ->setVisible(b); break ; case StatusCompactMode : getInstance()->setCompactStatusMode(b) ; break ; case StatusShowToolTip : getInstance()->toggleStatusToolTip(b) ; break ; + case StatusShowCBox : getInstance()->statusComboBoxInstance() ->setVisible(b); break ; case StatusShowStatus : getInstance()->peerstatusInstance() ->setVisible(b); break ; case StatusShowPeer : getInstance()->natstatusInstance() ->setVisible(b); break ; case StatusShowDHT : getInstance()->dhtstatusInstance() ->setVisible(b); break ; diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 366c42173..00a6544cb 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -123,7 +123,8 @@ public: StatusShowOpMode = 0x0a, StatusShowSound = 0x0b, StatusShowToaster = 0x0c, - StatusShowSystray = 0x0d + StatusShowSystray = 0x0d, + StatusShowCBox = 0x0e }; /** Create main window */ diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index bea9959d9..025828ee0 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -55,7 +55,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags) connect(ui.grpStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusBar(), */, SLOT(switch_status_grpStatus(bool))); connect(ui.checkBoxStatusCompactMode, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_compactMode(bool))); connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_showToolTip(bool))); - connect(ui.checkBoxShowStatusStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusComboBoxInstance(), */, SLOT(switch_status_ShowStatus(bool))); + connect(ui.checkBoxShowStatusStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusComboBoxInstance(), */, SLOT(switch_status_ShowCBox(bool))); connect(ui.checkBoxShowPeerStatus, SIGNAL(toggled(bool)), this /* pMainWindow->peerstatusInstance(), */, SLOT(switch_status_ShowStatus(bool))); connect(ui.checkBoxShowNATStatus, SIGNAL(toggled(bool)), this /* pMainWindow->natstatusInstance(), */, SLOT(switch_status_ShowPeer(bool))); connect(ui.checkBoxShowDHTStatus, SIGNAL(toggled(bool)), this /* pMainWindow->dhtstatusInstance(), */, SLOT(switch_status_ShowDHT(bool))); @@ -110,6 +110,7 @@ void AppearancePage::switch_status_ShowOpMode(bool b) { switch_status(Main void AppearancePage::switch_status_ShowSound(bool b) { switch_status(MainWindow::StatusShowSound ,"ShowSound", b) ; } void AppearancePage::switch_status_ShowToaster(bool b) { switch_status(MainWindow::StatusShowToaster,"ShowToaster", b) ; } void AppearancePage::switch_status_ShowSystray(bool b) { switch_status(MainWindow::StatusShowSystray,"ShowSysTrayOnStatusBar",b) ; } +void AppearancePage::switch_status_ShowCBox(bool b) { switch_status(MainWindow::StatusShowCBox, "ShowStatusCBox" ,b) ; } void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& key, bool b) { diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index 09610a22d..0259062f6 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -57,6 +57,7 @@ private slots: void switch_status_ShowSound(bool) ; void switch_status_ShowToaster(bool) ; void switch_status_ShowSystray(bool) ; + void switch_status_ShowCBox(bool) ; void updateLanguageCode() ; void updateInterfaceStyle() ; diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui index 4eecd3e3d..66c732399 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.ui +++ b/retroshare-gui/src/gui/settings/AppearancePage.ui @@ -338,13 +338,6 @@ true - - - - Show SysTray on Status Bar - - - @@ -359,13 +352,6 @@ - - - - Show Operating Mode Status - - - @@ -432,6 +418,20 @@ + + + + Show Operating Mode Status + + + + + + + Show SysTray on Status Bar + + +