TerminalAppGen3 v0.1.1 source

Author: rforzachamp821

CommandFiles/CPUStress.cpp

@@ -109,7 +109,7 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 	if (nSingleOrMulti == 1) {
 
 		// Start timer and call the cpu benchmark worker only once for single core
-		std::cout << "Starting single-core benchmark with " << nReiterationCount << " reiterations.\n";
+		std::cout << "Starting single-core benchmark with " << nReiterationCount << " reiterations, 1 core.\n";
 		slowcolourfn(LGRN, sColourGlobalBack, "Single-core benchmark has started...\n");
 		clearkeebbuf();
 
@@ -139,7 +139,7 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 		std::vector<std::thread> vThreads(nLogicalCoreCount);
 
 		// Start timer and call the cpu benchmark worker nLogicalCoreCount times
-		std::cout << "Starting multi-core benchmark with " << nReiterationCount << " reiterations.\n";
+		std::cout << "Starting multi-core benchmark with " << nReiterationCount << " reiterations, " << nLogicalCoreCount << " logical cores.\n";
 		slowcolourfn(LGRN, sColourGlobalBack, "Multi-core benchmark has started...\n");
 		clearkeebbuf();
 
@@ -157,7 +157,7 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 				break;
 			}
 			// Output progress
-			std::cout << "Progress: " << (nCurrentReiterationNum * 100) / nReiterationCount << "%\r";
+			std::cout << "Progress: " << (nCurrentReiterationNum * 100) / nReiterationCount << "%    \r";
 		}
 
 		StopCpuStress = true;

CommandFiles/CommandsFile.cpp

@@ -186,7 +186,7 @@ void ColourBackground(int nChoice = 0) {
 		oseColourBack.sOptions = sOptions;
 
 		// Display options
-		int nChoice = oseColourBack.OptionSelect("Please choose your desired background colour below:", " ___COLOUR___ ");
+		nChoice = oseColourBack.OptionSelect("Please choose your desired background colour below:", " ___COLOUR___ ");
 	}
 	else if (nChoice == 17) {
 		colour(YLW, sColourGlobalBack);
@@ -408,7 +408,7 @@ void help() {
 	sneHelp.nSizeOfScreens = 3;
 	std::string sScreens[] =
 	{
-		"___LIST OF COMMANDS___\n\n[1] Help\n[2] Exit\n[3] Tutorial\n[4] DevOptions\n[5] CPUStress\n[6] Colour\n[7] Settings\n[8] Title\n[9] Date\n[10] ColourNumbers\n\nMore will be added soon!\n",
+		"___LIST OF COMMANDS___\n\n[1] Help\n[2] Exit\n[3] Tutorial\n[4] DevTools\n[5] CPUStress\n[6] Colour\n[7] Settings\n[8] Title\n[9] Date\n[10] ColourNumbers\n\nMore will be added soon!\n",
 
 		"___FREQUENTLY ASKED QUESTIONS___\n\n"
 		"1) I can't see the terminal text. How can I zoom in?\n  1a) You can zoom in, of course. Press and hold the Ctrl button and scroll with the mouse to your desired text size.\n",
@@ -739,7 +739,7 @@ void DevTools(short int nToolNum) {
 		CentreColouredText(" ___ANSI VT TESTING ENVIRONMENT___ ", 1);
 		std::cout << std::endl;
 		colourSubheading();
-		slowcharCentredFn(true, "This is a sandbox-style testing enviroment for ANSI (VT) escape codes. For experienced users only.");
+		slowcharCentredFn(true, "This is a sandbox-style testing enviroment for ANSI (VT) escape codes.");
 		colour(sColourGlobal, sColourGlobalBack);
 
 		std::cout << NOULINE_STR << "\n\n" << wordWrap("You can test any ANSI escape code here. Everything will be reset after exiting the sandbox (by typing in 0 or \"zero\").");
@@ -1882,6 +1882,15 @@ void Commands(const std::string sCommand, char* cCommandArgs, std::string* sStri
 			case 6:
 				AnsiSettings();
 				break;
+			case 7:
+				WordWrapSettings();
+				break;
+			case 8:
+				CursorSettings();
+				break;
+			case 9:
+				OtherSettings();
+				break;
 
 			default:
 				colour(RED, sColourGlobalBack);
@@ -2019,4 +2028,4 @@ void Commands(const std::string sCommand, char* cCommandArgs, std::string* sStri
 		return;
 	}
 	return;
-}
+}

CommandFiles/Settings.cpp

@@ -608,8 +608,8 @@ void CursorSettings(short int nChoice = 0, short int nChoiceBlink = 0, short int
 			oseShape.nSizeOfOptions = 3;
 			std::string sOptions[] = {
 				"Block Shape",
-				"Underline-style Shape"
-				"Bar Shape (Default)",
+				"Underline-style Shape",
+				"Bar Shape (Default)"
 			};
 			oseShape.sOptions = sOptions;
 
@@ -705,9 +705,9 @@ void OtherSettings(short int nChoice = 0, int nChoiceSlowChSpeed = 0, bool bFrom
 			CentreColouredText(" ___SLOWCHAR SPEED SETINGS___ ", 1);
 			std::cout << "\n";
 			colourSubheading(); // extra info colour is the same as subheading colour
-			std::cout << "Higher numbers are faster.";
+			std::cout << "Higher numbers are faster." << NOULINE_STR;
 			colour(sColourGlobal, sColourGlobalBack);
-			std::cout << "\nDefault Speed: 45\n" << wordWrap("Input 0 to disable SlowChar entirely, and input a negative number to exit.") << '\n';
+			std::cout << "\nDefault Speed: 45\nCurrent Speed: " << nSlowCharSpeed << "\n\n" << wordWrap("Input 0 to disable SlowChar entirely, and input a negative number to exit.") << '\n';
 
 			nChoiceSlowChSpeed = num("Please input how fast you want SlowChar to be: > ");
 		}
@@ -791,4 +791,6 @@ void OtherSettings(short int nChoice = 0, int nChoiceSlowChSpeed = 0, bool bFrom
 
 		return;
 	}
+
+	return;
 }