From 46810aa9900563620184d8252773962f26367ec1 Mon Sep 17 00:00:00 2001 From: Lyrositor Date: Fri, 11 May 2012 17:21:40 -0400 Subject: [PATCH 1/3] Fixed console documentation. Prompting for brief HTML documentation no longer appends a new group to the previous one (see https://github.com/H-uru/Plasma/issues/170). --- .../FeatureLib/pfConsole/pfConsoleCmd.cpp | 2 +- .../FeatureLib/pfConsole/pfConsoleCommands.cpp | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp index 6fe21819..afcba38e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp @@ -570,7 +570,7 @@ UInt8 pfConsoleCmd::GetSigEntry( UInt8 i ) const char *pfConsoleCmd::GetSignature( void ) { - static char string[ 256 ]; + char string[ 256 ]; int i; char pStr[ 128 ]; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index 4ec123a1..567af09d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -752,7 +752,7 @@ public: if(strncmp("SampleCmd",c->GetName(), 9) != 0) { - fprintf(fFile, "

%s
%s

\n",c->GetSignature(), + fprintf(fFile, "

%s
%s

\n",c->GetSignature(), c->GetHelp()); } } @@ -760,10 +760,11 @@ public: { // if(g->GetFirstCommand() != nil) { - fprintf(fFile, "

Command %sGroup %s

\n", + fprintf(fFile, "

Command %sGroup %s

\n", (depth > 0) ? "3" : "2", (depth > 0) ? "Sub" :"" , - g->GetName()); + g->GetName(), + (depth > 0) ? "3" : "2"); } return true; } @@ -781,7 +782,7 @@ public: if(strncmp("SampleCmd",c->GetName(), 9) != 0) { - fprintf(fFile, "%s.%s - %s
\n",fGrpName,c->GetSignature(), + fprintf(fFile, "%s.%s - %s
\n",fGrpName,c->GetSignature(), c->GetHelp()); } } @@ -789,11 +790,14 @@ public: { // if(g->GetFirstCommand() != nil) { - fprintf(fFile, "
\n"); + fprintf(fFile, "
\n"); if(depth <1) strcpy(fGrpName, g->GetName()); else { + pfConsoleCmdGroup *parentGrp; + parentGrp = g->GetParent(); + strcpy(fGrpName, parentGrp->GetName()); strcat(fGrpName,"."); strcat(fGrpName,g->GetName()); } @@ -822,7 +826,7 @@ PF_CONSOLE_CMD( Console, CreateDocumentation, "string fileName", } - fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", + fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", pnBuildDates::fBuildTime, pnBuildDates::fBuildDate ); DocGenIterator iter(f); @@ -852,7 +856,7 @@ PF_CONSOLE_CMD( Console, CreateBriefDocumentation, "string fileName", return; } - fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", + fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", pnBuildDates::fBuildTime, pnBuildDates::fBuildDate ); BriefDocGenIterator iter(f); group = pfConsoleCmdGroup::GetBaseGroup(); From 5951a11e86094bde52efc9320757b762e7b34656 Mon Sep 17 00:00:00 2001 From: Lyrositor Date: Sun, 13 May 2012 08:51:32 -0400 Subject: [PATCH 2/3] Add static keyword back. --- .../Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp index afcba38e..6fe21819 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp @@ -570,7 +570,7 @@ UInt8 pfConsoleCmd::GetSigEntry( UInt8 i ) const char *pfConsoleCmd::GetSignature( void ) { - char string[ 256 ]; + static char string[ 256 ]; int i; char pStr[ 128 ]; From 743419d9e567e6074f06f981cd9fe762fd1bd6a2 Mon Sep 17 00:00:00 2001 From: Lyrositor Date: Sun, 13 May 2012 09:14:47 -0400 Subject: [PATCH 3/3] Better centering and header consistency. --- .../Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index 567af09d..da890f04 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -826,7 +826,7 @@ PF_CONSOLE_CMD( Console, CreateDocumentation, "string fileName", } - fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", + fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.
", pnBuildDates::fBuildTime, pnBuildDates::fBuildDate ); DocGenIterator iter(f); @@ -856,7 +856,7 @@ PF_CONSOLE_CMD( Console, CreateBriefDocumentation, "string fileName", return; } - fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.

", + fprintf(f, "

Console Commands for Plasma 2.0 Client

Built %s on %s.
", pnBuildDates::fBuildTime, pnBuildDates::fBuildDate ); BriefDocGenIterator iter(f); group = pfConsoleCmdGroup::GetBaseGroup();