Browse Source

F1 works; Makefile updated

Artur Efimov 6 years ago
parent
commit
9b51d6639c
2 changed files with 15 additions and 6 deletions
  1. 10 5
      src/FreeOberon.Mod
  2. 5 1
      src/Makefile_linux

+ 10 - 5
src/FreeOberon.Mod

@@ -612,6 +612,13 @@ BEGIN w := c.app.windows;
   END
 END OnBuild;
 
+PROCEDURE HelpAbout(c: OV.Control);
+BEGIN
+  IF app.statusText[0] # 0X THEN OV.SetStatusText(app, '')
+  ELSE OV.SetStatusText(app, 'Visit freeoberon.su')
+  END
+END HelpAbout;
+
 PROCEDURE InitIDE;
 VAR w: OV.Window;
     m, m2: OV.Menu;
@@ -751,16 +758,14 @@ BEGIN
   OV.Add(m, OV.NewMenu('&Files...', '', 0, NIL));
   (*!TODO*) m.children.prev.status := OV.disabled;
   OV.Add(m, OV.NewMenu('-', '', 0, NIL));
-  OV.Add(m, OV.NewMenu('&About...', '', 0, NIL));
-  (*!TODO*) m.children.prev.status := OV.disabled;
+  OV.Add(m, OV.NewMenu('&About...', '', OV.hF1, HelpAbout));
   OV.AddMenu(app, m);
 
-  OV.AddStatusbar(app, OV.NewQuickBtn('Help', 'F1', 0, NIL));
+  OV.AddStatusbar(app, OV.NewQuickBtn('Help', 'F1', 0, HelpAbout));
   OV.AddStatusbar(app, OV.NewQuickBtn('Save', 'F2', 0, FileSave));
   OV.AddStatusbar(app, OV.NewQuickBtn('Open', 'F3', 0, FileOpen));
   OV.AddStatusbar(app, OV.NewQuickBtn('Compile & Run', 'F9', 0, OnBuild));
-  OV.AddStatusbar(app, OV.NewQuickBtn('Local menu', 'Alt+F10', 0, NIL));
-  (*OV.SetStatusText(app, 'Hello');*)
+  OV.AddStatusbar(app, OV.NewQuickBtn('Local menu', 'Alt+F10', 0, NIL))
 END InitIDE;
 
 PROCEDURE Init(): BOOLEAN;

+ 5 - 1
src/Makefile_linux

@@ -6,6 +6,8 @@ SDL2Opts=`sdl2-config --cflags --libs`
 
 all: prepare voc $(PROG) install
 
+fo: $(PROG)
+
 $(PROG): $(PROG).sym
 	$(CC) -fPIC -g -I ../data/bin/voc/C/include \
 		-o $(PROG) $(PROG).o Graph.o SDL2.o \
@@ -48,9 +50,11 @@ SDL2.sym: SDL2.Mod
 
 .PHONY: clean cleanall install pack prepare
 
-clean:
+cleanfo:
 	rm -f *.c *.h *.o *.sym term/term.o .tmp..* \
 		../Programs/.tmp..* ../bin/*
+
+clean: cleanfo
 	make -C ../data/bin/voc/src clean
 
 cleanall: clean