Ported to Windows too

Author: BitTim

Windows/BitPresent.cpp

@@ -1,21 +1,20 @@
 #include <iostream>
+#include <SDL2/SDL_image.h>
 
 #include "globals.h"
-#include "fileParser.h"
-#include "imageGenerator.h"
-#include "pdfCreator.h"
+#include "presentCreator.h"
+#include "gui.h"
 
 //Initialize all global variables
-std::string Global::_VERSIONSTRING = "BitPresent v1.1.0";
+std::string Global::_VERSIONSTRING = "BitPresent v1.2.0";
 
 int Global::_WIDTH = 1920;
 int Global::_HEIGHT = 1080;
 int Global::_BORDERS = 20;
 int Global::_INDENT = 40;
 
-std::string Global::_OUTPATH = "";
-
-Presentation* Global::_PRESENT = nullptr;
+std::vector<Presentation*> Global::_PRESENT;
+int Global::_CPRESENT = -1;
 int Global::_CSLIDE = -1;
 int Global::_CPOINT = -1;
 
@@ -26,32 +25,39 @@ SDL_Color* Global::_DEFAULTTEXTCOLOR = nullptr;
 std::string Global::_BACKGROUND = "";
 std::string Global::_DEFAULTBACKGROUND = "";
 
+bool Global::useGUI = false;
+guiApp* Global::gApp = nullptr;
+std::string Global::_INPATH = "";
+
+std::string Global::_STATUS = "Ready";
+int Global::_MAXPROGRESS = 7;
+int Global::_PROGRESS = 0;
+
 int main(int argc, char* argv[])
 {
 	std::string inpath = "";
+	std::string outpath = "";
 
 	//Check Argument length
 	if (argc > 3)
 	{
 		printf("[ERROR]: Too many arguments\n");
+		printf("[USAGE]: bitPresent <input_path> [<output_path>]\n");
 		return -1;
 	}
 
-	printf("%s\n", Global::_VERSIONSTRING.c_str());
-
-	if (argc < 2)
-	{
-		printf("[USAGE]: bitPresent <input_path> [<output_path>]\n\n");
-		printf("Please enter the input file path: ");
-		getline(std::cin, inpath);
-		printf("Please enter the output file path: ");
-		getline(std::cin, Global::_OUTPATH);
-	}
+	if (argc < 2) Global::useGUI = true;
 	else
 	{
 		inpath = argv[1];
-		if (argc == 3) Global::_OUTPATH = argv[2];
-		else Global::_OUTPATH = "presentation.pdf";
+		int lastDirSep = inpath.find_last_of("/\\");
+		std::string tmp = inpath.substr(0, lastDirSep + 1);
+		inpath = tmp;
+
+		Global::_INPATH = inpath;
+
+		if (argc == 3) outpath = argv[2];
+		else outpath = "presentation.pdf";
 	}
 
 	//Initialize SDL for future Ops
@@ -76,35 +82,16 @@ int main(int argc, char* argv[])
 	Global::_DEFAULTBACKGROUND = "none";
 	Global::_BACKGROUND = Global::_DEFAULTBACKGROUND;
 
-	//Split input file into tokens
-	std::vector<std::string> tokens = tokenize(inpath);
-	if (tokens.size() == 0)
-	{
-		printf("[ERROR]: Error while opening file\n");
-		return -1;
-	}
-
-	//Create global Presentation object
-	Global::_PRESENT = new Presentation();
-
-	//Parse tokens to global Presentation object
-	parse(tokens);
-
-	//Generate images for each Slide
-	for (int i = 0; i < Global::_PRESENT->slides.size(); i++)
+	//Create Presentation
+	if (Global::useGUI)
 	{
-		SDL_Surface* surface = generateSurface(i);
-		if (surface == nullptr) return -1;
-
-		saveImage(surface, "cache/" + std::to_string(i) + ".png");
-		SDL_FreeSurface(surface);
+		//Init and enter GUI
+		Global::gApp = new guiApp();
+		wxApp::SetInstance(Global::gApp);
+		wxEntry(argc, argv);
+		wxEntryCleanup();
 	}
-
-	printf("[OK]: Created all Images\n");
-
-	//Create PDF
-	createPDF();
-	printf("[OK]: Created PDF file\n");
+	else if (createPresent(inpath, outpath) == -1) return -1;
 
 	//Clear Fonts
 	TTF_CloseFont(Global::_FONT["title"]);
@@ -116,7 +103,5 @@ int main(int argc, char* argv[])
 	TTF_Quit();
 	SDL_Quit();
 
-	printf("[FINISHED]: Done creating presentation\n");
-
 	return 0;
-}
+}

Windows/BitPresent.vcxproj

@@ -20,13 +20,20 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BitPresent.cpp" />
+    <ClCompile Include="fileParser.cpp" />
+    <ClCompile Include="gui.cpp" />
+    <ClCompile Include="imageGenerator.cpp" />
+    <ClCompile Include="pdfCreator.cpp" />
+    <ClCompile Include="presentCreator.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="fileParser.h" />
     <ClInclude Include="globals.h" />
+    <ClInclude Include="gui.h" />
     <ClInclude Include="imageGenerator.h" />
     <ClInclude Include="objects.h" />
     <ClInclude Include="pdfCreator.h" />
+    <ClInclude Include="presentCreator.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
@@ -136,15 +143,16 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;WINVER=0x0400;__WXMSW__;_WINDOWS;wxUSE_GUI=1;WXUSINGDLL</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);manual-link\SDL2main.lib;SDL2.lib;SDL2_ttf.lib;SDL2_image.lib;turbojpeg.lib;webp.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);manual-link\SDL2main.lib;SDL2.lib;SDL2_ttf.lib;SDL2_image.lib;turbojpeg.lib;webp.lib;wxbase31u.lib;wxbase31u_net.lib;wxbase31u_xml.lib;wxmsw31u_adv.lib;wxmsw31u_aui.lib;wxmsw31u_core.lib;wxmsw31u_gl.lib;wxmsw31u_html.lib;wxmsw31u_media.lib;wxmsw31u_propgrid.lib;wxmsw31u_qa.lib;wxmsw31u_ribbon.lib;wxmsw31u_richtext.lib;wxmsw31u_stc.lib;wxmsw31u_webview.lib;wxmsw31u_xrc.lib;comctl32.lib;rpcrt4.lib;winmm.lib;wsock32.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Windows/BitPresent.vcxproj.filters

@@ -33,11 +33,32 @@
     <ClInclude Include="resource.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="gui.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="presentCreator.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BitPresent.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="fileParser.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="gui.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="imageGenerator.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="pdfCreator.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="presentCreator.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="BitPresent.rc">

Windows/Release/BitPresent.exe

@@ -1,16 +1 @@
-  BitPresent.cpp
-D:\Coding\BitPresentWindows\BitPresent\fileParser.h(50,20): warning C4018: '<': signed/unsigned mismatch
-D:\Coding\BitPresentWindows\BitPresent\imageGenerator.h(125,27): warning C4018: '<': signed/unsigned mismatch
-D:\Coding\BitPresentWindows\BitPresent\imageGenerator.h(149,30): warning C4018: '<': signed/unsigned mismatch
-D:\Coding\BitPresentWindows\BitPresent\pdfCreator.h(24,23): warning C4018: '<': signed/unsigned mismatch
-D:\Coding\BitPresentWindows\BitPresent\pdfCreator.h(27,46): warning C4244: 'argument': conversion from 'int' to 'HPDF_REAL', possible loss of data
-D:\Coding\BitPresentWindows\BitPresent\pdfCreator.h(28,47): warning C4244: 'argument': conversion from 'int' to 'HPDF_REAL', possible loss of data
-D:\Coding\BitPresentWindows\BitPresent\pdfCreator.h(31,100): warning C4244: 'argument': conversion from 'HPDF_UINT' to 'HPDF_REAL', possible loss of data
-D:\Coding\BitPresentWindows\BitPresent\pdfCreator.h(31,71): warning C4244: 'argument': conversion from 'HPDF_UINT' to 'HPDF_REAL', possible loss of data
-D:\Coding\BitPresentWindows\BitPresent\BitPresent.cpp(94,20): warning C4018: '<': signed/unsigned mismatch
-  Generating code
-  1 of 566 functions ( 0.2%) were compiled, the rest were copied from previous compilation.
-    0 functions were new in current compilation
-    1 functions had inline decision re-evaluated but remain unchanged
-  Finished generating code
-  BitPresent.vcxproj -> D:\Coding\BitPresentWindows\BitPresent\Release\BitPresent.exe
+  BitPresent.vcxproj -> D:\Coding\BitPresentWindows\BitPresent\Release\BitPresent.exe