Fixed some small bugs, version bump

timothyschoen · timothyschoen · commit 822c8a8ca5ad · 2022-02-11T01:55:14.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 set(JUCE_ENABLE_MODULE_SOURCE_GROUPS ON CACHE BOOL "" FORCE)
 set_property(GLOBAL PROPERTY USE_FOLDERS YES)
 
-project(PlugData VERSION 0.3 LANGUAGES C CXX)
+project(PlugData VERSION 0.3.1 LANGUAGES C CXX)
 
 if("${CMAKE_SYSTEM}" MATCHES "Linux")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
diff --git a/Source/Box.cpp b/Source/Box.cpp
@@ -182,7 +182,11 @@ void Box::setType(const String& newType, bool exists)
         // Create graphics for the object if necessary
         graphics.reset(GUIComponent::createGui(type, this));
 
-        if (graphics) graphics->lock(locked);
+        if (graphics)  {
+            graphics->lock(locked);
+            graphics->updateValue();
+        }
+        
 
         if (graphics && graphics->getGui().getType() == pd::Type::Comment)
         {
@@ -265,6 +269,11 @@ void Box::paint(Graphics& g)
         outlineColour = MainLook::highlightColour;
     }
     
+    if(!graphics || (graphics && graphics->fakeGui() && graphics->getGui().getType() != pd::Type::Comment)) {
+        g.setColour(MainLook::firstBackground);
+        g.fillRect(getLocalBounds().reduced(5));
+    }
+    
     // Draw comment style
     if (graphics && graphics->getGui().getType() == pd::Type::Comment)
     {
@@ -278,9 +287,6 @@ void Box::paint(Graphics& g)
     // Draw for all other objects
     else
     {
-        g.setColour(MainLook::firstBackground);
-        g.fillRect(getLocalBounds().reduced(5));
-        
         g.setColour(outlineColour);
         g.drawRoundedRectangle(rect.toFloat(), 2.0f, 1.5f);
     }
@@ -336,7 +342,7 @@ void Box::resized()
         index++;
     }
 
-    resizer.toBack();
+    resizer.toFront(false);
 }
 
 void Box::updatePorts()
diff --git a/Source/Canvas.h b/Source/Canvas.h
@@ -168,8 +168,8 @@ struct GraphArea : public Component, public ComponentDragger
         // Lock first?
         if (cnv)
         {
-            cnv->gl_pixwidth = getWidth();
-            cnv->gl_pixheight = getHeight();
+            cnv->gl_pixwidth = getWidth() / pd::Patch::zoom;
+            cnv->gl_pixheight = getHeight() / pd::Patch::zoom;
             cnv->gl_xmargin = (getX() - 4) / pd::Patch::zoom;
             cnv->gl_ymargin = (getY() - 4) / pd::Patch::zoom;
         }
diff --git a/Source/GUIObjects.cpp b/Source/GUIObjects.cpp
@@ -329,7 +329,7 @@ BangComponent::BangComponent(const pd::Gui& pdGui, Box* parent) : GUIComponent(p
     };
 
     initParameters();  // !! FIXME: virtual call from constructor!!
-    box->restrainer.setSizeLimits(38, 38, 200, 200);
+    box->restrainer.setSizeLimits(38, 38, 1200, 1200);
     box->restrainer.checkComponentBounds(box);
 }
 
@@ -366,7 +366,7 @@ ToggleComponent::ToggleComponent(const pd::Gui& pdGui, Box* parent) : GUICompone
 
     initParameters();
 
-    box->restrainer.setSizeLimits(38, 38, 200, 200);
+    box->restrainer.setSizeLimits(38, 38, 1200, 1200);
     box->restrainer.checkComponentBounds(box);
 }
 
@@ -1088,10 +1088,7 @@ void GraphOnParent::updateCanvas()
         canvas->setBounds(-x, -y, w + x, h + y);
 
         auto parentBounds = box->getBounds();
-        if (parentBounds.getWidth() != w - 8 || parentBounds.getHeight() != h - 29)
-        {
-            box->setSize(w + 8, h + 29);
-        }
+        box->setSize(w, h);
     }
 }
 
@@ -1131,9 +1128,6 @@ void Subpatch::updateValue()
     if (static_cast<t_canvas*>(gui.getPointer())->gl_isgraph)
     {
         box->setType(box->textLabel.getText(), true);
-
-        // Makes sure it has the correct size
-        box->graphics->updateValue();
     }
 };
 
@@ -1157,10 +1151,13 @@ MousePad::MousePad(const pd::Gui& gui, Box* box) : GUIComponent(gui, box)
 {
     Desktop::getInstance().addGlobalMouseListener(this);
     // setInterceptsMouseClicks(false, true);
+    
+    box->textLabel.setVisible(false);
 }
 
 MousePad::~MousePad()
 {
+    box->textLabel.setVisible(true);
     Desktop::getInstance().removeGlobalMouseListener(this);
 }
 
@@ -1174,7 +1171,7 @@ void MousePad::updateValue(){
 
 void MousePad::mouseDown(const MouseEvent& e)
 {
-    if (!getScreenBounds().contains(e.getScreenPosition())) return;
+    if (!getScreenBounds().contains(e.getScreenPosition()) || !isLocked) return;
 
     auto* x = static_cast<t_pad*>(gui.getPointer());
     t_atom at[3];
@@ -1200,7 +1197,7 @@ void MousePad::mouseDrag(const MouseEvent& e)
 
 void MousePad::mouseMove(const MouseEvent& e)
 {
-    if (!getScreenBounds().contains(e.getScreenPosition())) return;
+    if (!getScreenBounds().contains(e.getScreenPosition()) || !isLocked) return;
 
     auto* x = static_cast<t_pad*>(gui.getPointer());
     t_atom at[3];
@@ -1229,6 +1226,10 @@ void MousePad::mouseUp(const MouseEvent& e)
     outlet_anything(x->x_obj.ob_outlet, gensym("click"), 1, at);
 }
 
+void MousePad::lock(bool locked) {
+    isLocked = locked;
+}
+
 MouseComponent::MouseComponent(const pd::Gui& gui, Box* box) : GUIComponent(gui, box)
 {
     Desktop::getInstance().addGlobalMouseListener(this);
@@ -1286,6 +1287,8 @@ KeyboardComponent::KeyboardComponent(const pd::Gui& gui, Box* box) : GUIComponen
 
     state.addListener(this);
     addAndMakeVisible(keyboard);
+    
+    box->restrainer.setSizeLimits(50, 150, 1200, 1200);
 }
 
 void KeyboardComponent::resized()
diff --git a/Source/GUIObjects.h b/Source/GUIObjects.h
@@ -125,30 +125,32 @@ struct GUIComponent : public Component, public ComponentListener
         {
             auto& [parameters, cb] = params;
 
-            parameters.insert(parameters.begin(), {"Width", tInt, static_cast<void*>(&width)});
-            parameters.insert(parameters.begin() + 1, {"Send Symbol", tString, static_cast<void*>(&sendSymbol)});
-            parameters.insert(parameters.begin() + 2, {"Receive Symbol", tString, static_cast<void*>(&receiveSymbol)});
+            //parameters.insert(parameters.begin(), {"Width", tInt, static_cast<void*>(&width)});
+            
+            parameters.insert(parameters.begin(), {"Send Symbol", tString, static_cast<void*>(&sendSymbol)});
+            parameters.insert(parameters.begin() + 1, {"Receive Symbol", tString, static_cast<void*>(&receiveSymbol)});
 
             auto oldCallback = cb;
             cb = [this, oldCallback](int changedParameter)
             {
+                /*
                 if (changedParameter == 0)
                 {
                     // Width
-                }
-                else if (changedParameter == 1)
+                } */
+                if (changedParameter == 0)
                 {
                     gui.setSendSymbol(sendSymbol.toStdString());
                     repaint();
                 }
-                else if (changedParameter == 2)
+                else if (changedParameter == 1)
                 {
                     gui.setReceiveSymbol(receiveSymbol.toStdString());
                     repaint();
                 }
                 else
                 {
-                    oldCallback(changedParameter - 3);
+                    oldCallback(changedParameter - 2);
                 }
             };
         }
@@ -854,6 +856,9 @@ struct PanelComponent : public GUIComponent
 // ELSE mousepad
 struct MousePad : public GUIComponent
 {
+    
+    bool isLocked = false;
+    
     typedef struct _pad
     {
         t_object x_obj;
@@ -875,6 +880,8 @@ struct MousePad : public GUIComponent
     ~MousePad() override;
 
     void paint(Graphics& g) override;
+    
+    void lock(bool isLocked) override;
 
     void updateValue() override;
 
diff --git a/Source/Pd/PdObject.cpp b/Source/Pd/PdObject.cpp
@@ -131,9 +131,9 @@ Patch Object::getHelp() const
     if (File(usedir).getChildFile(realname).existsAsFile())
     {
         sys_lock();
-        auto p = Patch(glob_evalfile(nullptr, gensym(realname), gensym(usedir)), instance);
+        auto* pdPatch = glob_evalfile(nullptr, gensym(realname), gensym(usedir));
         sys_unlock();
-        return p;
+        return {pdPatch, instance};
     }
 
     /* 2. "help-objectname.pd" */
@@ -144,9 +144,9 @@ Patch Object::getHelp() const
     if (File(dir).getChildFile(realname).existsAsFile())
     {
         sys_lock();
-        auto p = Patch(glob_evalfile(nullptr, gensym(realname), gensym(usedir)), instance);
+        auto* pdPatch = glob_evalfile(nullptr, gensym(realname), gensym(usedir));
         sys_unlock();
-        return p;
+        return {pdPatch, instance};
     }
 
     return {};
diff --git a/Source/Pd/PdPatch.cpp b/Source/Pd/PdPatch.cpp
@@ -93,7 +93,7 @@ std::array<int, 4> Patch::getBounds() const noexcept
 
         if (cnv->gl_isgraph)
         {
-            return {int(cnv->gl_xmargin * Patch::zoom) + 4, int(cnv->gl_ymargin * Patch::zoom) + 4, cnv->gl_pixwidth, cnv->gl_pixheight};
+            return {int(cnv->gl_xmargin * Patch::zoom) + 4, int(cnv->gl_ymargin * Patch::zoom) + 4, int(cnv->gl_pixwidth * Patch::zoom), int(cnv->gl_pixheight * Patch::zoom)};
         }
     }
     return {0, 0, 0, 0};
diff --git a/Source/PluginConfig.h b/Source/PluginConfig.h
@@ -13,5 +13,5 @@
 namespace ProjectInfo
 {
 const char* const companyName = "Octagon";
-const char* const versionString = "0.3";
+const char* const versionString = "0.3.1";
 }  // namespace ProjectInfo

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,11 @@ void Box::setType(const String& newType, bool exists)`
`182`	`182`	`// Create graphics for the object if necessary`
`183`	`183`	`graphics.reset(GUIComponent::createGui(type, this));`
`184`	`184`
`185`		`- if (graphics) graphics->lock(locked);`
	`185`	`+ if (graphics) {`
	`186`	`+ graphics->lock(locked);`
	`187`	`+ graphics->updateValue();`
	`188`	`+ }`
	`189`	`+`
`186`	`190`
`187`	`191`	`if (graphics && graphics->getGui().getType() == pd::Type::Comment)`
`188`	`192`	`{`
`@@ -265,6 +269,11 @@ void Box::paint(Graphics& g)`
`265`	`269`	`outlineColour = MainLook::highlightColour;`
`266`	`270`	`}`
`267`	`271`
	`272`	`+ if(!graphics \|\| (graphics && graphics->fakeGui() && graphics->getGui().getType() != pd::Type::Comment)) {`
	`273`	`+ g.setColour(MainLook::firstBackground);`
	`274`	`+ g.fillRect(getLocalBounds().reduced(5));`
	`275`	`+ }`
	`276`	`+`
`268`	`277`	`// Draw comment style`
`269`	`278`	`if (graphics && graphics->getGui().getType() == pd::Type::Comment)`
`270`	`279`	`{`
`@@ -278,9 +287,6 @@ void Box::paint(Graphics& g)`
`278`	`287`	`// Draw for all other objects`
`279`	`288`	`else`
`280`	`289`	`{`
`281`		`- g.setColour(MainLook::firstBackground);`
`282`		`- g.fillRect(getLocalBounds().reduced(5));`
`283`		`-`
`284`	`290`	`g.setColour(outlineColour);`
`285`	`291`	`g.drawRoundedRectangle(rect.toFloat(), 2.0f, 1.5f);`
`286`	`292`	`}`
`@@ -336,7 +342,7 @@ void Box::resized()`
`336`	`342`	`index++;`
`337`	`343`	`}`
`338`	`344`
`339`		`- resizer.toBack();`
	`345`	`+ resizer.toFront(false);`
`340`	`346`	`}`
`341`	`347`
`342`	`348`	`void Box::updatePorts()`
Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ struct GraphArea : public Component, public ComponentDragger`
`168`	`168`	`// Lock first?`
`169`	`169`	`if (cnv)`
`170`	`170`	`{`
`171`		`- cnv->gl_pixwidth = getWidth();`
`172`		`- cnv->gl_pixheight = getHeight();`
	`171`	`+ cnv->gl_pixwidth = getWidth() / pd::Patch::zoom;`
	`172`	`+ cnv->gl_pixheight = getHeight() / pd::Patch::zoom;`
`173`	`173`	`cnv->gl_xmargin = (getX() - 4) / pd::Patch::zoom;`
`174`	`174`	`cnv->gl_ymargin = (getY() - 4) / pd::Patch::zoom;`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ BangComponent::BangComponent(const pd::Gui& pdGui, Box* parent) : GUIComponent(p`
`329`	`329`	`};`
`330`	`330`
`331`	`331`	`initParameters(); // !! FIXME: virtual call from constructor!!`
`332`		`- box->restrainer.setSizeLimits(38, 38, 200, 200);`
	`332`	`+ box->restrainer.setSizeLimits(38, 38, 1200, 1200);`
`333`	`333`	`box->restrainer.checkComponentBounds(box);`
`334`	`334`	`}`
`335`	`335`
`@@ -366,7 +366,7 @@ ToggleComponent::ToggleComponent(const pd::Gui& pdGui, Box* parent) : GUICompone`
`366`	`366`
`367`	`367`	`initParameters();`
`368`	`368`
`369`		`- box->restrainer.setSizeLimits(38, 38, 200, 200);`
	`369`	`+ box->restrainer.setSizeLimits(38, 38, 1200, 1200);`
`370`	`370`	`box->restrainer.checkComponentBounds(box);`
`371`	`371`	`}`
`372`	`372`
`@@ -1088,10 +1088,7 @@ void GraphOnParent::updateCanvas()`
`1088`	`1088`	`canvas->setBounds(-x, -y, w + x, h + y);`
`1089`	`1089`
`1090`	`1090`	`auto parentBounds = box->getBounds();`
`1091`		`- if (parentBounds.getWidth() != w - 8 \|\| parentBounds.getHeight() != h - 29)`
`1092`		`- {`
`1093`		`- box->setSize(w + 8, h + 29);`
`1094`		`- }`
	`1091`	`+ box->setSize(w, h);`
`1095`	`1092`	`}`
`1096`	`1093`	`}`
`1097`	`1094`
`@@ -1131,9 +1128,6 @@ void Subpatch::updateValue()`
`1131`	`1128`	`if (static_cast<t_canvas*>(gui.getPointer())->gl_isgraph)`
`1132`	`1129`	`{`
`1133`	`1130`	`box->setType(box->textLabel.getText(), true);`
`1134`		`-`
`1135`		`- // Makes sure it has the correct size`
`1136`		`- box->graphics->updateValue();`
`1137`	`1131`	`}`
`1138`	`1132`	`};`
`1139`	`1133`
`@@ -1157,10 +1151,13 @@ MousePad::MousePad(const pd::Gui& gui, Box* box) : GUIComponent(gui, box)`
`1157`	`1151`	`{`
`1158`	`1152`	`Desktop::getInstance().addGlobalMouseListener(this);`
`1159`	`1153`	`// setInterceptsMouseClicks(false, true);`
	`1154`	`+`
	`1155`	`+ box->textLabel.setVisible(false);`
`1160`	`1156`	`}`
`1161`	`1157`
`1162`	`1158`	`MousePad::~MousePad()`
`1163`	`1159`	`{`
	`1160`	`+ box->textLabel.setVisible(true);`
`1164`	`1161`	`Desktop::getInstance().removeGlobalMouseListener(this);`
`1165`	`1162`	`}`
`1166`	`1163`
`@@ -1174,7 +1171,7 @@ void MousePad::updateValue(){`
`1174`	`1171`
`1175`	`1172`	`void MousePad::mouseDown(const MouseEvent& e)`
`1176`	`1173`	`{`
`1177`		`- if (!getScreenBounds().contains(e.getScreenPosition())) return;`
	`1174`	`+ if (!getScreenBounds().contains(e.getScreenPosition()) \|\| !isLocked) return;`
`1178`	`1175`
`1179`	`1176`	`auto* x = static_cast<t_pad*>(gui.getPointer());`
`1180`	`1177`	`t_atom at[3];`
`@@ -1200,7 +1197,7 @@ void MousePad::mouseDrag(const MouseEvent& e)`
`1200`	`1197`
`1201`	`1198`	`void MousePad::mouseMove(const MouseEvent& e)`
`1202`	`1199`	`{`
`1203`		`- if (!getScreenBounds().contains(e.getScreenPosition())) return;`
	`1200`	`+ if (!getScreenBounds().contains(e.getScreenPosition()) \|\| !isLocked) return;`
`1204`	`1201`
`1205`	`1202`	`auto* x = static_cast<t_pad*>(gui.getPointer());`
`1206`	`1203`	`t_atom at[3];`
`@@ -1229,6 +1226,10 @@ void MousePad::mouseUp(const MouseEvent& e)`
`1229`	`1226`	`outlet_anything(x->x_obj.ob_outlet, gensym("click"), 1, at);`
`1230`	`1227`	`}`
`1231`	`1228`
	`1229`	`+void MousePad::lock(bool locked) {`
	`1230`	`+ isLocked = locked;`
	`1231`	`+}`
	`1232`	`+`
`1232`	`1233`	`MouseComponent::MouseComponent(const pd::Gui& gui, Box* box) : GUIComponent(gui, box)`
`1233`	`1234`	`{`
`1234`	`1235`	`Desktop::getInstance().addGlobalMouseListener(this);`
`@@ -1286,6 +1287,8 @@ KeyboardComponent::KeyboardComponent(const pd::Gui& gui, Box* box) : GUIComponen`
`1286`	`1287`
`1287`	`1288`	`state.addListener(this);`
`1288`	`1289`	`addAndMakeVisible(keyboard);`
	`1290`	`+`
	`1291`	`+ box->restrainer.setSizeLimits(50, 150, 1200, 1200);`
`1289`	`1292`	`}`
`1290`	`1293`
`1291`	`1294`	`void KeyboardComponent::resized()`
Original file line number	Diff line number	Diff line change
`@@ -125,30 +125,32 @@ struct GUIComponent : public Component, public ComponentListener`
`125`	`125`	`{`
`126`	`126`	`auto& [parameters, cb] = params;`
`127`	`127`
`128`		`- parameters.insert(parameters.begin(), {"Width", tInt, static_cast<void*>(&width)});`
`129`		`- parameters.insert(parameters.begin() + 1, {"Send Symbol", tString, static_cast<void*>(&sendSymbol)});`
`130`		`- parameters.insert(parameters.begin() + 2, {"Receive Symbol", tString, static_cast<void*>(&receiveSymbol)});`
	`128`	`+ //parameters.insert(parameters.begin(), {"Width", tInt, static_cast<void*>(&width)});`
	`129`	`+`
	`130`	`+ parameters.insert(parameters.begin(), {"Send Symbol", tString, static_cast<void*>(&sendSymbol)});`
	`131`	`+ parameters.insert(parameters.begin() + 1, {"Receive Symbol", tString, static_cast<void*>(&receiveSymbol)});`
`131`	`132`
`132`	`133`	`auto oldCallback = cb;`
`133`	`134`	`cb = [this, oldCallback](int changedParameter)`
`134`	`135`	`{`
	`136`	`+ /*`
`135`	`137`	`if (changedParameter == 0)`
`136`	`138`	`{`
`137`	`139`	`// Width`
`138`		`- }`
`139`		`- else if (changedParameter == 1)`
	`140`	`+ } */`
	`141`	`+ if (changedParameter == 0)`
`140`	`142`	`{`
`141`	`143`	`gui.setSendSymbol(sendSymbol.toStdString());`
`142`	`144`	`repaint();`
`143`	`145`	`}`
`144`		`- else if (changedParameter == 2)`
	`146`	`+ else if (changedParameter == 1)`
`145`	`147`	`{`
`146`	`148`	`gui.setReceiveSymbol(receiveSymbol.toStdString());`
`147`	`149`	`repaint();`
`148`	`150`	`}`
`149`	`151`	`else`
`150`	`152`	`{`
`151`		`- oldCallback(changedParameter - 3);`
	`153`	`+ oldCallback(changedParameter - 2);`
`152`	`154`	`}`
`153`	`155`	`};`
`154`	`156`	`}`
`@@ -854,6 +856,9 @@ struct PanelComponent : public GUIComponent`
`854`	`856`	`// ELSE mousepad`
`855`	`857`	`struct MousePad : public GUIComponent`
`856`	`858`	`{`
	`859`	`+`
	`860`	`+ bool isLocked = false;`
	`861`	`+`
`857`	`862`	`typedef struct _pad`
`858`	`863`	`{`
`859`	`864`	`t_object x_obj;`
`@@ -875,6 +880,8 @@ struct MousePad : public GUIComponent`
`875`	`880`	`~MousePad() override;`
`876`	`881`
`877`	`882`	`void paint(Graphics& g) override;`
	`883`	`+`
	`884`	`+ void lock(bool isLocked) override;`
`878`	`885`
`879`	`886`	`void updateValue() override;`
`880`	`887`
Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,9 @@ Patch Object::getHelp() const`
`131`	`131`	`if (File(usedir).getChildFile(realname).existsAsFile())`
`132`	`132`	`{`
`133`	`133`	`sys_lock();`
`134`		`- auto p = Patch(glob_evalfile(nullptr, gensym(realname), gensym(usedir)), instance);`
	`134`	`+ auto* pdPatch = glob_evalfile(nullptr, gensym(realname), gensym(usedir));`
`135`	`135`	`sys_unlock();`
`136`		`- return p;`
	`136`	`+ return {pdPatch, instance};`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/* 2. "help-objectname.pd" */`
`@@ -144,9 +144,9 @@ Patch Object::getHelp() const`
`144`	`144`	`if (File(dir).getChildFile(realname).existsAsFile())`
`145`	`145`	`{`
`146`	`146`	`sys_lock();`
`147`		`- auto p = Patch(glob_evalfile(nullptr, gensym(realname), gensym(usedir)), instance);`
	`147`	`+ auto* pdPatch = glob_evalfile(nullptr, gensym(realname), gensym(usedir));`
`148`	`148`	`sys_unlock();`
`149`		`- return p;`
	`149`	`+ return {pdPatch, instance};`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`return {};`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ std::array<int, 4> Patch::getBounds() const noexcept`
`93`	`93`
`94`	`94`	`if (cnv->gl_isgraph)`
`95`	`95`	`{`
`96`		`- return {int(cnv->gl_xmargin * Patch::zoom) + 4, int(cnv->gl_ymargin * Patch::zoom) + 4, cnv->gl_pixwidth, cnv->gl_pixheight};`
	`96`	`+ return {int(cnv->gl_xmargin * Patch::zoom) + 4, int(cnv->gl_ymargin * Patch::zoom) + 4, int(cnv->gl_pixwidth * Patch::zoom), int(cnv->gl_pixheight * Patch::zoom)};`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`return {0, 0, 0, 0};`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`namespace ProjectInfo`
`14`	`14`	`{`
`15`	`15`	`const char* const companyName = "Octagon";`
`16`		`-const char* const versionString = "0.3";`
	`16`	`+const char* const versionString = "0.3.1";`
`17`	`17`	`} // namespace ProjectInfo`