Ported to Windows

Author: BitTim

Images/Valorant_logo.jpg

@@ -87,7 +87,7 @@ EditorGUIMain::EditorGUIMain() : wxFrame(nullptr, wxID_ANY, "")
   preview = new wxBoxSizer(wxVERTICAL);
 
   preview->Add(previewImage, 0, wxBOTTOM, 10);
-  preview->Add(warnings, 1, wxEXPAND | wxTOP | wxALIGN_CENTER, 10);
+  preview->Add(warnings, 1, wxEXPAND | wxTOP, 10);
 
   boxSizer->Add(textEdit, 1, wxEXPAND | wxALL, 10);
   boxSizer->Add(preview, 0, wxEXPAND | wxALL, 10);
@@ -135,7 +135,7 @@ void EditorGUIMain::update()
   int cursorLine = std::count(input.begin(), input.begin() + textEdit->GetInsertionPoint(), '\n') + 1;
 
   if(!Global::_SAVED && Global::_SAVEPATH == Global::_CACHEPATH / "Editor" / "current.txt") textEdit->SaveFile(std::string(Global::_SAVEPATH));
-  if(Global::_SAVEPATH == "") Global::_SAVEPATH = Global::_CACHEPATH / "Editor" / "current.txt";
+  if(Global::_SAVEPATH == "") Global::_SAVEPATH = (Global::_CACHEPATH / "Editor" / "current.txt").string();
 
   std::vector<Token> tokens = tokenize(input);
   parse(tokens, cursorLine);
@@ -206,9 +206,9 @@ void EditorGUIMain::previewUpdate()
   if(Global::_CSLIDEPREVIEW < Global::_PRESENT->slides.size() && !Global::_LOCKPREVIEWIMAGE)
   {
     Global::_LOCKPREVIEWIMAGE = true;
-    saveImage(generateSurface(Global::_CSLIDEPREVIEW), Global::_CACHEPATH / "preview.png");
+    saveImage(generateSurface(Global::_CSLIDEPREVIEW), (Global::_CACHEPATH / "preview.png").string());
 
-    wxFileInputStream previewIn(std::string(Global::_CACHEPATH / "preview.png"));
+    wxFileInputStream previewIn((Global::_CACHEPATH / "preview.png").string());
     pngHandler->LoadFile(&previewImageData, previewIn);
 
     if(previewImageData.IsOk())
@@ -263,14 +263,14 @@ bool EditorGUIApp::OnInit()
   mainFrame->Show();
   mainFrame->Maximize();
 
-  //Load default font
+     //Load default font
 	Global::_DEFAULTFONT = { {"title", TTF_OpenFont("dat/defaultFont.ttf", 68)}, {"subtitle", TTF_OpenFont("dat/defaultFont.ttf", 46)}, {"normal", TTF_OpenFont("dat/defaultFont.ttf", 34)}, {"footer", TTF_OpenFont("dat/defaultFont.ttf", 12)} };
 	if (Global::_DEFAULTFONT["title"] == NULL || Global::_DEFAULTFONT["subtitle"] == NULL || Global::_DEFAULTFONT["normal"] == NULL || Global::_DEFAULTFONT["footer"] == NULL)
 	{
 		printf("[ERROR]: Loading font: %s\n", TTF_GetError());
-    mainFrame->error->SetTitle("Error loading default font");
-    mainFrame->error->SetMessage("Could not load default Font. Make sure the \"dat\" folder is present in the installation folder of BitPresent");
-    mainFrame->error->ShowModal();
+        mainFrame->error->SetTitle("Error loading default font");
+        mainFrame->error->SetMessage("Could not load default Font. Make sure the \"dat\" folder is present in the installation folder of BitPresent");
+        mainFrame->error->ShowModal();
 		return false;
 	}
 	Global::_PRESENT->font = Global::_DEFAULTFONT;
@@ -417,7 +417,7 @@ void EditorGUIMain::onNewClicked(wxCommandEvent &evt)
   if(checkSaved())
   {
     textEdit->Clear();
-    Global::_SAVEPATH = Global::_CACHEPATH / "Editor" / "current.txt";
+    Global::_SAVEPATH = (Global::_CACHEPATH / "Editor" / "current.txt").string();
     Global::_EXPORTPATH = "";
 
     Global::_FORCEUPDATE = true;
@@ -615,6 +615,7 @@ void EditorGUIMain::onAboutClicked(wxCommandEvent &evt)
   aboutInfo.SetWebSite("https://www.github.com/BitTim/BitPresent/");
   aboutInfo.SetLicence(Global::_LICENSE);
   aboutInfo.AddDeveloper("BitTim");
+  aboutInfo.AddDocWriter("BitTim");
   wxAboutBox(aboutInfo);
 }
 

Linux/src/gui.cc

@@ -0,0 +1,17 @@
+<Topic 1 (Title Slide)>
+-Subtitle-
+
+[Slide 1]
+-Subtitle-
+Point 1
+Point 2
+Point 3
+This is a very long and pointless sentence that noone would ever use in a presentation.
+.image sampleImage.png
+
+[No Subtitle and No Image!]
+Lol
+Rofl
+
+<Ending>
+-Subtitle... again-

Sample files/Presentation.pdf

@@ -7,11 +7,7 @@ Point 1
 Point 2
 Point 3
 This is a very long and pointless sentence that noone would ever use in a presentation.
-<<<<<<< HEAD
-.image /home/tim/Coding/BitPresent/Sample files/sampleImage.png
-=======
 .image sampleImage.png
->>>>>>> gui
 
 [No Subtitle and No Image!]
 Lol

Sample files/Presentation.txt

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitPresent", "BitPresent.vcxproj", "{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitPresent", "BitPresent.vcxproj", "{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +13,19 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Debug|x64.ActiveCfg = Debug|x64
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Debug|x64.Build.0 = Debug|x64
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Debug|x86.ActiveCfg = Debug|Win32
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Debug|x86.Build.0 = Debug|Win32
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Release|x64.ActiveCfg = Release|x64
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Release|x64.Build.0 = Release|x64
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Release|x86.ActiveCfg = Release|Win32
-		{6AE7B4F0-FF87-412C-8A68-0115AEBA5961}.Release|x86.Build.0 = Release|Win32
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Debug|x64.ActiveCfg = Debug|x64
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Debug|x64.Build.0 = Debug|x64
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Debug|x86.ActiveCfg = Debug|Win32
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Debug|x86.Build.0 = Debug|Win32
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Release|x64.ActiveCfg = Release|x64
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Release|x64.Build.0 = Release|x64
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Release|x86.ActiveCfg = Release|Win32
+		{0D1F6BDE-5E9A-44EC-83DB-0B1AD470D8DC}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2CB4306F-93BC-43CA-8A19-BED2680AF4C6}
+		SolutionGuid = {1CC720FF-7F50-4225-9A5D-34DFC6635B7E}
 	EndGlobalSection
 EndGlobal