Skip to content

Commit c77e1cf

Browse files
richardicooperrichardicooper
authored
Merge pull request #180 from ChemCryst/some_new_icons
Some new icons, tab switching, fix broken urls.
2 parents 41f541c + 132d095 commit c77e1cf

36 files changed

+250
-54
lines changed

‎datafiles/maintoolbar.ssr

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
^^WI TOOL _MGU 'guide.png' 'Guide' '#SCRIPT XGUIDE'
77
^^WI DISABLEIF='IN'
88
^^WI SPLIT
9+
^^WI TOOL _MGU 'import.png' 'Import' '#SCRIPT XFILE_ANY'
10+
^^WI DISABLEIF='IN'
11+
^^WI SPLIT
912
^^WI TOOL _MFO fourier.png
1013
^^WI 'Fourier'
1114
^^WI '#SCRIPT XFOUR_NDIFF' DISABLEIF='IN QS' ENABLEIF='L5 L1 L2'
@@ -41,6 +44,11 @@
4144
^^WI 'Initiate some cycles of refinement'
4245
^^WI '#SCRIPT XREFINE' DISABLEIF='IN'
4346
^^WI SPLIT
47+
^^WI TOOL _AGREE 'scatter.png' 'Fo vs Fc graph' '#SCRIPT XFOVSFC'
48+
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
49+
^^WI TOOL _MGU 'export.png' 'Export' '#SCRIPT XCIF'
50+
^^WI DISABLEIF='IN QS' ENABLEIF='L1 L2 L3 L5 L6'
51+
^^WI SPLIT
4452
^^WI TOOL _MCA cam.png
4553
^^WI 'Manipulate the structure with Cameron graphics'
4654
^^WI '#SCRIPT XCAMNORM'

‎datafiles/menu-analyse.ssr

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
%%SSR MENU-ANALYSE
22
^^WI MENU _ANALYSE 'A&nalyse'
3-
^^WI ITEM AGREE '&Agreement analysis Ctrl+A' '#SCRIPT XANAL'
4-
^^WI ENABLEIF='L5 L6' DISABLEIF='IN'
5-
^^WI ITEM AGREE '&Fo vs Fc graph Ctrl+F' '#SCRIPT XFOVSFC'
6-
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
3+
^^WI ITEM AGREE '&Agreement analysis Alt+A' '#SCRIPT XANAL'
4+
^^WI ICON='agree.png' ENABLEIF='L5 L6' DISABLEIF='IN'
5+
^^WI ITEM AGREE '&Fo vs Fc graph Alt+F' '#SCRIPT XFOVSFC'
6+
^^WI ICON='scatter.png' ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
77
^^WI ITEM AGREE '&Normal probability plot' '#SCRIPT XNORMPP'
8-
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
8+
^^WI ICON='npp.png' ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
99
^^WI ITEM DIFAB '&Difabs analysis' '#SCRIPT XDIFABS'
10-
^^WI ENABLEIF='L5 L6' DISABLEIF='IN'
11-
^^WI ITEM AGREE '&Wilson plot Ctrl+W' '#SCRIPT XWILSON'
12-
^^WI ENABLEIF='L6 L1 L2' DISABLEIF='IN'
10+
^^WI ICON='difabs.png' ENABLEIF='L5 L6' DISABLEIF='IN'
11+
^^WI ITEM AGREE '&Wilson plot Alt+W' '#SCRIPT XWILSON'
12+
^^WI ICON='wilson.png' ENABLEIF='L6 L1 L2' DISABLEIF='IN'
1313
^^WI SPLIT
1414
^^WI ITEM AGREE '&Variance of Reflections' '#SCRIPT CHOOSEVAR'
15-
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
15+
^^WI ICON='var.png' ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
1616
^^WI ITEM AGREE '&Wt vs Sigma graph' '#SCRIPT XWTVSIG'
17-
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
17+
^^WI ICON='var.png' ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
1818
^^WI ITEM AGREE '&Multiplicity of Observation' '#SCRIPT XMOO2'
19-
^^WI ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
19+
^^WI ICON='chart.png' ENABLEIF='L6 L5 L1 L2' DISABLEIF='IN'
2020
^^WI ITEM AGREE '&Tabbed initial analyses' '#SCRIPT XCHECK6'
21-
^^WI ENABLEIF='L6' DISABLEIF='IN'
21+
^^WI ICON='init.png' ENABLEIF='L6' DISABLEIF='IN'
2222
^^WI SPLIT
2323
^^WI ITEM HOOFT '&Check Absolute config' '#SCRIPT XFLACKPASCAL'
2424
^^WI ENABLEIF='L5 L6 L30' DISABLEIF='IN'
2525
^^WI ITEM HBON '&Likely H-bonds'
2626
^^WI '#dist_Nou mo=al_Nsel ran=li_Nli 1.5 2.2 .7 2.2_Npi h_Nbo o n_Nen'
2727
^^WI ENABLEIF='L1 L2 L5' DISABLEIF='IN'
2828
^^WI MENU XROTAX '&ROTAX: hklf4 twins'
29-
^^WI ITEM XINTWIN 'ROTAX analysis Ctrl+R' '#SCRIPT XROTAX'
29+
^^WI ITEM XINTWIN 'ROTAX analysis Alt+X' '#SCRIPT XROTAX'
3030
^^WI ENABLEIF='L1 L5 L6' DISABLEIF='IN'
3131
^^WI SPLIT
3232
^^WI ITEM XINTWIN 'Input twin information' '#SCRIPT ED25'
@@ -57,17 +57,19 @@
5757
^^WI ITEM CSDV '&Mogul Geometry Check'
5858
^^WI '#SCRIPT XMOGULGO' DISABLEIF='IN' ENABLEIF='L1 L2 L5'
5959
^^WI SPLIT
60-
^^WI MENU XHELP 'Help'
60+
^^WI ITEM RA 'Analyse menu he&lp'
61+
^^WI '$"crysdir:manual/analyse/analysis.html"' ICON='tool_help_s.png'
62+
^^WI MENU XHELP 'Help'
6163
^^WI ITEM HLPB 'Evaluation'
62-
^^WI '#SPAWN "CRYSDIR:manual/analyse/analysis.html"' DISABLEIF='IN'
64+
^^WI '#SPAWN "CRYSDIR:manual/analyse/analysis.html"' ICON='tool_help_s.png' DISABLEIF='IN'
6365
^^WI ITEM HLPB 'Difficult'
64-
^^WI '#SPAWN "CRYSDIR:manual/analyse/difficult.html"' DISABLEIF='IN'
66+
^^WI '#SPAWN "CRYSDIR:manual/analyse/difficult.html"' ICON='tool_help_s.png' DISABLEIF='IN'
6567
^^WI ITEM HLPc 'Absolute'
66-
^^WI '#SPAWN "CRYSDIR:manual/analyse/absolute.html"' DISABLEIF='IN'
68+
^^WI '#SPAWN "CRYSDIR:manual/analyse/absolute.html"' ICON='tool_help_s.png' DISABLEIF='IN'
6769
^^WI ITEM HLPD 'Absences'
68-
^^WI '#SCRIPT XABSDEMO' DISABLEIF='IN'
70+
^^WI '#SCRIPT XABSDEMO' ICON='tool_help_s.png' DISABLEIF='IN'
6971
^^WI ITEM HLPE 'Resolution'
70-
^^WI '#SCRIPT SINTHETA' DISABLEIF='IN'
72+
^^WI '#SCRIPT SINTHETA' ICON='tool_help_s.png' DISABLEIF='IN'
7173
^^WI ENDMENU
7274
^^WI ENDMENU
7375
%%SSR END

‎datafiles/menu-appearance.ssr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
^^WI ITEM SETF 'Set &Input Font' '^^CO FONT'
3535
^^WI SPLIT
3636
^^WI ITEM XH 'Appearance menu &help'
37-
^^WI '$ "crysdir:manual/tools-menus.html"'
37+
^^WI '$ "crysdir:manual/tools-menus.html"' ICON='tool_help_s.png'
3838
^^WI ENDMENU
3939
%%SSR END
4040

‎datafiles/menu-file.ssr

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
%%SSR MENU-FILE
22
^^WI MENU _FILE '&File'
3-
^^WI ITEM NEW '&New working folder' '#SCRIPT XNEWDIR' DISABLEIF='IN'
3+
^^WI ITEM NEW '&New working folder' '#SCRIPT XNEWDIR' ICON='folder_s.png'
4+
^^WI DISABLEIF='IN'
45
^^WI ITEM OPEND '&Open .dsc file' '#SCRIPT XOPENDSC'
5-
^^WI DISABLEIF='IN'
6-
^^WI ITEM SAVE '&Save .dsc' '#SCRIPT XSAVEEXP' DISABLEIF='IN'
7-
^^WI ITEM SAVEAS 'Save .dsc &as' '#SCRIPT XSAVEAS' DISABLEIF='IN'
6+
^^WI ICON='dsc_s.png' DISABLEIF='IN'
7+
^^WI ITEM SAVE '&Save .dsc' '#SCRIPT XSAVEEXP' DISABLEIF='IN'
8+
^^WI ITEM SAVEAS 'Save .dsc &as' '#SCRIPT XSAVEAS' ICON='save_s.png' DISABLEIF='IN'
89
^^WI SPLIT
910
^^WI ITEM INSTRUCTION 'Run CRYSTALS instruction file'
1011
^^WI '#SCRIPT XUSE' DISABLEIF='IN'
1112
^^WI SPLIT
1213
^^WI ITEM FH 'File menu &help'
1314
^^WI '$"crysdir:manual/tools-menus.html#menus.file"'
15+
^^WI ICON='tool_help_s.png'
1416
^^WI SPLIT
1517
^^WI ITEM EXIT 'E&xit Crystals' 'DIRECT_N#FINISH' DISABLEIF='IN'
1618
^^WI ENDMENU

‎datafiles/menu-fourier.ssr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%%SSR MENU-FOURIER
22
^^WI MENU _FOURIER 'F&ourier'
3-
^^WI ITEM _DIFF '&Difference' '#SCRIPT XFOUR_NDIFF' ICON='fourier.png'
3+
^^WI ITEM _DIFF '&Difference Alt+F' '#SCRIPT XFOUR_NDIFF' ICON='fourier.png'
44
^^WI ENABLEIF='L1 L2 L5 L6' DISABLEIF='IN'
55
^^WI ITEM _FOBS '&F-obs' '#SCRIPT XFOUR_NFOBS'
66
^^WI ENABLEIF='L1 L2 L5 L6' DISABLEIF='IN'

‎datafiles/menu-graphics.ssr

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,50 @@
11
%%SSR MENU-GRAPHICS
22
^^WI MENU CAME '&Graphics'
3-
^^WI ITEM CAM '&Cameron Graphics CTRL+Y'
3+
^^WI ITEM CAM '&Cameron Graphics Ctrl+Y'
44
^^WI '#SCRIPT XCAMNORM' ICON='cam.png'
55
^^WI ENABLEIF='L1 L2 L5' DISABLEIF='IN'
6-
^^WI ITEM CAM '&Cameron (View existing input files)'
6+
^^WI MENU MCAM '&Cameron actions'
7+
^^WI ITEM CAM '&Cameron (View existing input files)'
78
^^WI '#SCRIPT XCAMSPEC'
89
^^WI DISABLEIF='IN'
9-
^^WI SPLIT
10-
^^WI ITEM CIN5 'Import last Cameron output'
10+
^^WI ITEM CIN5 'Import last Cameron output'
1111
^^WI '#USE CAMERON.L5' DISABLEIF='IN'
12-
^^WI ITEM CIN5 'Import last Cameron input'
12+
^^WI ITEM CIN5 'Import last Cameron input'
1313
^^WI '#USE CAMERON.L5I' DISABLEIF='IN'
14+
^^WI ENDMENU
1415
^^WI SPLIT
1516
^^WI ITEM _MER 'View the structure in Mercury'
1617
^^WI '#SCRIPT MERCURY' ICON='mercury.png' DISABLEIF='IN' ENABLEIF='L5'
1718
^^WI ITEM HUS 'Mapviewer' '#SCRIPT HUSAK' DISABLEIF='IN'
1819
^^WI SPLIT
20+
^^WI ITEM _SELEC 'Select All Ctrl+A'
21+
^^WI '^^CO SET MODEL01 SELECT ALL=YES'
22+
^^WI ENABLEIF='L1 L2 L5'
23+
^^WI ITEM _UNSEL '&Unselect All'
24+
^^WI '^^CO SET MODEL01 SELECT ALL=NO'
25+
^^WI ENABLEIF='L1 L2 L5' DISABLEIF='SEL0'
26+
^^WI ITEM _GDELA 'Delete selection Del' '#SCRIPT DELGRP2'
27+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
28+
^^WI ITEM _RPS 'Set atom types of selection F2' '#SCRIPT XTYPES'
29+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
30+
^^WI ITEM _RPT 'Set &residue number of selection' '#SCRIPT XRESGS'
31+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
32+
^^WI ITEM _RPU 'Set &part number of selection Alt+P' '#SCRIPT XPARTGS'
33+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
34+
^^WI ITEM _RPOCCO '&Set occupancy of selection Alt+O' '#SCRIPT XOCCGS'
35+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
36+
^^WI ITEM _GUSET 'Set U[iso] of selection Alt+U' '#SCRIPT XUSETS'
37+
^^WI DISABLEIF='SEL0' ENABLEIF='L5'
38+
^^WI ITEM _RPSS 'Spli&t selection' '#SCRIPT XSPLITS_N_GEND'
39+
^^WI DISABLEIF='IN SEL0' ENABLEIF='L5'
40+
^^WI ITEM ZOOMSEL 'Zoom to selection'
41+
^^WI '^^CO SET MODEL01 ZOOMATOMS YES SELECT ALL=NO' DISABLEIF='SEL0'
42+
^^WI ITEM _CYCLER 'Cycle residues F7' '^^CO SET MODEL01 CYCLER'
43+
^^WI ICON='cycler.png' DISABLEIF='IN' ENABLEIF='L5'
44+
^^WI ITEM _CYCLEG 'Cycle group F8' '^^CO SET MODEL01 CYCLEG'
45+
^^WI ICON='cycleg.png' DISABLEIF='IN' ENABLEIF='L5'
46+
^^WI SPLIT
1947
^^WI ITEM XH 'Graphics menu &help'
20-
^^WI '$ "crysdir:manual/tools-menus.html"'
48+
^^WI '$ "crysdir:manual/tools-menus.html"' ICON='tool_help_s.png'
2149
^^WI ENDMENU
2250
%%SSR END

‎datafiles/menu-help.ssr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122

123123
^^WI SPLIT
124124
^^WI ITEM CK '&Check for updates'
125-
^^WI '#SPAWN http://www.xtl.ox.ac.uk/tag/crystals-release.html'
125+
^^WI '#SPAWN http://www.xtl.ox.ac.uk/tag/crystals-release.1.html'
126126
^^WI DISABLEIF='IN'
127127
^^WI ITEM HWEB '&Oxford Web Page' '#SPAWN http://www.xtl.ox.ac.uk/'
128128
^^WI ITEM HWEB '&Bug report form'
129-
^^WI '#SPAWN https://redmine.debroglie.net/projects/crystals/issues/new'
129+
^^WI '#SPAWN https://github.com/ChemCryst/crystals/issues'
130130
^^WI DISABLEIF='IN'
131131
^^WI ITEM HWEB '&News'
132-
^^WI '#SPAWN http://www.xtl.ox.ac.uk/news.html' DISABLEIF='IN'
132+
^^WI '#SPAWN http://www.xtl.ox.ac.uk/crystals.1.html' DISABLEIF='IN'
133133
^^WI SPLIT
134134
^^WI ITEM ABOUT '&About Crystals' '#SCRIPT XREFER' DISABLEIF='IN'
135135
^^WI ITEM COPYR 'Copyright' '#SPAWN "CRYSDIR:manual/copyright.pdf"'

‎datafiles/menu-refine.ssr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%%SSR MENU-REFINE
22
^^WI MENU _REFINE '&Refinement'
3-
^^WI ITEM _REF '&The Guide' '#SCRIPT XGUIDE' ICON='tool_guid.bmp' DISABLEIF='IN'
3+
^^WI ITEM _REF '&The Guide F4' '#SCRIPT XGUIDE' ICON='tool_guid.bmp' DISABLEIF='IN'
44
^^WI ITEM _REF '&Setup directives and constraints' '#SCRIPT XWRITE5'
55
^^WI ENABLEIF='L1 L2 L3 L5 L6' DISABLEIF='QS IN'
66
^^WI ITEM _REF 'Setu&p and refine Ctrl+R' '#SCRIPT SWRITE5' ICON='dorefine.png'
@@ -45,7 +45,7 @@
4545
^^WI ITEM _SQUEEZE 'Anomalous modified Squeeze' '#SCRIPT PLATANOM'
4646
^^WI ENABLEIF='L1 L2 L3 L5 L6' DISABLEIF='IN'
4747
^^WI ITEM INFO 'Information' '#SCRIPT REFINF'
48-
^^WI DISABLEIF='IN'
48+
^^WI ICON='tool_help_s.png' DISABLEIF='IN'
4949
^^WI ENDMENU
5050
%%END SSR
5151

‎datafiles/menu-results.ssr

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%%SSR MENU-RESULTS
22
^^WI MENU _RESULTS 'Res&ults'
3-
^^WI ITEM PUBL 'Output &CIF file' '#SCRIPT XCIF' DISABLEIF='IN QS'
4-
^^WI ENABLEIF='L1 L2 L3 L5 L6'
3+
^^WI ITEM PUBL 'Output &CIF file' '#SCRIPT XCIF' ICON='export.png'
4+
^^WI DISABLEIF='IN QS' ENABLEIF='L1 L2 L3 L5 L6'
55
^^WI ITEM PUSU 'Output &CIF file no esds' '#SCRIPT XCIFNOSU' DISABLEIF='IN'
66
^^WI ENABLEIF='L1 L2 L3 L5'
77
^^WI ITEM PUAT 'Output Atoms-only &CIF' '#SCRIPT ATOMSCIF' DISABLEIF='IN'
@@ -44,9 +44,7 @@
4444
^^WI '$ http://publcif.iucr.org/services/tools/printcif.php'
4545
^^WI SPLIT
4646
^^WI ITEM RH 'Results menu he&lp'
47-
^^WI '$"crysdir:manual/tools-menus.html"'
48-
^^WI ITEM RA 'Analyse menu he&lp'
49-
^^WI '$"crysdir:manual/analyse/analysis.html"'
47+
^^WI '$"crysdir:manual/tools-menus.html"' ICON='tool_help_s.png'
5048
^^WI ENDMENU
5149
%%SSR END
5250

‎datafiles/menu-structure.ssr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
^^WI DISABLEIF='IN' ENABLEIF='QS'
8080
^^WI SPLIT
8181
^^WI ITEM SHEL 'Help/Information' '#SCRIPT STRUCTINF'
82-
^^WI DISABLEIF='IN'
82+
^^WI ICON='tool_help_s.png' DISABLEIF='IN'
8383
^^WI ENDMENU
8484
%%SSR END
8585

‎datafiles/menu-tools.ssr

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
%%
99
%%
1010
^^WI SPLIT
11+
^^WI ITEM _MEXT '&Explore current working folder'
12+
^^WI '$explorer ./' ICON='explorer.png' DISABLEIF='IN'
1113
^^WI ITEM NOTE '&Notepad' '$notepad' ICON='notepad.png' DISABLEIF='IN'
1214
^^WI ITEM XDL '&Delete BFILES' '#spawn + "crysdir:crdelbf.bat"'
1315
^^WI DISABLEIF='IN'
@@ -102,7 +104,7 @@
102104
^^WI '#SPAWN "CRYSDIR:manual/guide-10.html"' DISABLEIF='IN'
103105
^^WI ENDMENU
104106
^^WI ENDMENU
105-
^^WI ITEM INFO 'Information' '#SCRIPT TOOLINF'
107+
^^WI ITEM INFO 'Information' '#SCRIPT TOOLINF' ICON='tool_help_s.png'
106108
^^WI DISABLEIF='IN'
107109
^^WI ENDMENU
108110
%%END SSR

‎datafiles/menu-xray.ssr

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
^^WI DISABLEIF='IN'
6161
^^WI ITEM _CUT '&Filter reflections' '#SCRIPT XLIST28'
6262
^^WI ENABLEIF='L6'
63-
^^WI ITEM ED05 'Edit &Coordinates' '#SCRIPT SYSED5' DISABLEIF='IN'
63+
^^WI ITEM ED05 'Edit &Coordinates' '#SCRIPT SYSED5' ICON='edit5.png' DISABLEIF='IN'
6464
^^WI ITEM ED29 'Edit &Elemental properties' '#SCRIPT SYSED29'
6565
^^WI DISABLEIF='IN'
6666
^^WI ITEM ED3 'Edit &Scattering Factors' '#SCRIPT EDLIST3' DISABLEIF='IN'
@@ -86,8 +86,9 @@
8686
^^WI SPLIT
8787

8888
^^WI ITEM XH 'CRYSTALS manual "X-ray &help"'
89-
^^WI '$"crysdir:manual/tools-menus.html"'
89+
^^WI '$"crysdir:manual/tools-menus.html"' ICON='tool_help_s.png'
9090
^^WI ITEM XA 'About Data Input'
91-
^^WI '#SPAWN CRYSDIR:manual/Xray-data/table.html' DISABLEIF='IN'
91+
^^WI '#SPAWN CRYSDIR:manual/Xray-data/table.html'
92+
^^WI ICON='tool_help_s.png' DISABLEIF='IN'
9293
^^WI ENDMENU
9394
%%SSR END

‎datafiles/popup-atom.ssr

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@
7878
^^WI ENDMENU
7979
^^WI ITEM _ZMFRG '&Zoom fragment containing _A'
8080
^^WI '^^CO SET MODEL01 SELFRAG _A YES ZOOMATOMS YES SELECT ALL=NO'
81-
^^WI DISABLEIF='IN'
82-
81+
^^WI ICON='tool_zoom.png' DISABLEIF='IN'
8382
^^WI SPLIT
8483
^^WI ITEM _DELA '&Delete _A' '#EDIT_NDELETE _A_NEND'
8584
^^WI DISABLEIF='IN'

‎gui/crtab.cpp

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ CcParse CrTab::ParseInput( deque<string> & tokenList )
183183

184184
while ( hasTokenForMe && ! tokenList.empty() )
185185
{
186+
bool hasInstr = true;
187+
bool hasAttrib = true;
186188
switch ( CcController::GetDescriptor( tokenList.front(), kInstructionClass ) )
187189
{
188190
case kTCreateTab:
@@ -236,13 +238,36 @@ CcParse CrTab::ParseInput( deque<string> & tokenList )
236238
break;
237239
}
238240
case kTEndGrid:
241+
{
239242
tokenList.pop_front(); //run on into default.
243+
}
244+
default:
245+
{
246+
hasInstr = false;
247+
}
248+
}
249+
switch ( CcController::GetDescriptor( tokenList.front(), kAttributeClass ) )
250+
{
251+
case kTSetSelection:
252+
{
253+
tokenList.pop_front();
254+
int select = atoi ( tokenList.front().c_str() );
255+
if (( select >= 0 ) && ( select < m_nTabs)) {
256+
((CxTab*)ptr_to_cxObject)->SetSelection(select);
257+
} else {
258+
LOGERR("CrTab: " + mName + ": Someone tried to change to non-existent tab: " + tokenList.front() );
259+
}
260+
tokenList.pop_front();
261+
break;
262+
}
240263
default:
241264
{
242265
((CxTab*)ptr_to_cxObject)->RedrawTabs();
266+
hasAttrib = false;
243267
hasTokenForMe = false;
244-
}
268+
}
245269
}
270+
hasTokenForMe = hasAttrib || hasInstr;
246271
}
247272
return CcParse(true,mXCanResize,mYCanResize);
248273
}
@@ -286,6 +311,8 @@ CrGUIElement * CrTab::FindObject( const string & Name )
286311
{
287312
CrGUIElement* theElement = nil;
288313

314+
if ( Name == mName ) return this;
315+
289316
list<CrGrid*>::iterator crgi = mTabsList.begin();
290317
for ( ; crgi != mTabsList.end(); crgi++ )
291318
{
@@ -308,9 +335,12 @@ void CrTab::ChangeTab(int tab) //zero-based index of tab to change to
308335
list<CrGrid*>::iterator crgi = mTabsList.begin();
309336
for ( int i = 0; i < tab && crgi != mTabsList.end(); i++ ) { crgi++; }
310337

311-
m_currentTab = *crgi;
312-
if ( m_currentTab ) m_currentTab->CrShowGrid(true);
313-
((CxTab*)ptr_to_cxObject)->RedrawTabs();
338+
if (crgi != mTabsList.end())
339+
{
340+
m_currentTab = *crgi;
341+
if ( m_currentTab ) m_currentTab->CrShowGrid(true);
342+
((CxTab*)ptr_to_cxObject)->RedrawTabs();
343+
}
314344
}
315345

316346
int CrTab::GetIdealWidth()

‎precomp/all/script/agree.png

389 Bytes
Loading

‎precomp/all/script/chart.png

326 Bytes
Loading

‎precomp/all/script/difabs.png

1.29 KB
Loading

‎precomp/all/script/dsc.png

844 Bytes
Loading

‎precomp/all/script/dsc_s.png

669 Bytes
Loading

‎precomp/all/script/export.png

466 Bytes
Loading

‎precomp/all/script/folder.png

495 Bytes
Loading

‎precomp/all/script/folder_s.png

436 Bytes
Loading

‎precomp/all/script/import.png

472 Bytes
Loading

‎precomp/all/script/init.png

683 Bytes
Loading

‎precomp/all/script/npp.png

738 Bytes
Loading

‎precomp/all/script/save.png

568 Bytes
Loading

‎precomp/all/script/save_s.png

495 Bytes
Loading

‎precomp/all/script/scatter.png

521 Bytes
Loading

‎precomp/all/script/tool_help_s.png

576 Bytes
Loading

‎precomp/all/script/var.png

578 Bytes
Loading

‎precomp/all/script/wilson.png

512 Bytes
Loading

‎script/delgrp2.ssc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
%SCRIPT DELGRP2
2+
% COPY '#EDIT'
3+
^^CO GETVALUE MODEL01
4+
% LOOP
5+
% ON END TERMINATE
6+
% CLEAR
7+
% INSERT 'DELETE '
8+
% GET TEXT 'Atom?' ' '
9+
% SEND
10+
% END LOOP
11+
% COPY 'END'
12+
%END SCRIPT

0 commit comments

Comments
 (0)