- Change version from demo5 to EX, and level from 2.4.3 to 2.5.0

- Clean up version output to be consistent in all apps

Author: rtklibexplorer

app/winapp/appcmn/aboutdlg.cpp

@@ -20,7 +20,7 @@ void __fastcall TAboutDialog::FormShow(TObject *Sender)
 	AnsiString s;
 	if (IconIndex>0) icon[IconIndex-1]->Visible=true;
 	LabelAbout->Caption=About;
-	LabelVer->Caption=s.sprintf("with RTKLIB ver:%s %s",VER_RTKLIB,PATCH_LEVEL);
+	LabelVer->Caption=s.sprintf("with RTKLIB-%s %s",VER_RTKLIB,PATCH_LEVEL);
 	LabelCopyright->Caption=COPYRIGHT_RTKLIB;
 }
 //---------------------------------------------------------------------------

app/winapp/rtkconv/convmain.cpp

@@ -87,7 +87,7 @@ void __fastcall TMainWindow::FormCreate(TObject *Sender)
 {
 	AnsiString s;
 
-	Caption=s.sprintf("%s ver:%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+	Caption=s.sprintf("%s-%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
 
 	::DragAcceptFiles(Handle,true);
 }
@@ -959,7 +959,7 @@ void __fastcall TMainWindow::ConvertFile(void)
 	}
 	GetTime(&rnxopt.ts,&rnxopt.te,&rnxopt.tint,&rnxopt.tunit);
 	strncpy(rnxopt.staid,RnxCode.c_str(),31);
-	sprintf(rnxopt.prog,"%s %s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+	sprintf(rnxopt.prog,"%s-%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
 	strncpy(rnxopt.runby,RunBy.c_str(),31);
 	strncpy(rnxopt.marker,Marker.c_str(),63);
 	strncpy(rnxopt.markerno,MarkerNo.c_str(),31);

app/winapp/rtkget/getmain.cpp

@@ -101,7 +101,7 @@ void __fastcall TMainForm::FormCreate(TObject *Sender)
     strcpy(p,".ini");
     IniFile=file;
 
-    Caption=str.sprintf("%s v.%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+    Caption=str.sprintf("%s-%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
 
     strcpy(buff,GetCommandLine());
 

app/winapp/rtklaunch/launchmain.cpp

@@ -68,8 +68,8 @@ __fastcall TMainForm::TMainForm(TComponent* Owner)
 	if (Left<0) Left=0;
 	if (Left+Width>rect.Width()) Left=rect.Width()-Width;
 
-    Caption="RTKLIB v." VER_RTKLIB " " PATCH_LEVEL;
-    BtnRtklib->Hint="RTKLIB v." VER_RTKLIB " " PATCH_LEVEL;
+    Caption="RTKLIB-" VER_RTKLIB " " PATCH_LEVEL;
+    BtnRtklib->Hint="RTKLIB-" VER_RTKLIB " " PATCH_LEVEL;
     TrayIcon->Hint=Caption;
     Panel1->Constraints->MinWidth=BTN_SIZE+2;
     Panel1->Constraints->MaxWidth=BTN_SIZE*BTN_COUNT+2;

app/winapp/rtknavi/navimain.cpp

@@ -149,7 +149,7 @@ __fastcall TMainForm::TMainForm(TComponent* Owner)
     strinit(&monistr);
 
     Caption=PRGNAME;
-    Caption=Caption+" ver."+VER_RTKLIB+" "+PATCH_LEVEL;
+    Caption=Caption+"-"+VER_RTKLIB+" "+PATCH_LEVEL;
     DoubleBuffered=true;
 
     PanelStack=PanelMode=0;
@@ -2197,7 +2197,7 @@ void __fastcall TMainForm::OpenMoniPort(int port)
 
         if (stropen(&monistr,STR_TCPSVR,STR_MODE_RW,path)) {
             strsettimeout(&monistr,TimeoutTime,ReconTime);
-            if (i>0) Caption=s.sprintf("%s ver.%s %s (%d)",PRGNAME,VER_RTKLIB,PATCH_LEVEL,i+1);
+            if (i>0) Caption=s.sprintf("%s-%s %s (%d)",PRGNAME,VER_RTKLIB,PATCH_LEVEL,i+1);
             OpenPort=port+i;
             return;
         }
@@ -2264,7 +2264,7 @@ void __fastcall TMainForm::SaveLog(void)
     opt=SolOpt;
     opt.posf=posf[SolType];
     if (SolOpt.outhead) {
-        fprintf(fp,"%% program   : %s ver.%s %s\n",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+        fprintf(fp,"%% program   : %s-%s %s\n",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
         if (PrcOpt.mode>=PMODE_DGPS && PrcOpt.mode<=PMODE_FIXED) {
             ecef2pos(PrcOpt.rb,pos);
             fprintf(fp,"%% ref pos   :%13.9f %14.9f %10.4f\n",pos[0]*R2D,

app/winapp/rtknavi/naviopt.cpp

@@ -1126,7 +1126,7 @@ void __fastcall TOptDialog::SaveOpt(AnsiString file)
 	strcpy(filopt.tempdir,LocalDir_Text.c_str());
 
 	time2str(utc2gpst(timeget()),s,0);
-	sprintf(comment,"RTKNAVI options (%s, v.%s %s)",s,VER_RTKLIB,PATCH_LEVEL);
+	sprintf(comment,"RTKNAVI options (%s-%s %s)",s,VER_RTKLIB,PATCH_LEVEL);
 	setsysopts(&prcopt,&solopt,&filopt);
 	if (!saveopts(file.c_str(),"w",comment,sysopts)||
 		!saveopts(file.c_str(),"a","",rcvopts)) return;

app/winapp/rtkplot/mapoptdlg.cpp

@@ -47,7 +47,7 @@ void __fastcall TMapOptDialog::BtnSaveClick(TObject *Sender)
 		if (ConfDialog->ShowModal()!=mrOk) return;
 	}
 	if (!(fp=fopen(file.c_str(),"w"))) return;
-	fprintf(fp,"%% map image tag file: rtkplot %s %s\n\n",VER_RTKLIB,PATCH_LEVEL);
+	fprintf(fp,"%% map image tag file: rtkplot-%s %s\n\n",VER_RTKLIB,PATCH_LEVEL);
 	fprintf(fp,"scalex  = %.6g\n",Plot->MapScaleX );
 	fprintf(fp,"scaley  = %.6g\n",Plot->MapScaleEq?Plot->MapScaleX:Plot->MapScaleY);
 	fprintf(fp,"scaleeq = %d\n"  ,Plot->MapScaleEq);

app/winapp/rtkplot/plotdata.cpp

@@ -1448,7 +1448,7 @@ void __fastcall TPlot::Clear(void)
     if (!ConnectState) {
         initsolbuf(SolData  ,0,0);
         initsolbuf(SolData+1,0,0);
-        Caption=Title!=""?Title:s.sprintf("%s ver.%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+        Caption=Title!=""?Title:s.sprintf("%s-%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
     }
     else {
         initsolbuf(SolData  ,1,RtBuffSize+1);

app/winapp/rtkplot/plotmain.cpp

@@ -261,7 +261,7 @@ void __fastcall TPlot::FormShow(TObject *Sender)
         Connect();
     }
     else if (OpenFiles->Count<=0) {
-        Caption=Title!=""?Title:s.sprintf("%s ver.%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+        Caption=Title!=""?Title:s.sprintf("%s-%s %s",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
     }
     if (ShapeFile!="") {
         TStringList *files=new TStringList;
@@ -884,7 +884,7 @@ void __fastcall TPlot::MenuMapViewClick(TObject *Sender)
     AnsiString s;
 
     MapView->Caption=
-        s.sprintf("%s ver.%s %s: Map View",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
+        s.sprintf("%s-%s %s: Map View",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
     MapView->Show();
 }
 // callback on menu-center-origin -------------------------------------------

app/winapp/rtkplot/skydlg.cpp

@@ -44,7 +44,7 @@ void __fastcall TSkyImgDialog::BtnSaveClick(TObject *Sender)
 		if (ConfDialog->ShowModal()!=mrOk) return;
 	}
 	if (!(fp=fopen(file.c_str(),"w"))) return;
-	fprintf(fp,"%% sky image tag file: rtkplot %s %s\n\n",VER_RTKLIB,PATCH_LEVEL);
+	fprintf(fp,"%% sky image tag file: rtkplot-%s %s\n\n",VER_RTKLIB,PATCH_LEVEL);
 	fprintf(fp,"centx   = %.6g\n",Plot->SkyCent[0]);
 	fprintf(fp,"centy   = %.6g\n",Plot->SkyCent[1]);
 	fprintf(fp,"scale   = %.6g\n",Plot->SkyScale  );