Menu
▾
▴
[Easycalc-commits] easycalc Makefile.in, 1.33, 1.34 calc.rcp.in, 1.106, 1.107
|
From: Ton v. O. <tvo...@us...> - 2006-09-06 01:12:05
|
Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20594 Modified Files: Makefile.in calc.rcp.in Log Message: Eliminated language specific header files (lang.h) following a suggestion of dti17 at narod.ru . Index: Makefile.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/Makefile.in,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile.in 25 Aug 2006 02:08:13 -0000 1.33 --- Makefile.in 6 Sep 2006 01:11:58 -0000 1.34 *************** *** 108,114 **** sed -e "s/VERSION_HERE/`cat VERSION`/g" > $(RCPFILE) ! %.stamp: $(RCPFILE) calcrsc.h $(LANGDIR)/%.h -rm $(ROFILE) - @ln -sf $(LANGDIR)/$*.h lang.h @if [ $* = 'jp' ]; then \ echo "$(PILRC) -ro -o $(ROFILE) -allowEditID -q -Fj -L $* $(RCPFILE)";\ --- 108,113 ---- sed -e "s/VERSION_HERE/`cat VERSION`/g" > $(RCPFILE) ! %.stamp: $(RCPFILE) calcrsc.h -rm $(ROFILE) @if [ $* = 'jp' ]; then \ echo "$(PILRC) -ro -o $(ROFILE) -allowEditID -q -Fj -L $* $(RCPFILE)";\ *************** *** 119,123 **** fi touch $@ - @rm -f lang.h $(TARGET): $(OBJS) $(TARGET)-sections.ld --- 118,121 ---- Index: calc.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** calc.rcp.in 25 Aug 2006 00:29:01 -0000 1.106 --- calc.rcp.in 6 Sep 2006 01:11:58 -0000 1.107 *************** *** 4,8 **** #include "calcrsc.h" - #include "lang.h" #ifdef SUPPORT_DIA #include "resizeconsts.h" --- 4,7 ---- *************** *** 84,88 **** LABEL "$$NAME:" AUTOID AT (5 15) ! FIELD ID slvOptionsTitle AT (PREVLEFT+NAMELEN PREVTOP 145-NAMELEN 12) USABLE EDITABLE UNDERLINED MAXCHARS MAX_WORKSHEET_TITLE AUTOSHIFT LABEL "$$MINIMUM:" AUTOID AT (5 PREVTOP+15) --- 83,87 ---- LABEL "$$NAME:" AUTOID AT (5 15) ! FIELD ID slvOptionsTitle AT (PREVRIGHT+2 PREVTOP 145-PREVRIGHT-2 12) USABLE EDITABLE UNDERLINED MAXCHARS MAX_WORKSHEET_TITLE AUTOSHIFT LABEL "$$MINIMUM:" AUTOID AT (5 PREVTOP+15) *************** *** 107,111 **** LABEL "$$NAME:" AUTOID AT (5 15) ! FIELD ID slvTitle AT (PREVLEFT+NAMELEN PREVTOP 145-NAMELEN 12) USABLE EDITABLE UNDERLINED MAXCHARS MAX_WORKSHEET_TITLE AUTOSHIFT BUTTON "$$OK" ID slvTitleOK AT (5 32 40 12) BUTTON "$$CANCEL" ID slvTitleCancel AT (PREVRIGHT+5 PREVTOP AUTO 12) --- 106,110 ---- LABEL "$$NAME:" AUTOID AT (5 15) ! FIELD ID slvTitle AT (PREVRIGHT+2 PREVTOP 145-PREVRIGHT-2 12) USABLE EDITABLE UNDERLINED MAXCHARS MAX_WORKSHEET_TITLE AUTOSHIFT BUTTON "$$OK" ID slvTitleOK AT (5 32 40 12) BUTTON "$$CANCEL" ID slvTitleCancel AT (PREVRIGHT+5 PREVTOP AUTO 12) *************** *** 261,265 **** LABEL "$$NAME:" AUTOID AT (5 20) FONT 1 ! FIELD ID varEntryField AT (PREVLEFT+NAMELEN 20 133-NAMELEN 20) EDITABLE UNDERLINED MAXCHARS 10 USABLE POPUPTRIGGER "" ID varEntryListBut AT (137 20 12 10) LIST "" ID varEntryList AT (105 5 45 40) NONUSABLE DISABLED VISIBLEITEMS 1 --- 260,264 ---- LABEL "$$NAME:" AUTOID AT (5 20) FONT 1 ! FIELD ID varEntryField AT (PREVRIGHT+2 20 133-PREVRIGHT-2 20) EDITABLE UNDERLINED MAXCHARS 10 USABLE POPUPTRIGGER "" ID varEntryListBut AT (137 20 12 10) LIST "" ID varEntryList AT (105 5 45 40) NONUSABLE DISABLED VISIBLEITEMS 1 *************** *** 281,287 **** LABEL "$$NAME:" AUTOID AT (5 15) FONT 1 ! FIELD ID varEditNameField AT (PREVLEFT+NAMELEN 15 85-NAMELEN 12) EDITABLE UNDERLINED MAXCHARS 10 USABLE FIELD ID varEditField AT (5 30 145 30) EDITABLE UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE MULTIPLELINES ! BUTTON "$$OK" ID varEditOK AT (5 58 DT_OKLEN 12) BUTTON "$$CANCEL" ID varEditCancel AT (PREVRIGHT+5 PREVTOP AUTO 12) LABEL "$$PARAM:" varEditParamLabel AT (92 15) FONT 1 NONUSABLE --- 280,286 ---- LABEL "$$NAME:" AUTOID AT (5 15) FONT 1 ! FIELD ID varEditNameField AT (PREVRIGHT+2 15 85-PREVRIGHT-2 12) EDITABLE UNDERLINED MAXCHARS 10 USABLE FIELD ID varEditField AT (5 30 145 30) EDITABLE UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE MULTIPLELINES ! BUTTON "$$OK" ID varEditOK AT (5 58 AUTO 12) BUTTON "$$CANCEL" ID varEditCancel AT (PREVRIGHT+5 PREVTOP AUTO 12) LABEL "$$PARAM:" varEditParamLabel AT (92 15) FONT 1 NONUSABLE *************** *** 295,299 **** LIST "" ID varBuiltinList AT (80 10 65 66) NONUSABLE DISABLED VISIBLEITEMS 14 ! GRAFFITISTATEINDICATOR AT (140 63) END --- 294,298 ---- LIST "" ID varBuiltinList AT (80 10 65 66) NONUSABLE DISABLED VISIBLEITEMS 14 ! GRAFFITISTATEINDICATOR AT (147 63) END *************** *** 848,851 **** --- 847,858 ---- END + ALERT ID altErrorMsg + ERROR + BEGIN + TITLE "$$ERROR" + MESSAGE "^1" + BUTTONS "$$OK" + END + ALERT ID altOctalMode ERROR |
