Skip to content

Commit 1011a49

Browse files
committed
Add toolbar toggles, hide search by default
1 parent 9e7cd1c commit 1011a49

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
158158
standardBar->addAction(actionSelectMode_);
159159
standardBar->addAction(actionToggleMetadataLayer_);
160160
standardBar->addAction(actionToggleTagLayer_);
161+
connect(actionNetworkBar_, SIGNAL(toggled(bool)), standardBar, SLOT(setVisible(bool)));
162+
connect(standardBar, SIGNAL(visibilityChanged(bool)), actionNetworkBar_, SLOT(setChecked(bool)));
161163
//setUnifiedTitleAndToolBarOnMac(true);
162164
}
163165
{
@@ -176,6 +178,8 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
176178
"QToolTip { color: #ffffff; background - color: #2a82da; border: 1px solid white; }"
177179
);
178180
executeBar->setAutoFillBackground(true);
181+
connect(actionExecuteBar_, SIGNAL(toggled(bool)), executeBar, SLOT(setVisible(bool)));
182+
connect(executeBar, SIGNAL(visibilityChanged(bool)), actionExecuteBar_, SLOT(setChecked(bool)));
179183
}
180184
{
181185
auto searchAction = new QWidgetAction(this);
@@ -185,6 +189,9 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
185189
searchBar->setObjectName("SearchToolBar");
186190
WidgetStyleMixin::toolbarStyle(searchBar);
187191
searchBar->addAction(searchAction);
192+
connect(actionSearchBar_, SIGNAL(toggled(bool)), searchBar, SLOT(setVisible(bool)));
193+
connect(searchBar, SIGNAL(visibilityChanged(bool)), actionSearchBar_, SLOT(setChecked(bool)));
194+
searchBar->setVisible(false);
188195
}
189196

190197
networkEditor_->addAction(actionExecute_All_);

src/Interface/Application/SCIRunMainWindow.ui

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@
169169
<property name="title">
170170
<string>Window</string>
171171
</property>
172+
<widget class="QMenu" name="menuToolbars">
173+
<property name="title">
174+
<string>Toolbars</string>
175+
</property>
176+
<addaction name="actionSearchBar_"/>
177+
<addaction name="actionNetworkBar_"/>
178+
<addaction name="actionExecuteBar_"/>
179+
</widget>
172180
<addaction name="actionConfiguration_"/>
173181
<addaction name="actionModule_Selector"/>
174182
<addaction name="actionProvenance_"/>
@@ -177,6 +185,7 @@
177185
<addaction name="actionDevConsole_"/>
178186
<addaction name="actionTriggeredEvents_"/>
179187
<addaction name="actionPreferences_"/>
188+
<addaction name="menuToolbars"/>
180189
<addaction name="separator"/>
181190
<addaction name="actionReset_Window_Layout"/>
182191
</widget>
@@ -1046,6 +1055,36 @@
10461055
<string>New User Wizard...</string>
10471056
</property>
10481057
</action>
1058+
<action name="actionSearchBar_">
1059+
<property name="checkable">
1060+
<bool>true</bool>
1061+
</property>
1062+
<property name="text">
1063+
<string>Search</string>
1064+
</property>
1065+
</action>
1066+
<action name="actionNetworkBar_">
1067+
<property name="checkable">
1068+
<bool>true</bool>
1069+
</property>
1070+
<property name="checked">
1071+
<bool>true</bool>
1072+
</property>
1073+
<property name="text">
1074+
<string>Network</string>
1075+
</property>
1076+
</action>
1077+
<action name="actionExecuteBar_">
1078+
<property name="checkable">
1079+
<bool>true</bool>
1080+
</property>
1081+
<property name="checked">
1082+
<bool>true</bool>
1083+
</property>
1084+
<property name="text">
1085+
<string>Execute</string>
1086+
</property>
1087+
</action>
10491088
</widget>
10501089
<resources/>
10511090
<connections>

0 commit comments

Comments
 (0)