Skip to content

Commit 40db1ed

Browse files
committed
Provide 2 links for each toolkit
1 parent 6e7bfcb commit 40db1ed

File tree

2 files changed

+52
-20
lines changed

2 files changed

+52
-20
lines changed

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,22 @@ SCIRunMainWindow::SCIRunMainWindow()
252252

253253
//TODO: store in xml file, add to app resources
254254
ToolkitInfo fwdInv{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
255+
"http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.2.zip",
256+
"FwdInvToolkit_stable.zip" };
257+
fwdInv.setupAction(actionForwardInverseStable_, this);
258+
ToolkitInfo fwdInvNightly{ "http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png",
255259
"https://codeload.github.com/SCIInstitute/FwdInvToolkit/zip/master",
256-
"FwdInvToolkit_latest.zip" };
257-
fwdInv.setupAction(actionForwardInverse_, this);
260+
"FwdInvToolkit_nightly.zip" };
261+
fwdInvNightly.setupAction(actionForwardInverseNightly_, this);
258262

259263
ToolkitInfo brainStim{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
264+
"http://sci.utah.edu/devbuilds/scirun5/toolkits/BrainStimulator_v1.2.zip",
265+
"BrainStimulator_stable.zip" };
266+
brainStim.setupAction(actionBrainStimulatorStable_, this);
267+
ToolkitInfo brainStimNightly{ "http://www.sci.utah.edu/images/software/BrainStimulator/brain-stimulator-mod.png",
260268
"https://codeload.github.com/SCIInstitute/BrainStimulator/zip/master",
261-
"BrainStimulator_latest.zip" };
262-
brainStim.setupAction(actionBrainStimulator_, this);
269+
"BrainStimulator_nightly.zip" };
270+
brainStimNightly.setupAction(actionBrainStimulatorNightly_, this);
263271

264272
connect(actionLoadToolkit_, SIGNAL(triggered()), this, SLOT(loadToolkit()));
265273

@@ -1446,7 +1454,7 @@ void SCIRunMainWindow::setupSubnetItem(QTreeWidgetItem* fave, bool addToMap, con
14461454
{
14471455
savedSubnetworksXml_[id] = fave->data(0, clipboardKey).toString();
14481456
savedSubnetworksNames_[id] = fave->text(0);
1449-
fave->setFlags(fave->flags() & !Qt::ItemIsEditable);
1457+
fave->setFlags(fave->flags() & ~Qt::ItemIsEditable);
14501458
}
14511459
}
14521460

src/Interface/Application/SCIRunMainWindow.ui

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<rect>
4545
<x>0</x>
4646
<y>0</y>
47-
<width>1081</width>
48-
<height>443</height>
47+
<width>1093</width>
48+
<height>482</height>
4949
</rect>
5050
</property>
5151
<property name="acceptDrops">
@@ -63,7 +63,7 @@
6363
<x>0</x>
6464
<y>0</y>
6565
<width>1440</width>
66-
<height>22</height>
66+
<height>21</height>
6767
</rect>
6868
</property>
6969
<widget class="QMenu" name="menuFile_">
@@ -152,8 +152,22 @@
152152
<property name="title">
153153
<string>Download toolkit</string>
154154
</property>
155-
<addaction name="actionForwardInverse_"/>
156-
<addaction name="actionBrainStimulator_"/>
155+
<widget class="QMenu" name="menuForwardInverse_">
156+
<property name="title">
157+
<string>Forward/Inverse</string>
158+
</property>
159+
<addaction name="actionForwardInverseStable_"/>
160+
<addaction name="actionForwardInverseNightly_"/>
161+
</widget>
162+
<widget class="QMenu" name="menuBrainStimulator_">
163+
<property name="title">
164+
<string>Brain Stimulator</string>
165+
</property>
166+
<addaction name="actionBrainStimulatorStable_"/>
167+
<addaction name="actionBrainStimulatorNightly_"/>
168+
</widget>
169+
<addaction name="menuForwardInverse_"/>
170+
<addaction name="menuBrainStimulator_"/>
157171
</widget>
158172
<addaction name="menuDownload_toolkit"/>
159173
<addaction name="actionLoadToolkit_"/>
@@ -945,16 +959,6 @@
945959
<string>Tag Manager</string>
946960
</property>
947961
</action>
948-
<action name="actionForwardInverse_">
949-
<property name="text">
950-
<string>Forward/Inverse</string>
951-
</property>
952-
</action>
953-
<action name="actionBrainStimulator_">
954-
<property name="text">
955-
<string>Brain Stimulator</string>
956-
</property>
957-
</action>
958962
<action name="actionToggleMetadataLayer_">
959963
<property name="checkable">
960964
<bool>true</bool>
@@ -1186,6 +1190,26 @@
11861190
<string>Launch new instance...</string>
11871191
</property>
11881192
</action>
1193+
<action name="actionForwardInverseNightly_">
1194+
<property name="text">
1195+
<string>Nightly (OSX only)</string>
1196+
</property>
1197+
</action>
1198+
<action name="actionBrainStimulatorNightly_">
1199+
<property name="text">
1200+
<string>Nightly (OSX only)</string>
1201+
</property>
1202+
</action>
1203+
<action name="actionForwardInverseStable_">
1204+
<property name="text">
1205+
<string>Stable</string>
1206+
</property>
1207+
</action>
1208+
<action name="actionBrainStimulatorStable_">
1209+
<property name="text">
1210+
<string>Stable</string>
1211+
</property>
1212+
</action>
11891213
</widget>
11901214
<resources/>
11911215
<connections>

0 commit comments

Comments
 (0)