improve translations

Button.cpp

@@ -276,8 +276,8 @@ CheckBox::CheckBox()
       sGr(12)
 {
     style = Style::Allowed | Style::ClickBuffer;
-    setKAFColor(0x00007500);
-    setKAFStrength(-30);
+    setClickAFColor(0x00007500);
+    setClickAFStrength(-30);
 }
 
 // Destructor
@@ -388,7 +388,7 @@ void CheckBox::setSBgColor(int f) // sets the select background color
     rend = 1;
 }
 
-void CheckBox::setKBgColor(int f) // sets the click background color
+void CheckBox::setClickBgColor(int f) // sets the click background color
 {
     kBgF = f;
     rend = 1;
@@ -410,14 +410,14 @@ void CheckBox::setSBgImage(Image* b)
     rend = 1;
 }
 
-void CheckBox::setKBgImageZ(Image* b) // sets the click background image
+void CheckBox::setClickBgImageZ(Image* b) // sets the click background image
 {
     if (kBgB) kBgB->release();
     kBgB = b;
     rend = 1;
 }
 
-void CheckBox::setKBgImage(Image* b)
+void CheckBox::setClickBgImage(Image* b)
 {
     if (!kBgB) kBgB = new Image();
     kBgB->newImage(b->getWidth(), b->getHeight(), 0);
@@ -447,21 +447,21 @@ void CheckBox::setSAFStrength(int st) // sets the select AlphaField strength
     rend = 1;
 }
 
-void CheckBox::setKAlphaFieldZ(AlphaField* af) // sets the click AlphaField
+void CheckBox::setClickAlphaFieldZ(AlphaField* af) // sets the click AlphaField
 {
     if (kAf) kAf->release();
     kAf = af;
     rend = 1;
 }
 
-void CheckBox::setKAFColor(int f) // sets the click AlphaField color
+void CheckBox::setClickAFColor(int f) // sets the click AlphaField color
 {
     if (!kAf) kAf = new AlphaField();
     kAf->setColor(f);
     rend = 1;
 }
 
-void CheckBox::setKAFStrength(int st) // sets the click AlphaField strength
+void CheckBox::setClickAFStrength(int st) // sets the click AlphaField strength
 {
     if (!kAf) kAf = new AlphaField();
     kAf->setStrength(st);
@@ -730,7 +730,7 @@ int CheckBox::getSBgColor() const // returns the select background color
     return sBgF;
 }
 
-int CheckBox::getKBgColor() const // returns the click background color
+int CheckBox::getClickBgColor() const // returns the click background color
 {
     return kBgF;
 }
@@ -745,12 +745,12 @@ Image* CheckBox::zSBgImage() const
     return sBgB;
 }
 
-Image* CheckBox::getKBgImage() const // returns the click background image
+Image* CheckBox::getClickBgImage() const // returns the click background image
 {
     return kBgB ? dynamic_cast<Image*>(kBgB->getThis()) : 0;
 }
 
-Image* CheckBox::zKBgImage() const
+Image* CheckBox::zClickBgImage() const
 {
     return kBgB;
 }
@@ -765,13 +765,13 @@ AlphaField* CheckBox::zSAlphaField() const
     return sAf;
 }
 
-AlphaField* CheckBox::getKAlphaField() const // returns the click AlphaField
+AlphaField* CheckBox::getClickAlphaField() const // returns the click AlphaField
 {
     if (!kAf) return 0;
     return dynamic_cast<AlphaField*>(kAf->getThis());
 }
 
-AlphaField* CheckBox::zKAlphaField() const
+AlphaField* CheckBox::zClickAlphaField() const
 {
     return kAf;
 }

Button.h

@@ -119,7 +119,7 @@ namespace Framework
             //! Specifies whether the checkbox is selected
             static const __int64 Selected = 0x1000000;
             //! Specifies whether the label text can be multicolored
-            static const __int64 MehrfarbigText = 0x001000;
+            static const __int64 MulticoloredText = 0x001000;
             //! Specifies whether the checkbox has a background color
             //! while being pressed
             static const __int64 ClickColor = 0x002000;
@@ -148,7 +148,7 @@ namespace Framework
             //! while selected
             static const __int64 SelectText = 0x200000;
             //! Specifies whether the checkbox can have a multi-line label
-            static const __int64 MehrzeiligText = 0x400000;
+            static const __int64 MultilineText = 0x400000;
             //! Specifies whether the checkbox is currently being clicked
             //! with the mouse. (Managed by the checkbox itself)
             static const __int64 MouseClick = 0x800000;
@@ -217,7 +217,7 @@ namespace Framework
         DLLEXPORT void setSBgColor(int f);
         //! Sets the background color used while the checkbox is being clicked
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKBgColor(int f);
+        DLLEXPORT void setClickBgColor(int f);
         //! Sets a pointer to the background image used while the checkbox
         //! is selected \param b The image
         DLLEXPORT void setSBgImageZ(Image* b);
@@ -226,10 +226,10 @@ namespace Framework
         DLLEXPORT void setSBgImage(Image* b);
         //! Sets a pointer to the background image used while the checkbox
         //! is being clicked \param b The image
-        DLLEXPORT void setKBgImageZ(Image* b);
+        DLLEXPORT void setClickBgImageZ(Image* b);
         //! Sets the background image by copying, used while the checkbox
         //! is being clicked \param b The image to copy
-        DLLEXPORT void setKBgImage(Image* b);
+        DLLEXPORT void setClickBgImage(Image* b);
         //! Sets a pointer to the color gradient used while the checkbox
         //! is selected \param af The color gradient
         DLLEXPORT void setSAlphaFieldZ(AlphaField* af);
@@ -241,13 +241,13 @@ namespace Framework
         DLLEXPORT void setSAFStrength(int st);
         //! Sets a pointer to the color gradient used while the checkbox
         //! is being clicked \param af The color gradient
-        DLLEXPORT void setKAlphaFieldZ(AlphaField* af);
+        DLLEXPORT void setClickAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient used while the checkbox
         //! is being clicked \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKAFColor(int f);
+        DLLEXPORT void setClickAFColor(int f);
         //! Sets the strength of the color gradient used while the checkbox
         //! is being clicked \param st The strength
-        DLLEXPORT void setKAFStrength(int st);
+        DLLEXPORT void setClickAFStrength(int st);
         //! Loads images "kasten.gif" and "skasten.gif" from an LTDB file.
         //! kasten.gif is drawn when the checkbox is not selected.
         //! skasten.gif is drawn when the checkbox is selected.
@@ -283,27 +283,27 @@ namespace Framework
         DLLEXPORT int getSBgColor() const;
         //! Returns the background color in A8R8G8B8 format used while
         //! the checkbox is being clicked
-        DLLEXPORT int getKBgColor() const;
+        DLLEXPORT int getClickBgColor() const;
         //! Returns the background image used while the checkbox is selected
         DLLEXPORT Image* getSBgImage() const;
         //! Returns the background image without increased reference counter
         //! used while the checkbox is selected
         DLLEXPORT Image* zSBgImage() const;
         //! Returns the background image used while the checkbox is being clicked
-        DLLEXPORT Image* getKBgImage() const;
+        DLLEXPORT Image* getClickBgImage() const;
         //! Returns the background image without increased reference counter
         //! used while the checkbox is being clicked
-        DLLEXPORT Image* zKBgImage() const;
+        DLLEXPORT Image* zClickBgImage() const;
         //! Returns the color gradient used while the checkbox is selected
         DLLEXPORT AlphaField* getSAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used while the checkbox is selected
         DLLEXPORT AlphaField* zSAlphaField() const;
         //! Returns the color gradient used while the checkbox is being clicked
-        DLLEXPORT AlphaField* getKAlphaField() const;
+        DLLEXPORT AlphaField* getClickAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used while the checkbox is being clicked
-        DLLEXPORT AlphaField* zKAlphaField() const;
+        DLLEXPORT AlphaField* zClickAlphaField() const;
     };
 } // namespace Framework
 

DX12Buffer.cpp

@@ -37,7 +37,7 @@ DX12Buffer::~DX12Buffer()
 }
 
 // Copies the data into the buffer if it has changed
-void DX12Buffer::copyData(int byteCount)
+void DX12Buffer::copyToGPU(int byteCount)
 {
     if (!len) return;
     if (byteCount < 0) byteCount = len;
@@ -109,7 +109,7 @@ DX12IndexBuffer::DX12IndexBuffer(int eSize,
 DX12IndexBuffer::~DX12IndexBuffer() {}
 
 // Copies the data into the buffer if it has changed
-void DX12IndexBuffer::copyData(int byteCount)
+void DX12IndexBuffer::copyToGPU(int byteCount)
 {
     /*if( ibs )
     {
@@ -124,7 +124,7 @@ void DX12IndexBuffer::copyData(int byteCount)
         direct->execute();
         ibs = 0;
     }*/
-    DX12Buffer::copyData(byteCount);
+    DX12Buffer::copyToGPU(byteCount);
     // copy->execute();
     /*D3D12_RESOURCE_BARRIER barrier;
     barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
@@ -153,7 +153,7 @@ DX12VertexBuffer::DX12VertexBuffer(int eSize,
 DX12VertexBuffer::~DX12VertexBuffer() {}
 
 // Copies the data into the buffer if it has changed
-void DX12VertexBuffer::copyData(int byteCount)
+void DX12VertexBuffer::copyToGPU(int byteCount)
 {
     /*if( vbs )
     {
@@ -169,7 +169,7 @@ void DX12VertexBuffer::copyData(int byteCount)
         direct->execute();
         vbs = 0;
     }*/
-    DX12Buffer::copyData(byteCount);
+    DX12Buffer::copyToGPU(byteCount);
     // copy->execute();
     /*D3D12_RESOURCE_BARRIER barrier;
     barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;

DX12Buffer.h

@@ -28,7 +28,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX12Buffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT virtual void copyData(int byteCount = -1) override;
+        DLLEXPORT virtual void copyToGPU(int byteCount = -1) override;
         //! Returns the buffer
         DLLEXPORT ID3D12Resource* zBuffer() const;
     };
@@ -47,7 +47,7 @@ namespace Framework
             DX12DirectCommandQueue* direct);
         ~DX12IndexBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copyData(int byteCount = -1) override;
+        DLLEXPORT void copyToGPU(int byteCount = -1) override;
     };
 
     class DX12VertexBuffer : public DX12Buffer
@@ -64,6 +64,6 @@ namespace Framework
             DX12DirectCommandQueue* direct);
         ~DX12VertexBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copyData(int byteCount = -1) override;
+        DLLEXPORT void copyToGPU(int byteCount = -1) override;
     };
 } // namespace Framework

DX12GraphicsApi.cpp

@@ -975,8 +975,8 @@ void DirectX12::beginFrame(bool fill2D, bool fill3D, int fillColor)
 void DirectX12::renderObject(Model3D* zObj)
 {
     Mat4<float> trans = Mat4<float>::identity();
-    zObj->zModelData()->zDXVertexBuffer()->copyData();
-    zObj->zModelData()->zDXIndexBuffer()->copyData();
+    zObj->zModelData()->zDXVertexBuffer()->copyToGPU();
+    zObj->zModelData()->zDXIndexBuffer()->copyToGPU();
     int anz = zObj->calculateMatrices(trans, matrixBuffer);
     if (vertexShader)
         vertexShader->fillConstBuffer(

DX12Shader.cpp

@@ -38,7 +38,7 @@ bool DX12Shader::createConstBuffer(int size, int index)
         constBuffers->add(0);
     constBuffers->set(new DX12VertexBuffer(1, device, copy, direct), index);
     constBuffers->z(index)->setLength(size);
-    constBuffers->z(index)->copyData();
+    constBuffers->z(index)->copyToGPU();
     return 1;
 }
 

DXBuffer.cpp

@@ -94,7 +94,7 @@ DX11Buffer::~DX11Buffer()
 
 // Copies the data into the buffer if it has changed
 //  zRObj: The object used to communicate with the graphics card
-void DX11Buffer::copyData(int byteCount)
+void DX11Buffer::copyToGPU(int byteCount)
 {
     if (!len) return;
     if (byteCount < 0) byteCount = len;
@@ -163,10 +163,10 @@ DX11StructuredBuffer::~DX11StructuredBuffer()
 
 // Copies the data into the buffer if it has changed
 //  zRObj: The object used to communicate with the graphics card
-void DX11StructuredBuffer::copyData(int byteCount)
+void DX11StructuredBuffer::copyToGPU(int byteCount)
 {
     ID3D11Buffer* old = buffer;
-    DX11Buffer::copyData(byteCount);
+    DX11Buffer::copyToGPU(byteCount);
     if (buffer != old)
     {
         if (view) view->Release();

DXBuffer.h

@@ -43,7 +43,7 @@ namespace Framework
         //! \param data A pointer to the data
         DLLEXPORT void setData(void* data);
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT virtual void copyData(int byteCount = -1) = 0;
+        DLLEXPORT virtual void copyToGPU(int byteCount = -1) = 0;
         //! Returns the length of an element in bytes
         DLLEXPORT int getElementLength() const;
         //! Returns the number of elements in the buffer
@@ -70,7 +70,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX11Buffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT virtual void copyData(int byteCount = -1) override;
+        DLLEXPORT virtual void copyToGPU(int byteCount = -1) override;
         //! Returns the buffer
         DLLEXPORT ID3D11Buffer* zBuffer() const;
     };
@@ -90,7 +90,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX11StructuredBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copyData(int byteCount = -1) override;
+        DLLEXPORT void copyToGPU(int byteCount = -1) override;
         //! Returns the used shader resource view
         DLLEXPORT operator ID3D11ShaderResourceView*() const;
     };

Diagram.cpp

@@ -15,7 +15,7 @@ using namespace Framework;
 
 // Contents of the LineDiagram class from Diagram.h
 // Constructor
-LineDiagram::LineDiagram()
+LiveLineDiagram::LiveLineDiagram()
     : DrawableBackground(),
       gF(0xFF000000),
       lColor(new Array<int>()),
@@ -31,7 +31,7 @@ LineDiagram::LineDiagram()
 }
 
 // Destructor
-LineDiagram::~LineDiagram()
+LiveLineDiagram::~LiveLineDiagram()
 {
     lColor->release();
     lName->release();
@@ -42,13 +42,13 @@ LineDiagram::~LineDiagram()
 }
 
 // non-constant
-void LineDiagram::setTextRendererZ(TextRenderer* textRd)
+void LiveLineDiagram::setTextRendererZ(TextRenderer* textRd)
 {
     if (this->textRd) this->textRd->release();
     this->textRd = textRd;
 }
 
-void LineDiagram::setFontZ(Font* font) // sets the font
+void LiveLineDiagram::setFontZ(Font* font) // sets the font
 {
     if (!this->textRd)
         textRd = new TextRenderer(font);
@@ -57,25 +57,25 @@ void LineDiagram::setFontZ(Font* font) // sets the font
     rend = 1;
 }
 
-void LineDiagram::setGSize(Point& gr) // sets the grid size
+void LiveLineDiagram::setGSize(Point& gr) // sets the grid size
 {
     gitterGr = gr;
     rend = 1;
 }
 
-void LineDiagram::setGColor(int f) // sets the grid color
+void LiveLineDiagram::setGColor(int f) // sets the grid color
 {
     gF = f;
     rend = 1;
 }
 
-void LineDiagram::addLine(const char* name) // adds a line
+void LiveLineDiagram::addLine(const char* name) // adds a line
 {
     addLine(new Text(name));
     rend = 1;
 }
 
-void LineDiagram::addLine(Text* txt)
+void LiveLineDiagram::addLine(Text* txt)
 {
     lColor->add(0xFFFFFFFF, lines);
     lName->add(txt, lines);
@@ -87,13 +87,13 @@ void LineDiagram::addLine(Text* txt)
     rend = 1;
 }
 
-void LineDiagram::setLColor(int lNum, int f) // sets the line color
+void LiveLineDiagram::setLColor(int lNum, int f) // sets the line color
 {
     lColor->set(f, lNum);
     rend = 1;
 }
 
-void LineDiagram::addPoint(int lNum, int x, int h) // adds a point
+void LiveLineDiagram::addPoint(int lNum, int x, int h) // adds a point
 {
     Array<int>* ph_tmp = ph->z(lNum);
     Array<int>* pb_tmp = pb->z(lNum);
@@ -120,7 +120,7 @@ void LineDiagram::addPoint(int lNum, int x, int h) // adds a point
     rend = 1;
 }
 
-void LineDiagram::removeLine(int lNum) // removes a line
+void LiveLineDiagram::removeLine(int lNum) // removes a line
 {
     lColor->remove(lNum);
     lName->remove(lNum);
@@ -130,7 +130,7 @@ void LineDiagram::removeLine(int lNum) // removes a line
     rend = 1;
 }
 
-void LineDiagram::render(Image& zRObj) // draws to zRObj
+void LiveLineDiagram::render(Image& zRObj) // draws to zRObj
 {
     if (hasStyle(Style::Visible))
     {
@@ -152,7 +152,7 @@ void LineDiagram::render(Image& zRObj) // draws to zRObj
             int bo = innenSize.x, ho = innenSize.y;
             int maxBr = (int)((double)innenSize.x / gitterGr.x + 0.5);
             int maxHi = ghi ? (int)(innenSize.y / ghi + 0.5) : 0;
-            if (hasStyle(Style::HAlpha))
+            if (hasStyle(Style::BAlpha))
             {
                 for (int i = 0; i < maxBr; ++i)
                     zRObj.drawLineVAlpha(gitterGr.x * i, 0, ho, gF);
@@ -195,7 +195,7 @@ void LineDiagram::render(Image& zRObj) // draws to zRObj
                              - (int)(ph_tmp->get(ii) * yFaktor + 0.5) - 1;
                     if (ypos == -1) ++ypos;
                     if (ypos < 0 || xpos < 0) break;
-                    if (hasStyle(Style::HAlpha))
+                    if (hasStyle(Style::BAlpha))
                         zRObj.drawLineAlpha(
                             Point(lastX, lastY), Point(xpos, ypos), f_tmp);
                     else
@@ -212,28 +212,28 @@ void LineDiagram::render(Image& zRObj) // draws to zRObj
 }
 
 // constant
-Font* LineDiagram::getFont() const // returns the font
+Font* LiveLineDiagram::getFont() const // returns the font
 {
     if (textRd) return textRd->getFont();
     return 0;
 }
 
-Font* LineDiagram::zFont() const
+Font* LiveLineDiagram::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-const Point& LineDiagram::getGSize() const // returns the grid size
+const Point& LiveLineDiagram::getGSize() const // returns the grid size
 {
     return gitterGr;
 }
 
-int LineDiagram::getGColor() const // returns the grid color
+int LiveLineDiagram::getGColor() const // returns the grid color
 {
     return gF;
 }
 
-int LineDiagram::getLineNumber(const char* name) const // returns the line number
+int LiveLineDiagram::getLineNumber(const char* name) const // returns the line number
 {
     for (int i = 0; i < lines; ++i)
     {
@@ -242,7 +242,7 @@ int LineDiagram::getLineNumber(const char* name) const // returns the line numbe
     return -1;
 }
 
-int LineDiagram::getLineNumber(Text* name) const
+int LiveLineDiagram::getLineNumber(Text* name) const
 {
     for (int i = 0; i < lines; ++i)
     {
@@ -256,17 +256,17 @@ int LineDiagram::getLineNumber(Text* name) const
     return -1;
 }
 
-Text* LineDiagram::getLineName(int lNum) const // returns the line name
+Text* LiveLineDiagram::getLineName(int lNum) const // returns the line name
 {
     return lName->get(lNum);
 }
 
-Text* LineDiagram::zLineNames(int lNum) const
+Text* LiveLineDiagram::zLineNames(int lNum) const
 {
     return lName->z(lNum);
 }
 
-int LineDiagram::getHighestValue() const // returns the highest value
+int LiveLineDiagram::getHighestValue() const // returns the highest value
 {
     int ret = 0;
     for (int i = 0; i < lines; ++i)
@@ -277,7 +277,7 @@ int LineDiagram::getHighestValue() const // returns the highest value
     return ret;
 }
 
-int LineDiagram::getHighestValue(int lNum) const
+int LiveLineDiagram::getHighestValue(int lNum) const
 {
     int ret = 0;
     Array<int>* tmp = ph->z(lNum);
@@ -287,7 +287,7 @@ int LineDiagram::getHighestValue(int lNum) const
     return ret;
 }
 
-int LineDiagram::getMedian(int lNum) const // returns the average value
+int LiveLineDiagram::getMedian(int lNum) const // returns the average value
 {
     int count;
     int all = 0;
@@ -298,12 +298,12 @@ int LineDiagram::getMedian(int lNum) const // returns the average value
     return (int)((double)all / count + 0.5);
 }
 
-int LineDiagram::getLCount() const // returns the number of lines
+int LiveLineDiagram::getLCount() const // returns the number of lines
 {
     return lines;
 }
 
-int LineDiagram::getLastValue(int lNum) const // returns the last value
+int LiveLineDiagram::getLastValue(int lNum) const // returns the last value
 {
     return lastValue->get(lNum);
 }
@@ -1156,7 +1156,7 @@ bool BaseDiagram::hasValueStyleNot(int wNum, int style) const
 
 // Contents of the BarDiagram class from Diagram.h
 // Constructor
-BarDiagram::BarDiagram()
+LineDiagram::LineDiagram()
     : DrawableBackground(),
       BaseDiagram(&cs),
       textRd(0),
@@ -1174,7 +1174,7 @@ BarDiagram::BarDiagram()
 }
 
 // Destructor
-BarDiagram::~BarDiagram()
+LineDiagram::~LineDiagram()
 {
     if (textRd) textRd->release();
     if (dRam) dRam->release();
@@ -1184,7 +1184,7 @@ BarDiagram::~BarDiagram()
     if (hIntervalRB) hIntervalRB->release();
 }
 
-void BarDiagram::doMouseEvent(MouseEvent& me, bool userRet)
+void LineDiagram::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (hasDataStyle(DiagramData::Style::Visible)
         && (hasStyle(Style::HScroll) || hasStyle(Style::VScroll)) && userRet)
@@ -1209,7 +1209,7 @@ void BarDiagram::doMouseEvent(MouseEvent& me, bool userRet)
 }
 
 // non-constant
-void BarDiagram::setTextRendererZ(TextRenderer* textRd)
+void LineDiagram::setTextRendererZ(TextRenderer* textRd)
 {
     lockDrawable();
     if (this->textRd) this->textRd->release();
@@ -1217,7 +1217,7 @@ void BarDiagram::setTextRendererZ(TextRenderer* textRd)
     unlockDrawable();
 }
 
-void BarDiagram::setFontZ(Font* font) // Sets the font
+void LineDiagram::setFontZ(Font* font) // Sets the font
 {
     lockDrawable();
     if (!this->textRd)
@@ -1228,7 +1228,7 @@ void BarDiagram::setFontZ(Font* font) // Sets the font
     unlockDrawable();
 }
 
-void BarDiagram::setFontSize(int gr)
+void LineDiagram::setFontSize(int gr)
 {
     lockDrawable();
     if (fontGr != gr) rend = 1;
@@ -1236,7 +1236,7 @@ void BarDiagram::setFontSize(int gr)
     unlockDrawable();
 }
 
-void BarDiagram::setDataBorderZ(
+void LineDiagram::setDataBorderZ(
     Border* ram) // Sets the inner border around the actual diagram
 {
     lockDrawable();
@@ -1246,7 +1246,7 @@ void BarDiagram::setDataBorderZ(
     rend = 1;
 }
 
-void BarDiagram::setDataBorder(Border* ram)
+void LineDiagram::setDataBorder(Border* ram)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1258,7 +1258,7 @@ void BarDiagram::setDataBorder(Border* ram)
     rend = 1;
 }
 
-void BarDiagram::setDataBorderWidth(int br)
+void LineDiagram::setDataBorderWidth(int br)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1267,7 +1267,7 @@ void BarDiagram::setDataBorderWidth(int br)
     unlockDrawable();
 }
 
-void BarDiagram::setDataBorderColor(int f)
+void LineDiagram::setDataBorderColor(int f)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1276,14 +1276,14 @@ void BarDiagram::setDataBorderColor(int f)
     rend = 1;
 }
 
-void BarDiagram::setDataBackgroundColor(
+void LineDiagram::setDataBackgroundColor(
     int f) // Sets the background of the actual diagram
 {
     dBgF = f;
     rend = 1;
 }
 
-void BarDiagram::setDataBackgroundImageZ(Image* b)
+void LineDiagram::setDataBackgroundImageZ(Image* b)
 {
     lockDrawable();
     if (dBgB) dBgB->release();
@@ -1292,7 +1292,7 @@ void BarDiagram::setDataBackgroundImageZ(Image* b)
     rend = 1;
 }
 
-void BarDiagram::setDataBackgroundImage(Image* b)
+void LineDiagram::setDataBackgroundImage(Image* b)
 {
     lockDrawable();
     if (!dBgB) dBgB = new Image();
@@ -1303,7 +1303,7 @@ void BarDiagram::setDataBackgroundImage(Image* b)
     rend = 1;
 }
 
-void BarDiagram::setDataAlphaFieldZ(
+void LineDiagram::setDataAlphaFieldZ(
     AlphaField* af) // Sets the AlphaField of the actual diagram
 {
     lockDrawable();
@@ -1313,7 +1313,7 @@ void BarDiagram::setDataAlphaFieldZ(
     rend = 1;
 }
 
-void BarDiagram::setDataAlphaField(AlphaField* af)
+void LineDiagram::setDataAlphaField(AlphaField* af)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
@@ -1324,7 +1324,7 @@ void BarDiagram::setDataAlphaField(AlphaField* af)
     rend = 1;
 }
 
-void BarDiagram::setDataAlphaFieldColor(int f)
+void LineDiagram::setDataAlphaFieldColor(int f)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
@@ -1333,7 +1333,7 @@ void BarDiagram::setDataAlphaFieldColor(int f)
     rend = 1;
 }
 
-void BarDiagram::setDataAlphaFieldStrength(int st)
+void LineDiagram::setDataAlphaFieldStrength(int st)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
@@ -1342,7 +1342,7 @@ void BarDiagram::setDataAlphaFieldStrength(int st)
     unlockDrawable();
 }
 
-void BarDiagram::render(Image& zRObj)
+void LineDiagram::render(Image& zRObj)
 {
     if (!hasDataStyle(DiagramData::Style::Visible)) return;
     DrawableBackground::render(zRObj);
@@ -1883,70 +1883,70 @@ void BarDiagram::render(Image& zRObj)
 }
 
 // constant
-Font* BarDiagram::getFont() const // Returns the font
+Font* LineDiagram::getFont() const // Returns the font
 {
     return textRd ? textRd->getFont() : 0;
 }
 
-Font* BarDiagram::zFont() const
+Font* LineDiagram::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-Border* BarDiagram::getDataBorder()
+Border* LineDiagram::getDataBorder()
     const // Returns the inner border around the actual diagram
 {
     return dRam ? dynamic_cast<Border*>(dRam->getThis()) : 0;
 }
 
-Border* BarDiagram::zDataBorder() const
+Border* LineDiagram::zDataBorder() const
 {
     return dRam;
 }
 
-int BarDiagram::getDataBorderColor() const
+int LineDiagram::getDataBorderColor() const
 {
     return dRam ? dRam->getColor() : 0;
 }
 
-int BarDiagram::getDataBorderWidth() const
+int LineDiagram::getDataBorderWidth() const
 {
     return dRam ? dRam->getRWidth() : 0;
 }
 
-int BarDiagram::getDataBackgroundColor()
+int LineDiagram::getDataBackgroundColor()
     const // Returns the background of the actual diagram
 {
     return dBgF;
 }
 
-Image* BarDiagram::getDataBackgroundImage() const
+Image* LineDiagram::getDataBackgroundImage() const
 {
     return dBgB ? dynamic_cast<Image*>(dBgB->getThis()) : 0;
 }
 
-Image* BarDiagram::zDataBackgroundImage() const
+Image* LineDiagram::zDataBackgroundImage() const
 {
     return dBgB;
 }
 
 AlphaField*
-BarDiagram::getDataAlphaField() const // Returns the AlphaField of the actual diagram
+LineDiagram::getDataAlphaField() const // Returns the AlphaField of the actual diagram
 {
     return dAf ? dynamic_cast<AlphaField*>(dAf->getThis()) : 0;
 }
 
-AlphaField* BarDiagram::zDataAlphaField() const
+AlphaField* LineDiagram::zDataAlphaField() const
 {
     return dAf;
 }
 
-int BarDiagram::getDataAlphaFieldColor() const
+int LineDiagram::getDataAlphaFieldColor() const
 {
     return dAf ? dAf->getColor() : 0;
 }
 
-int BarDiagram::getDataAlphaFieldStrength() const
+int LineDiagram::getDataAlphaFieldStrength() const
 {
     return dAf ? dAf->getStrength() : 0;
 }

Diagram.h

@@ -13,12 +13,12 @@ namespace Framework
     class Font;    //! Font.h
     class HScrollBar; //! Scroll.h
     class VScrollBar; //! Scroll.h
-    class LineDiagram;     //! from this file
-    class BarDiagram;      //! from this file
+    class LiveLineDiagram;     //! from this file
+    class LineDiagram;      //! from this file
     class TextRenderer;
 
     //! A 2D GUI Framework drawing that draws a live diagram of values
-    class LineDiagram : public DrawableBackground
+    class LiveLineDiagram : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -48,9 +48,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LineDiagram();
+        DLLEXPORT LiveLineDiagram();
         //! Destructor
-        DLLEXPORT virtual ~LineDiagram();
+        DLLEXPORT virtual ~LiveLineDiagram();
         //! Sets the used TextRenderer
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
@@ -528,7 +528,7 @@ namespace Framework
 
     //! A 2D GUI Framework drawing that displays diagram data as
     //! line graphs
-    class BarDiagram : public DrawableBackground,
+    class LineDiagram : public DrawableBackground,
                   public BaseDiagram
     {
     public:
@@ -568,9 +568,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT BarDiagram();
+        DLLEXPORT LineDiagram();
         //! Destructor
-        DLLEXPORT virtual ~BarDiagram();
+        DLLEXPORT virtual ~LineDiagram();
         //! Sets the used TextRenderer
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);

Drawing.cpp

@@ -1,14 +1,14 @@
 #include "Drawing.h"
 
 #include "AlphaField.h"
-#include "Image.h"
-#include "Screen.h"
-#include "Globals.h"
-#include "MouseEvent.h"
 #include "Border.h"
 #include "Font.h"
-#include "Scroll.h"
+#include "Globals.h"
+#include "Image.h"
 #include "KeyboardEvent.h"
+#include "MouseEvent.h"
+#include "Screen.h"
+#include "Scroll.h"
 #include "Text.h"
 #include "TextField.h"
 #include "ToolTip.h"
@@ -58,8 +58,7 @@ void Drawable::setRender()
     rend = 1;
 }
 
-void Drawable::setToolTipText(
-    const char* txt, Screen* zScreen, Font* zFont)
+void Drawable::setToolTipText(const char* txt, Screen* zScreen, Font* zFont)
 {
     if (!txt)
         toolTip = (ToolTip*)toolTip->release();
@@ -69,7 +68,7 @@ void Drawable::setToolTipText(
         {
             toolTip = new ToolTip(zScreen);
             toolTip->addStyle(DrawableBackground::Style::Background
-                              | DrawableBackground::Style::HAlpha
+                              | DrawableBackground::Style::BAlpha
                               | DrawableBackground::Style::Border
                               | DrawableBackground::Style::Visible);
             toolTip->setBackgroundColor(0xA0000000);
@@ -116,8 +115,7 @@ void Drawable::unlockDrawable()
     cs.unlock();
 }
 
-void Drawable::setMouseEventParameter(
-    void* p) // sets the mouse event parameter
+void Drawable::setMouseEventParameter(void* p) // sets the mouse event parameter
 {
     makParam = p;
 }
@@ -148,8 +146,7 @@ void Framework::Drawable::addMouseEvent(MouseAction ak)
     }
 }
 
-void Drawable::setKeyboardEvent(
-    KeyboardAction ak) // sets the keyboard event
+void Drawable::setKeyboardEvent(KeyboardAction ak) // sets the keyboard event
 {
     tak = ak;
 }
@@ -169,24 +166,24 @@ void Framework::Drawable::addKeyboardEvent(KeyboardAction ak)
     }
 }
 
-void Drawable::setNMouseEventParameter(
+void Drawable::setPostMouseEventParameter(
     void* p) // sets the mouse event parameter
 {
     nmakParam = p;
 }
 
-void Drawable::setNKeyboardEventParameter(
+void Drawable::setPostKeyboardEventParameter(
     void* p) // sets the keyboard event parameter
 {
     ntakParam = p;
 }
 
-void Drawable::setNMouseEvent(MouseAction ak) // sets the mouse event
+void Drawable::setPostMouseEvent(MouseAction ak) // sets the mouse event
 {
     nMak = ak;
 }
 
-void Drawable::setNKeyboardEvent(
+void Drawable::setPostKeyboardEvent(
     KeyboardAction ak) // sets the keyboard event
 {
     nTak = ak;
@@ -216,8 +213,7 @@ void Drawable::doPublicMouseEvent(MouseEvent& me) // calls Mak
     if (!inside && me.id == ME_PLeft) removeStyle(Style::Focus);
     if ((me.processed && hasStyleNot(Style::MEIgnoreProcessed))
         || (!inside && hasStyleNot(Style::MEIgnoreInside))
-        || (hasStyleNot(Style::Visible)
-            && hasStyleNot(Style::MEIgnoreVisible)))
+        || (hasStyleNot(Style::Visible) && hasStyleNot(Style::MEIgnoreVisible)))
     {
         if (lock) unlockDrawable();
         return;
@@ -433,7 +429,7 @@ int Drawable::getInnerWidth() const
 }
 
 // Returns the height of the interior area of the drawing in pixels
-int Drawable::getInnenHeight() const
+int Drawable::getInnerHeight() const
 {
     return gr.y;
 }
@@ -578,8 +574,7 @@ void DrawableBackground::setBackgroundImageZ(
     }
 }
 
-void DrawableBackground::setBackgroundColor(
-    int fc) // sets the background color
+void DrawableBackground::setBackgroundColor(int fc) // sets the background color
 {
     if (backgroundColor != fc)
     {
@@ -629,8 +624,7 @@ void DrawableBackground::setAlphaFieldColor(
     }
 }
 
-void DrawableBackground::setBorderZ(
-    Border* ram) // sets a pointer to the border
+void DrawableBackground::setBorderZ(Border* ram) // sets a pointer to the border
 {
     if (border != ram)
     {
@@ -855,17 +849,17 @@ void DrawableBackground::render(Image& rObj)
     }
     if (hasStyle(Style::Background))
     {
-        if (hasStyle(Style::HAlpha))
+        if (hasStyle(Style::BAlpha))
             rObj.alphaRegion(
                 0, 0, gr.x - rbr * 2, gr.y - rbr * 2, backgroundColor);
         else
             rObj.fillRegion(
                 0, 0, gr.x - rbr * 2, gr.y - rbr * 2, backgroundColor);
-        if (hasStyle(Style::HImage) && backgroundImage)
+        if (hasStyle(Style::BImage) && backgroundImage)
         {
-            if (hasStyle(Style::HImageScale))
+            if (hasStyle(Style::BImageScale))
             {
-                if (hasStyle(Style::HAlpha))
+                if (hasStyle(Style::BAlpha))
                     rObj.alphaImageScaled(
                         0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
                 else
@@ -876,7 +870,7 @@ void DrawableBackground::render(Image& rObj)
             {
                 int x = (gr.x - rbr * 2 - backgroundImage->getSize().x) / 2;
                 int y = (gr.y - rbr * 2 - backgroundImage->getSize().y) / 2;
-                if (hasStyle(Style::HAlpha))
+                if (hasStyle(Style::BAlpha))
                     rObj.alphaImage(
                         x, y, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
                 else
@@ -903,13 +897,13 @@ int DrawableBackground::getInnerWidth() const
 }
 
 // Returns the height of the interior area of the drawing in pixels
-int DrawableBackground::getInnenHeight() const
+int DrawableBackground::getInnerHeight() const
 {
     return getHeight() - 2 * getBorderWidth();
 }
 
-Image* DrawableBackground::getBackgroundImage()
-    const // returns the background image
+Image*
+DrawableBackground::getBackgroundImage() const // returns the background image
 {
     if (!backgroundImage) return 0;
     return dynamic_cast<Image*>(backgroundImage->getThis());
@@ -1016,8 +1010,7 @@ int DrawableBackground::getHorizontalScrollBackground() const
     return horizontalScrollBar ? horizontalScrollBar->getBgColor() : 0;
 }
 
-Drawable*
-DrawableBackground::duplicate() const // Creates a copy of the drawing
+Drawable* DrawableBackground::duplicate() const // Creates a copy of the drawing
 {
     DrawableBackground* obj = new DrawableBackground();
     obj->setPosition(pos);

Drawing.h

@@ -144,18 +144,18 @@ namespace Framework
         //! Sets the parameter passed to the callback function on a mouse event
         //! that is called after the event was processed by the drawing
         //! \param p The parameter
-        DLLEXPORT void setNMouseEventParameter(void* p);
+        DLLEXPORT void setPostMouseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on a keyboard
         //! event that is called after the event was processed by the drawing
         //! \param p The parameter
-        DLLEXPORT void setNKeyboardEventParameter(void* p);
+        DLLEXPORT void setPostKeyboardEventParameter(void* p);
         //! Sets the callback function to be called on a mouse event after
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the mouse event will not be processed
         //! by any other drawing, such as ones behind this drawing. The standard
         //! function __ret1ME can be used, which is defined in MouseEvent.h
         //! and always returns 1 \param ak A pointer to the callback function
-        DLLEXPORT void setNMouseEvent(MouseAction ak);
+        DLLEXPORT void setPostMouseEvent(MouseAction ak);
         //! Sets the callback function to be called on a keyboard event after
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the keyboard event will not be processed
@@ -163,7 +163,7 @@ namespace Framework
         //! which is defined in KeyboardEvent.h and always returns 1. Other
         //! standard functions are _onlyNumbersTE and _onlyHexTE also from
         //! KeyboardEvent.h \param ak A pointer to the callback function
-        DLLEXPORT void setNKeyboardEvent(KeyboardAction ak);
+        DLLEXPORT void setPostKeyboardEvent(KeyboardAction ak);
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
         DLLEXPORT virtual void doPublicMouseEvent(MouseEvent& me);
@@ -233,7 +233,7 @@ namespace Framework
         //! Returns the inner width of the drawing in pixels
         DLLEXPORT virtual int getInnerWidth() const;
         //! Returns the inner height of the drawing in pixels
-        DLLEXPORT virtual int getInnenHeight() const;
+        DLLEXPORT virtual int getInnerHeight() const;
         //! Returns the X position of the drawing in pixels
         DLLEXPORT int getX() const;
         //! Returns the Y position of the drawing in pixels
@@ -281,10 +281,10 @@ namespace Framework
             static const __int64 Background = 0x00020;
             //! If this flag is set, the background is transparent.
             //! Requires flag Background
-            static const __int64 HAlpha = 0x00040;
+            static const __int64 BAlpha = 0x00040;
             //! If this flag is set, an image is used as background.
             //! Requires flag Background
-            static const __int64 HImage = 0x00080;
+            static const __int64 BImage = 0x00080;
             //! If this flag is set, a color gradient appears as border
             static const __int64 Buffered = 0x00100;
             //! If this flag is set, a scrollbar appears at the right edge
@@ -292,7 +292,7 @@ namespace Framework
             //! If this flag is set, a scrollbar appears at the bottom edge
             static const __int64 HScroll = 0x00400;
             //! If this flag is set, the image is scaled
-            static const __int64 HImageScale = 0x00800;
+            static const __int64 BImageScale = 0x00800;
         };
 
     protected:
@@ -376,7 +376,7 @@ namespace Framework
         //! Returns the inner width of the drawing in pixels
         DLLEXPORT virtual int getInnerWidth() const override;
         //! Returns the inner height of the drawing in pixels
-        DLLEXPORT virtual int getInnenHeight() const override;
+        DLLEXPORT virtual int getInnerHeight() const override;
         //! Returns the background image.
         //! \return 0 if no background image is used
         DLLEXPORT Image* getBackgroundImage() const;

File.cpp

@@ -23,10 +23,10 @@ File::File()
       stream(0),
       pfad(0),
       gr(0),
-      tmpLByte(0),
-      tmpLBPos(7),
-      tmpSByte(0),
-      tmpSBPos(-1),
+      tmpReadByte(0),
+      tmpReadBPos(7),
+      tmpWriteByte(0),
+      tmpWriteBPos(-1),
       key(0)
 {}
 
@@ -116,14 +116,13 @@ bool File::open(int style) // opens the file
     if (stream) delete stream;
     stream = new std::fstream();
     std::ios_base::openmode om = std::ios::binary;
-    if ((style | Style::readAll) == style) om |= std::ios::in;
-    if ((style | Style::schreiben) == style) om |= std::ios::out;
+    if ((style | Style::read) == style) om |= std::ios::in;
+    if ((style | Style::write) == style) om |= std::ios::out;
     stream->open(pfad->getText(), om);
-    if ((style | Style::ende) == style)
+    if ((style | Style::end) == style)
     {
-        if ((style | Style::readAll) == style) stream->seekg(0, std::ios::end);
-        if ((style | Style::schreiben) == style)
-            stream->seekp(0, std::ios::end);
+        if ((style | Style::read) == style) stream->seekg(0, std::ios::end);
+        if ((style | Style::write) == style) stream->seekp(0, std::ios::end);
     }
     if (!stream->is_open() || !stream->good())
     {
@@ -131,12 +130,12 @@ bool File::open(int style) // opens the file
         stream = 0;
         return 0;
     }
-    tmpLBPos = 7;
-    tmpSBPos = -1;
+    tmpReadBPos = 7;
+    tmpWriteBPos = -1;
     return 1;
 }
 
-void File::setLPosition(__int64 pos, bool ende) // sets the read position
+void File::setReadPosition(__int64 pos, bool ende) // sets the read position
 {
     if (!pfad) return;
     if (stream)
@@ -146,10 +145,10 @@ void File::setLPosition(__int64 pos, bool ende) // sets the read position
         else
             stream->seekg(pos, std::ios::beg);
     }
-    tmpLBPos = 7;
+    tmpReadBPos = 7;
 }
 
-void File::setSPosition(__int64 pos, bool ende) // sets the write position
+void File::setWritePosition(__int64 pos, bool ende) // sets the write position
 {
     if (!pfad) return;
     if (stream)
@@ -159,21 +158,21 @@ void File::setSPosition(__int64 pos, bool ende) // sets the write position
         else
             stream->seekp(pos, std::ios::beg);
     }
-    tmpSBPos = -1;
+    tmpWriteBPos = -1;
 }
 
 void File::write(const char* bytes, int len) // writes bytes to file
 {
     if (!pfad || !stream) return;
-    if (tmpSBPos >= 0)
+    if (tmpWriteBPos >= 0)
     {
-        tmpSBPos = -1;
-        stream->write(&tmpSByte, 1);
-        tmpSByte = 0;
+        tmpWriteBPos = -1;
+        stream->write(&tmpWriteByte, 1);
+        tmpWriteByte = 0;
     }
     if (key)
     {
-        key->setPos(getSPosition());
+        key->setPos(getWritePosition());
         Bytes* n = new Bytes(bytes, len);
         key->encode(dynamic_cast<Bytes*>(n->getThis()));
         stream->write(n->getBytes(), len);
@@ -194,7 +193,7 @@ void File::read(char* bytes, int len) // reads bytes from file
     if (!pfad) return;
     if (stream)
     {
-        __int64 tmp = getLPosition();
+        __int64 tmp = getReadPosition();
         stream->read(bytes, len);
         if (key)
         {
@@ -204,8 +203,8 @@ void File::read(char* bytes, int len) // reads bytes from file
             key->decode(n);
         }
     }
-    tmpLBPos = 7;
-    tmpSBPos = -1;
+    tmpReadBPos = 7;
+    tmpWriteBPos = -1;
 }
 
 Text* File::readLine() // reads a line
@@ -216,7 +215,7 @@ Text* File::readLine() // reads a line
     __int64 len = getSize();
     for (char c = 0; c != '\n' && stream->tellg() < len;)
     {
-        __int64 tmp = getLPosition();
+        __int64 tmp = getReadPosition();
         stream->read(&c, 1);
         if (key)
         {
@@ -227,26 +226,26 @@ Text* File::readLine() // reads a line
         }
         if (c) ret->append(&c, 1);
     }
-    tmpSBPos = 7;
-    tmpSBPos = -1;
+    tmpWriteBPos = 7;
+    tmpWriteBPos = -1;
     return ret;
 }
 
 void File::close() // closes the file
 {
     if (!pfad || !stream) return;
-    if (tmpSBPos >= 0)
+    if (tmpWriteBPos >= 0)
     {
         if (key)
         {
-            key->setPos(getSPosition());
-            Bytes* n = new Bytes(&tmpSByte, 1);
+            key->setPos(getWritePosition());
+            Bytes* n = new Bytes(&tmpWriteByte, 1);
             key->encode(dynamic_cast<Bytes*>(n->getThis()));
             stream->write(n->getBytes(), 1);
             n->release();
         }
         else
-            stream->write(&tmpSByte, 1);
+            stream->write(&tmpWriteByte, 1);
     }
     stream->close();
     delete stream;
@@ -313,43 +312,43 @@ bool File::setLetzteAEnderung(
 bool File::getNextBit(bool& bit) // read file bit by bit
 {
     if (!pfad || !stream) return 0;
-    if (tmpLBPos == 7)
+    if (tmpReadBPos == 7)
     {
-        tmpLBPos = -1;
-        __int64 tmp = getLPosition();
-        stream->read(&tmpLByte, 1);
+        tmpReadBPos = -1;
+        __int64 tmp = getReadPosition();
+        stream->read(&tmpReadByte, 1);
         if (key)
         {
             key->setPos(tmp);
             Bytes* n = new Bytes();
-            n->setBytesZ(&tmpLByte, 1);
+            n->setBytesZ(&tmpReadByte, 1);
             key->decode(n);
         }
     }
-    tmpLBPos++;
-    bit = (tmpLByte >> (7 - tmpLBPos)) & 1;
+    tmpReadBPos++;
+    bit = (tmpReadByte >> (7 - tmpReadBPos)) & 1;
     return 1;
 }
 
 bool File::setNextBit(bool bit) // write file bit by bit
 {
     if (!pfad || !stream) return 0;
-    tmpSBPos++;
-    tmpSByte |= (char)(((char)bit << (7 - tmpSBPos)) & (1 << (7 - tmpSBPos)));
-    if (tmpSBPos == 7)
+    tmpWriteBPos++;
+    tmpWriteByte |= (char)(((char)bit << (7 - tmpWriteBPos)) & (1 << (7 - tmpWriteBPos)));
+    if (tmpWriteBPos == 7)
     {
-        tmpSBPos = -1;
+        tmpWriteBPos = -1;
         if (key)
         {
-            key->setPos(getSPosition());
-            Bytes* n = new Bytes(&tmpSByte, 1);
+            key->setPos(getWritePosition());
+            Bytes* n = new Bytes(&tmpWriteByte, 1);
             key->encode(dynamic_cast<Bytes*>(n->getThis()));
             stream->write(n->getBytes(), 1);
             n->release();
         }
         else
-            stream->write(&tmpSByte, 1);
-        tmpSByte = 0;
+            stream->write(&tmpWriteByte, 1);
+        tmpWriteByte = 0;
     }
     return 1;
 }
@@ -552,13 +551,13 @@ bool File::exists() const // checks if the file exists
     return FileExists(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-__int64 File::getLPosition() const // returns the read position
+__int64 File::getReadPosition() const // returns the read position
 {
     if (!stream) return 0;
     return stream->tellg();
 }
 
-__int64 File::getSPosition() const // returns the write position
+__int64 File::getWritePosition() const // returns the write position
 {
     if (!stream) return 0;
     return stream->tellp();

File.h

@@ -27,10 +27,10 @@ namespace Framework
         class Style
         {
         public:
-            static const int readAll = 0x01; //! file is opened for reading
-            static const int schreiben
+            static const int read = 0x01; //! file is opened for reading
+            static const int write
                 = 0x02; //! file is opened for writing
-            static const int ende
+            static const int end
                 = 0x04; //! sets file pointer to the end of the file
         };
 
@@ -38,10 +38,10 @@ namespace Framework
         std::fstream* stream;
         Text* pfad;
         __int64 gr;
-        char tmpLByte;
-        char tmpLBPos;
-        char tmpSByte;
-        char tmpSBPos;
+        char tmpReadByte;
+        char tmpReadBPos;
+        char tmpWriteByte;
+        char tmpWriteBPos;
         Encryption::Key* key;
 
     public:
@@ -85,12 +85,12 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the file. 0 if the
         //! index counts from the beginning of the file
-        DLLEXPORT void setLPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setReadPosition(__int64 pos, bool ende) override;
         //! Sets the position of the byte to be overwritten next
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the file. 0 if the
         //! index counts from the beginning of the file
-        DLLEXPORT void setSPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setWritePosition(__int64 pos, bool ende) override;
         //! Writes to the file
         //! \param bytes An array of bytes to be written
         //! \param len How many bytes should be written to the file
@@ -150,11 +150,11 @@ namespace Framework
         //! Returns the index of the byte from the file that would be read next
         //! return -1 if an error occurred.
         //! Otherwise the position of the read pointer
-        DLLEXPORT __int64 getLPosition() const override;
+        DLLEXPORT __int64 getReadPosition() const override;
         //! Returns the index of the byte from the file that would be overwritten next
         //! return -1 if an error occurred.
         //! Otherwise the position of the write pointer
-        DLLEXPORT __int64 getSPosition() const override;
+        DLLEXPORT __int64 getWritePosition() const override;
         //! Checks whether the file has been fully read
         //!  return 1 if the file has been fully read. 0 otherwise
         DLLEXPORT bool isEnd() const override;

InMemoryBuffer.cpp

@@ -99,7 +99,7 @@ bool InMemoryBuffer::isEnd() const
 //! \param pos The index of the byte
 //! \param ende 1 if the index counts from the end of the resource. 0 if the index
 //! counts from the beginning of the resource
-void InMemoryBuffer::setLPosition(__int64 pos, bool ende)
+void InMemoryBuffer::setReadPosition(__int64 pos, bool ende)
 {
     if (ende)
         readPos = MAX(0, maxWritePos - (int)pos);
@@ -111,7 +111,7 @@ void InMemoryBuffer::setLPosition(__int64 pos, bool ende)
 //! \param pos The index of the byte
 //! \param ende 1 if the index counts from the end of the resource. 0 if the index
 //! counts from the beginning of the resource
-void InMemoryBuffer::setSPosition(__int64 pos, bool ende)
+void InMemoryBuffer::setWritePosition(__int64 pos, bool ende)
 {
     if (ende)
         writePos = MAX(0, maxWritePos - (int)pos);
@@ -121,14 +121,14 @@ void InMemoryBuffer::setSPosition(__int64 pos, bool ende)
 
 //! Returns the index of the byte from the resource that would be read next
 //! return -1 if an error occurred. Otherwise the position of the read pointer
-__int64 InMemoryBuffer::getLPosition() const
+__int64 InMemoryBuffer::getReadPosition() const
 {
     return readPos;
 }
 
 //! Returns the index of the byte from the resource that would be written next
 //! return -1 if an error occurred. Otherwise the position of the write pointer
-__int64 InMemoryBuffer::getSPosition() const
+__int64 InMemoryBuffer::getWritePosition() const
 {
     return writePos;
 }

InMemoryBuffer.h

@@ -39,18 +39,18 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if
         //! the index counts from the beginning of the resource
-        DLLEXPORT void setLPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setReadPosition(__int64 pos, bool ende) override;
         //! Sets the position of the byte to be written next
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if
         //! the index counts from the beginning of the resource
-        DLLEXPORT void setSPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setWritePosition(__int64 pos, bool ende) override;
         //! Returns the index of the byte from the resource that would be read next
         //! return -1 if an error occurred. Otherwise the position of the read pointer
-        DLLEXPORT __int64 getLPosition() const override;
+        DLLEXPORT __int64 getReadPosition() const override;
         //! Returns the index of the byte from the resource that would be written next
         //! return -1 if an error occurred. Otherwise the position of the write pointer
-        DLLEXPORT __int64 getSPosition() const override;
+        DLLEXPORT __int64 getWritePosition() const override;
         //! Returns the number of bytes to be read
         DLLEXPORT __int64 getSize() const override;
     };

InitFile.cpp

@@ -56,7 +56,7 @@ bool InitFile::load()
 {
     File* dat = new File();
     dat->setFile(pfad->getText());
-    if (!dat->open(File::Style::readAll))
+    if (!dat->open(File::Style::read))
     {
         dat->release();
         return 0;
@@ -186,7 +186,7 @@ bool InitFile::save()
     File* dat = new File();
     dat->setFile(pfad->getText());
     if (!dat->exists()) dat->create();
-    if (!dat->open(File::Style::schreiben))
+    if (!dat->open(File::Style::write))
     {
         dat->release();
         return 0;

JSON.cpp

@@ -476,7 +476,7 @@ JSONValue* JSON::loadJSONFromFile(Text path)
 {
     File d;
     d.setFile(path);
-    if (!d.open(File::Style::readAll))
+    if (!d.open(File::Style::read))
     {
         return new JSONValue();
     }

JsonEditor.cpp

@@ -1700,7 +1700,7 @@ JsonEditor::JsonEditor(UIInit uiInit)
     errorDescription->setStyle(TextField::Style::Text | TextField::Style::Center
                                | TextField::Style::Border
                                | TextField::Style::Background
-                               | TextField::Style::HAlpha);
+                               | TextField::Style::BAlpha);
     errorDescription->removeStyle(TextField::Style::Visible);
     errorDescription->setFontColor(0xFFFFFFFF);
     errorDescription->setBorderColor(0xFFA0A0A0);
@@ -1752,7 +1752,7 @@ void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
     {
         if (me.mx >= getInnerWidth() - 15)
         {
-            int line = (int)(me.my / ((double)getInnenHeight() / lineCount));
+            int line = (int)(me.my / ((double)getInnerHeight() / lineCount));
             if (line >= lineCount)
             {
                 line = lineCount - 1;
@@ -1778,7 +1778,7 @@ void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
             if (dragSart.x >= getInnerWidth() - 15)
             {
                 int line
-                    = (int)(me.my / ((double)getInnenHeight() / lineCount));
+                    = (int)(me.my / ((double)getInnerHeight() / lineCount));
                 if (line >= lineCount)
                 {
                     line = lineCount - 1;
@@ -2685,7 +2685,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
     if (textRenderer->zFont() && content
         && rObj.setDrawOptions(
             pos + Point(getBorderWidth(), getBorderWidth()),
-            Point(getInnerWidth(), getInnenHeight())))
+            Point(getInnerWidth(), getInnerHeight())))
     {
         if (!renderStart.line)
         {
@@ -2858,10 +2858,10 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                         }
                         if (errorDescription->getY()
                                 + errorDescription->getHeight()
-                            > getInnenHeight())
+                            > getInnerHeight())
                         {
                             errorDescription->setY(
-                                getInnenHeight() - errorDescription->getHeight()
+                                getInnerHeight() - errorDescription->getHeight()
                                 - 5);
                         }
                         errorDescription->addStyle(TextField::Style::Visible);
@@ -3043,7 +3043,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
             0xFFFFFFFF);
         bool visible = false;
         double sy = 0.0;
-        double yOffset = (double)getInnenHeight() / lineCount;
+        double yOffset = (double)getInnerHeight() / lineCount;
         current = content;
         EditableJsonElement* hiddenStop = 0;
         while (current)

List.cpp

@@ -2,13 +2,13 @@
 
 #include "AlphaField.h"
 #include "Array.h"
-#include "Image.h"
-#include "Globals.h"
-#include "MouseEvent.h"
 #include "Border.h"
 #include "Font.h"
-#include "Scroll.h"
+#include "Globals.h"
+#include "Image.h"
 #include "KeyboardEvent.h"
+#include "MouseEvent.h"
+#include "Scroll.h"
 #include "Text.h"
 #include "TextField.h"
 
@@ -143,18 +143,17 @@ void SelectionList::update() // updates the selection list
         bool FieldBorder = DrawableBackground::hasStyle(Style::FieldBorder);
         bool FieldBackground
             = DrawableBackground::hasStyle(Style::FieldBackground);
-        bool FieldHImage = DrawableBackground::hasStyle(Style::FieldHImage);
-        bool FieldHAlpha = DrawableBackground::hasStyle(Style::FieldHAlpha);
+        bool FieldHImage = DrawableBackground::hasStyle(Style::FieldBImage);
+        bool FieldHAlpha = DrawableBackground::hasStyle(Style::FieldBAlpha);
         bool FieldBuffer = DrawableBackground::hasStyle(Style::FieldBuffer);
         for (TextField* tf : *tfListe)
         {
             tf->setStyle(TextField::Style::Border, FieldBorder);
             tf->setStyle(TextField::Style::Background, FieldBackground);
-            tf->setStyle(TextField::Style::HImage, FieldHImage);
-            tf->setStyle(TextField::Style::HAlpha, FieldHAlpha);
+            tf->setStyle(TextField::Style::BImage, FieldHImage);
+            tf->setStyle(TextField::Style::BAlpha, FieldHAlpha);
             tf->setStyle(TextField::Style::Buffered, FieldBuffer);
-            if (font)
-                tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
+            if (font) tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
         }
     }
     if (DrawableBackground::hasStyle(Style::MultiStyled) && tfListe && styles)
@@ -167,11 +166,11 @@ void SelectionList::update() // updates the selection list
             tf->setStyle(TextField::Style::Background,
                 hasStyle(style, Style::FieldBackground));
             tf->setStyle(
-                TextField::Style::HImage, hasStyle(style, Style::FieldHImage));
+                TextField::Style::BImage, hasStyle(style, Style::FieldBImage));
             tf->setStyle(
-                TextField::Style::HAlpha, hasStyle(style, Style::FieldHAlpha));
-            tf->setStyle(
-                TextField::Style::Buffered, hasStyle(style, Style::FieldBuffer));
+                TextField::Style::BAlpha, hasStyle(style, Style::FieldBAlpha));
+            tf->setStyle(TextField::Style::Buffered,
+                hasStyle(style, Style::FieldBuffer));
         }
     }
     rend = 1;
@@ -238,8 +237,7 @@ void SelectionList::addEntryZ(int pos, TextField* tf)
     rend = 1;
 }
 
-void SelectionList::setEntry(
-    int pos, Text* txt) // changes the entry at pos
+void SelectionList::setEntry(int pos, Text* txt) // changes the entry at pos
 {
     TextField* tf = 0;
     if (tfListe) tf = tfListe->z(pos);
@@ -292,7 +290,8 @@ void SelectionList::swapEntryPos(
     }
 }
 
-void Framework::SelectionList::setEntryPos(int vpos, int npos) {
+void Framework::SelectionList::setEntryPos(int vpos, int npos)
+{
     if (tfListe)
     {
         tfListe->setPosition(vpos, npos);
@@ -311,8 +310,7 @@ void SelectionList::removeEntry(int pos) // deletes entry at pos
     rend = 1;
 }
 
-void SelectionList::setFontZ(
-    Font* font) // sets the font for the entries
+void SelectionList::setFontZ(Font* font) // sets the font for the entries
 {
     if (this->font) this->font->release();
     this->font = font;
@@ -323,8 +321,7 @@ void SelectionList::setVScrollToEntry(int entry) // scrolls to entry
 {
     if (vertikalScrollBar)
     {
-        if (entry > tfListe->getLastIndex())
-            entry = tfListe->getLastIndex();
+        if (entry > tfListe->getLastIndex()) entry = tfListe->getLastIndex();
         int y = 0;
         for (int i = 0; i < entry; i++)
             y += tfListe->z(i) ? tfListe->z(i)->getHeight() : 0;
@@ -333,7 +330,7 @@ void SelectionList::setVScrollToEntry(int entry) // scrolls to entry
 }
 
 void SelectionList::updateVScroll() // scrolls to cursor position or
-                                   // down
+                                    // down
 {
     if (vertikalScrollBar)
     {
@@ -350,15 +347,16 @@ void SelectionList::updateVScroll() // scrolls to cursor position or
     }
 }
 
-void SelectionList::setALRZ(Border*
-        border) // sets a pointer to the selection border (only without MultiStyled)
+void SelectionList::setSelectionBorderZ(
+    Border* border) // sets a pointer to the selection border (only without
+                    // MultiStyled)
 {
     if (aBorder) aBorder->release();
     aBorder = border;
     rend = 1;
 }
 
-void SelectionList::setALRWidth(
+void SelectionList::setSelectionBorderWidth(
     int br) // sets the width of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
@@ -366,7 +364,7 @@ void SelectionList::setALRWidth(
     rend = 1;
 }
 
-void SelectionList::setALRColor(
+void SelectionList::setSelectionBorderColor(
     int fc) // sets the color of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
@@ -374,24 +372,25 @@ void SelectionList::setALRColor(
     rend = 1;
 }
 
-void SelectionList::setAAFZ(AlphaField* buffer) // sets a pointer to the selection
-                                              // AlphaField (only without MultiStyled)
+void SelectionList::setSelectionAFZ(
+    AlphaField* buffer) // sets a pointer to the selection
+                        // AlphaField (only without MultiStyled)
 {
     if (aBuffer) aBuffer->release();
     aBuffer = buffer;
     rend = 1;
 }
 
-void SelectionList::setAAFStrength(
-    int st) // sets the strength of the selection background buffer (only without
-            // MultiStyled)
+void SelectionList::setSelectionAFStrength(
+    int st) // sets the strength of the selection background buffer (only
+            // without MultiStyled)
 {
     if (!aBuffer) aBuffer = new AlphaField();
     aBuffer->setStrength(st);
     rend = 1;
 }
 
-void SelectionList::setAAFColor(
+void SelectionList::setSelectionAFColor(
     int fc) // sets the color of the selection background buffer (only without
             // MultiStyled)
 {
@@ -400,8 +399,8 @@ void SelectionList::setAAFColor(
     rend = 1;
 }
 
-void SelectionList::setAHImage(
-    Image* bild) // sets the selection background image (only without MultiStyled)
+void SelectionList::setSelectionBImage(Image*
+        bild) // sets the selection background image (only without MultiStyled)
 {
     if (!ahImage) ahImage = new Image();
     ahImage->newImage(bild->getWidth(), bild->getHeight(), 0);
@@ -413,31 +412,32 @@ void SelectionList::setAHImage(
     rend = 1;
 }
 
-void SelectionList::setAHColor(int f) // sets the selection
-                                      // background color (only without MultiStyled)
+void SelectionList::setSelectionBColor(
+    int f) // sets the selection
+           // background color (only without MultiStyled)
 {
     ahColor = f;
     rend = 1;
 }
 
-void SelectionList::setAHImageZ(
-    Image* b) // sets a pointer to the background image (only without MultiStyled)
+void SelectionList::setSelectionBImageZ(Image*
+        b) // sets a pointer to the background image (only without MultiStyled)
 {
     if (ahImage) ahImage->release();
     ahImage = b;
     rend = 1;
 }
 
-void SelectionList::setALRZ(int pos,
-    Border*
-        border) // sets a pointer to the selection border (only with MultiStyled)
+void SelectionList::setSelectionBorderZ(int pos,
+    Border* border) // sets a pointer to the selection border (only with
+                    // MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
     aBorderList->set(border, pos);
     rend = 1;
 }
 
-void SelectionList::setALRWidth(int pos,
+void SelectionList::setSelectionBorderWidth(int pos,
     int br) // sets the width of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
@@ -446,7 +446,7 @@ void SelectionList::setALRWidth(int pos,
     rend = 1;
 }
 
-void SelectionList::setALRColor(int pos,
+void SelectionList::setSelectionBorderColor(int pos,
     int fc) // sets the color of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
@@ -455,16 +455,16 @@ void SelectionList::setALRColor(int pos,
     rend = 1;
 }
 
-void SelectionList::setAAFZ(int pos,
-    AlphaField*
-        buffer) // sets a pointer to the selection AlphaField (only with MultiStyled)
+void SelectionList::setSelectionAFZ(int pos,
+    AlphaField* buffer) // sets a pointer to the selection AlphaField (only with
+                        // MultiStyled)
 {
     if (!aBufferListe) aBufferListe = new RCArray<AlphaField>();
     aBufferListe->set(buffer, pos);
     rend = 1;
 }
 
-void SelectionList::setAAFStrength(
+void SelectionList::setSelectionAFStrength(
     int pos, int st) // sets the strength of the selection background buffer
                      // (only with MultiStyled)
 {
@@ -474,7 +474,7 @@ void SelectionList::setAAFStrength(
     rend = 1;
 }
 
-void SelectionList::setAAFColor(
+void SelectionList::setSelectionAFColor(
     int pos, int fc) // sets the color of the selection background buffer
                      // (only with MultiStyled)
 {
@@ -484,7 +484,7 @@ void SelectionList::setAAFColor(
     rend = 1;
 }
 
-void SelectionList::setAHImage(int pos,
+void SelectionList::setSelectionBImage(int pos,
     Image* bild) // sets the selection background image (only with MultiStyled)
 {
     if (ahImageListe) ahImageListe = new RCArray<Image>();
@@ -498,7 +498,7 @@ void SelectionList::setAHImage(int pos,
     rend = 1;
 }
 
-void SelectionList::setAHColor(
+void SelectionList::setSelectionBColor(
     int pos, int f) // sets the selection background color
                     // (only with MultiStyled)
 {
@@ -507,7 +507,7 @@ void SelectionList::setAHColor(
     rend = 1;
 }
 
-void SelectionList::setAHImageZ(int pos,
+void SelectionList::setSelectionBImageZ(int pos,
     Image* b) // sets a pointer to the background image (only with MultiStyled)
 {
     if (ahImageListe) ahImageListe = new RCArray<Image>();
@@ -597,8 +597,7 @@ void SelectionList::doKeyboardEvent(KeyboardEvent& te)
         }
         te.processed = 1;
     }
-    if (ntakc && te.processed && nTak)
-        te.processed = nTak(ntakParam, this, te);
+    if (ntakc && te.processed && nTak) te.processed = nTak(ntakParam, this, te);
     release();
 }
 
@@ -671,23 +670,23 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
                         tf->setBackgroundColor(ahColor);
                         tf->setStyle(TextField::Style::Background,
                             DrawableBackground::hasStyle(Style::Background));
-                        if (DrawableBackground::hasStyle(Style::SelectionHImage)
+                        if (DrawableBackground::hasStyle(Style::SelectionBImage)
                             && ahImage)
                         {
                             tmpHImage = tf->getBackgroundImage();
                             tf->setBackgroundImageZ(
                                 dynamic_cast<Image*>(ahImage->getThis()));
-                            tmpHB = tf->hasStyle(TextField::Style::HImage);
-                            tf->setStyle(TextField::Style::HImage,
-                                DrawableBackground::hasStyle(Style::HImage));
+                            tmpHB = tf->hasStyle(TextField::Style::BImage);
+                            tf->setStyle(TextField::Style::BImage,
+                                DrawableBackground::hasStyle(Style::BImage));
                         }
                         if (DrawableBackground::hasStyle(
-                                Style::SelectionHAlpha))
+                                Style::SelectionBAlpha))
                         {
-                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
-                            tf->setStyle(TextField::Style::HAlpha,
+                            tmpHAlpha = tf->hasStyle(TextField::Style::BAlpha);
+                            tf->setStyle(TextField::Style::BAlpha,
                                 DrawableBackground::hasStyle(
-                                    Style::SelectionHAlpha));
+                                    Style::SelectionBAlpha));
                         }
                     }
                     if (DrawableBackground::hasStyle(Style::SelectionBorder)
@@ -722,19 +721,20 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
                             tmpHColor = tf->getBackgroundColor();
                             tf->setBackgroundColor(ahColorListe->get(i));
                         }
-                        if (hasStyle(style, Style::SelectionHImage) && ahImageListe)
+                        if (hasStyle(style, Style::SelectionBImage)
+                            && ahImageListe)
                         {
                             tmpHImage = tf->getBackgroundImage();
                             tf->setBackgroundImageZ(ahImageListe->get(i));
-                            tmpHB = tf->hasStyle(TextField::Style::HImage);
-                            tf->setStyle(TextField::Style::HImage,
-                                hasStyle(style, Style::HImage));
+                            tmpHB = tf->hasStyle(TextField::Style::BImage);
+                            tf->setStyle(TextField::Style::BImage,
+                                hasStyle(style, Style::BImage));
                         }
-                        if (hasStyle(style, Style::SelectionHAlpha))
+                        if (hasStyle(style, Style::SelectionBAlpha))
                         {
-                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
-                            tf->setStyle(TextField::Style::HAlpha,
-                                hasStyle(style, Style::SelectionHAlpha));
+                            tmpHAlpha = tf->hasStyle(TextField::Style::BAlpha);
+                            tf->setStyle(TextField::Style::BAlpha,
+                                hasStyle(style, Style::SelectionBAlpha));
                         }
                     }
                     if (hasStyle(style, Style::SelectionBorder) && aBorderList)
@@ -762,14 +762,15 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
                     {
                         tf->setBackgroundColor(tmpHColor);
                         tf->setStyle(TextField::Style::Background, tmpH);
-                        if (DrawableBackground::hasStyle(Style::SelectionHImage))
+                        if (DrawableBackground::hasStyle(
+                                Style::SelectionBImage))
                         {
                             tf->setBackgroundImageZ(tmpHImage);
-                            tf->setStyle(TextField::Style::HImage, tmpHB);
+                            tf->setStyle(TextField::Style::BImage, tmpHB);
                         }
                         if (DrawableBackground::hasStyle(
-                                Style::SelectionHAlpha))
-                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
+                                Style::SelectionBAlpha))
+                            tf->setStyle(TextField::Style::BAlpha, tmpHAlpha);
                     }
                     if (DrawableBackground::hasStyle(Style::SelectionBorder))
                     {
@@ -789,13 +790,14 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
                         tf->setStyle(TextField::Style::Background, tmpH);
                         if (ahColorListe && ahColorListe->has(i))
                             tf->setBackgroundColor(tmpHColor);
-                        if (hasMsStyle(i, Style::SelectionHImage) && ahImageListe)
+                        if (hasMsStyle(i, Style::SelectionBImage)
+                            && ahImageListe)
                         {
                             tf->setBackgroundImageZ(tmpHImage);
-                            tf->setStyle(TextField::Style::HImage, tmpHB);
+                            tf->setStyle(TextField::Style::BImage, tmpHB);
                         }
-                        if (hasMsStyle(i, Style::SelectionHAlpha))
-                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
+                        if (hasMsStyle(i, Style::SelectionBAlpha))
+                            tf->setStyle(TextField::Style::BAlpha, tmpHAlpha);
                     }
                     if (hasMsStyle(i, Style::SelectionBorder) && aBorderList)
                     {
@@ -852,21 +854,19 @@ void SelectionList::deselect()
 }
 
 // constant
-int SelectionList::getEntryCount()
-    const // returns the number of entries
+int SelectionList::getEntryCount() const // returns the number of entries
 {
     return tfListe ? tfListe->getEntryCount() : 0;
 }
 
-int SelectionList::getSelection()
-    const // returns the first selected entry
+int SelectionList::getSelection() const // returns the first selected entry
 {
     return selection;
 }
 
 int SelectionList::getEntryPos(
     Text* entryText) // returns the position of the entry with the
-                       // corresponding text
+                     // corresponding text
 {
     int i = 0;
     for (auto tf = tfListe->begin(); tf; tf++, i++)
@@ -895,49 +895,49 @@ TextField* SelectionList::zEntry(int pos) const
     return (TextField*)tfListe->z(pos);
 }
 
-Border* SelectionList::getABorder()
+Border* SelectionList::getSelectionBorder()
     const // returns the selection border (without MultiStyled)
 {
     if (aBorder) return dynamic_cast<Border*>(aBorder->getThis());
     return 0;
 }
 
-Border* SelectionList::zABorder() const
+Border* SelectionList::zSelectionBorder() const
 {
     return aBorder;
 }
 
-int SelectionList::getAHColor()
+int SelectionList::getSelectionBColor()
     const // returns the selection background color (without MultiStyled)
 {
     return ahColor;
 }
 
-Image* SelectionList::getAHImage()
+Image* SelectionList::getSelectionBImage()
     const // returns the selection background image (without MultiStyled)
 {
     if (ahImage) return dynamic_cast<Image*>(ahImage->getThis());
     return 0;
 }
 
-Image* SelectionList::zAHImage() const
+Image* SelectionList::zSelectionBImage() const
 {
     return ahImage;
 }
 
-AlphaField* SelectionList::getABuffer()
+AlphaField* SelectionList::getSelectionBuffer()
     const // returns the selection buffer (without MultiStyled)
 {
     if (aBuffer) return dynamic_cast<AlphaField*>(aBuffer->getThis());
     return 0;
 }
 
-AlphaField* SelectionList::zABuffer() const
+AlphaField* SelectionList::zSelectionBuffer() const
 {
     return aBuffer;
 }
 
-Border* SelectionList::getABorder(
+Border* SelectionList::getSelectionBorder(
     int pos) const // returns the selection border (with MultiStyled)
 {
     Border* ret = 0;
@@ -946,21 +946,21 @@ Border* SelectionList::getABorder(
     return 0;
 }
 
-Border* SelectionList::zABorder(int pos) const
+Border* SelectionList::zSelectionBorder(int pos) const
 {
     Border* ret = 0;
     if (aBorderList) ret = (Border*)aBorderList->z(pos);
     return ret;
 }
 
-int SelectionList::getAHColor(int pos)
-    const // returns the selection background color (with MultiStyled)
+int SelectionList::getSelectionBColor(
+    int pos) const // returns the selection background color (with MultiStyled)
 {
     if (ahColorListe && ahColorListe->has(pos)) return ahColorListe->get(pos);
     return 0;
 }
 
-Image* SelectionList::getAHImage(
+Image* SelectionList::getSelectionBImage(
     int pos) const // returns the selection background image (with MultiStyled)
 {
     Image* ret = 0;
@@ -969,14 +969,14 @@ Image* SelectionList::getAHImage(
     return 0;
 }
 
-Image* SelectionList::zAHImage(int pos) const
+Image* SelectionList::zSelectionBImage(int pos) const
 {
     Image* ret = 0;
     if (ahImageListe) ret = (Image*)ahImageListe->z(pos);
     return ret;
 }
 
-AlphaField* SelectionList::getABuffer(
+AlphaField* SelectionList::getSelectionBuffer(
     int pos) const // returns the selection buffer (with MultiStyled)
 {
     AlphaField* ret = 0;
@@ -985,15 +985,15 @@ AlphaField* SelectionList::getABuffer(
     return 0;
 }
 
-AlphaField* SelectionList::zABuffer(int pos) const
+AlphaField* SelectionList::zSelectionBuffer(int pos) const
 {
     AlphaField* ret = 0;
     if (aBufferListe) ret = (AlphaField*)aBufferListe->z(pos);
     return ret;
 }
 
-bool SelectionList::hasMsStyle(
-    int pos, __int64 style) const // checks if style is present (with MultiStyled)
+bool SelectionList::hasMsStyle(int pos,
+    __int64 style) const // checks if style is present (with MultiStyled)
 {
     __int64 st = 0;
     if (styles) st = styles->get(pos);
@@ -1056,14 +1056,14 @@ void DrawableList::doMouseEvent(MouseEvent& me, bool userRet)
         me.my -= entry->getHeight();
         if (index < list.getLastIndex())
         {
-            ySum
-                += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
-                     ? entrySeperatorSize
-                     : 0;
-            me.my
-                -= DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
-                     ? entrySeperatorSize
-                     : 0;
+            ySum += DrawableBackground::hasStyle(
+                        DrawableList::Style::EntrySeperator)
+                      ? entrySeperatorSize
+                      : 0;
+            me.my -= DrawableBackground::hasStyle(
+                         DrawableList::Style::EntrySeperator)
+                       ? entrySeperatorSize
+                       : 0;
         }
         index++;
     }
@@ -1249,7 +1249,8 @@ int DrawableList::getClickEntry(int my)
         if (my < y) return index;
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
+            y += DrawableBackground::hasStyle(
+                     DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;
@@ -1301,7 +1302,8 @@ int DrawableList::getNeededHeight() const
     {
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
+            y += DrawableBackground::hasStyle(
+                     DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;

List.h

@@ -30,19 +30,19 @@ namespace Framework
             //! Specifies whether the entries have a background
             static const __int64 FieldBackground = 0x0002000;
             //! Specifies whether the entries have a background image
-            static const __int64 FieldHImage = 0x0004000;
+            static const __int64 FieldBImage = 0x0004000;
             //! Specifies whether alpha blending is used when drawing
             //! entry backgrounds
-            static const __int64 FieldHAlpha = 0x0008000;
+            static const __int64 FieldBAlpha = 0x0008000;
             //! Specifies whether the entries have a color gradient
             static const __int64 FieldBuffer = 0x0010000;
             //! Specifies whether selected entries have a background
             static const __int64 SelectionBackground = 0x0020000;
             //! Specifies whether selected entries have a background image
-            static const __int64 SelectionHImage = 0x0040000;
+            static const __int64 SelectionBImage = 0x0040000;
             //! Specifies whether alpha blending is used for drawing
             //! backgrounds of selected entries
-            static const __int64 SelectionHAlpha = 0x0080000;
+            static const __int64 SelectionBAlpha = 0x0080000;
             //! Specifies whether selected entries have a color gradient
             static const __int64 SelectionBuffer = 0x0100000;
             //! Specifies whether selected entries have a border
@@ -59,7 +59,7 @@ namespace Framework
             //! Combines the flags Visible, Allowed, Border, FieldHAlpha,
             //! FieldBackground, FieldBorder, SelectionBuffer, SelectionBorder
             static const __int64 Normal
-                = Visible | Allowed | Border | FieldHAlpha | FieldBackground
+                = Visible | Allowed | Border | FieldBAlpha | FieldBackground
                 | FieldBorder | SelectionBuffer | SelectionBorder;
         };
 
@@ -142,69 +142,69 @@ namespace Framework
         DLLEXPORT void updateVScroll();
         //! Sets a pointer to the border used for selected entries
         //! if MultiStyled is not set \param border The border
-        DLLEXPORT void setALRZ(Border* border);
+        DLLEXPORT void setSelectionBorderZ(Border* border);
         //! Sets the width of the border used for selected entries
         //! if MultiStyled is not set \param br The width in pixels
-        DLLEXPORT void setALRWidth(int br);
+        DLLEXPORT void setSelectionBorderWidth(int br);
         //! Sets the color of the border used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setALRColor(int fc);
+        DLLEXPORT void setSelectionBorderColor(int fc);
         //! Sets a pointer to the color gradient used for selected entries
         //! if MultiStyled is not set \param buffer The color gradient
-        DLLEXPORT void setAAFZ(AlphaField* buffer);
+        DLLEXPORT void setSelectionAFZ(AlphaField* buffer);
         //! Sets the strength of the color gradient used for selected entries
         //! if MultiStyled is not set \param st The strength
-        DLLEXPORT void setAAFStrength(int st);
+        DLLEXPORT void setSelectionAFStrength(int st);
         //! Sets the color of the color gradient used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAAFColor(int fc);
+        DLLEXPORT void setSelectionAFColor(int fc);
         //! Sets the background image by copying, used for selected entries
         //! if MultiStyled is not set \param bild The image to copy
-        DLLEXPORT void setAHImage(Image* bild);
+        DLLEXPORT void setSelectionBImage(Image* bild);
         //! Sets a pointer to the background image used for selected entries
         //! if MultiStyled is not set \param bild The image
-        DLLEXPORT void setAHImageZ(Image* bild);
+        DLLEXPORT void setSelectionBImageZ(Image* bild);
         //! Sets the background color used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAHColor(int fc);
+        DLLEXPORT void setSelectionBColor(int fc);
         //! Sets a pointer to the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param border The border
-        DLLEXPORT void setALRZ(int pos, Border* border);
+        DLLEXPORT void setSelectionBorderZ(int pos, Border* border);
         //! Sets the width of the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param br The width in pixels
-        DLLEXPORT void setALRWidth(int pos, int br);
+        DLLEXPORT void setSelectionBorderWidth(int pos, int br);
         //! Sets the color of the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setALRColor(int pos, int fc);
+        DLLEXPORT void setSelectionBorderColor(int pos, int fc);
         //! Sets a pointer to the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param buffer The color gradient
-        DLLEXPORT void setAAFZ(int pos, AlphaField* buffer);
+        DLLEXPORT void setSelectionAFZ(int pos, AlphaField* buffer);
         //! Sets the strength of the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param st The strength
-        DLLEXPORT void setAAFStrength(int pos, int st);
+        DLLEXPORT void setSelectionAFStrength(int pos, int st);
         //! Sets the color of the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAAFColor(int pos, int fc);
+        DLLEXPORT void setSelectionAFColor(int pos, int fc);
         //! Sets the background image by copying, used for a selected entry
         //! if MultiStyled is set
         //! \param pos The index of the entry
         //! \param bild The image to copy
-        DLLEXPORT void setAHImage(int pos, Image* bild);
+        DLLEXPORT void setSelectionBImage(int pos, Image* bild);
         //! Sets a pointer to the background image used for a selected entry
         //! if MultiStyled is set
         //! \param pos The index of the entry
         //! \param bild The image
-        DLLEXPORT void setAHImageZ(int pos, Image* bild);
+        DLLEXPORT void setSelectionBImageZ(int pos, Image* bild);
         //! Sets the background color used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAHColor(int pos, int fc);
+        DLLEXPORT void setSelectionBColor(int pos, int fc);
         //! Sets the style of an entry if MultiStyled is set, and specifies
         //! whether an entry is selected if MultiSelect is set
         //! \param pos The index of the entry \param style The new style
@@ -256,46 +256,46 @@ namespace Framework
         DLLEXPORT TextField* zEntry(int pos) const;
         //! Returns the border used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT Border* getABorder() const;
+        DLLEXPORT Border* getSelectionBorder() const;
         //! Returns the border without increased reference counter used for
         //! selected entries if MultiStyled is not set
-        DLLEXPORT Border* zABorder() const;
+        DLLEXPORT Border* zSelectionBorder() const;
         //! Returns the background color in A8R8G8B8 format used for
         //! selected entries if MultiStyled is not set
-        DLLEXPORT int getAHColor() const;
+        DLLEXPORT int getSelectionBColor() const;
         //! Returns the background image used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT Image* getAHImage() const;
+        DLLEXPORT Image* getSelectionBImage() const;
         //! Returns the background image without increased reference counter
         //! used for selected entries if MultiStyled is not set
-        DLLEXPORT Image* zAHImage() const;
+        DLLEXPORT Image* zSelectionBImage() const;
         //! Returns the color gradient used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT AlphaField* getABuffer() const;
+        DLLEXPORT AlphaField* getSelectionBuffer() const;
         //! Returns the color gradient without increased reference counter
         //! used for selected entries if MultiStyled is not set
-        DLLEXPORT AlphaField* zABuffer() const;
+        DLLEXPORT AlphaField* zSelectionBuffer() const;
         //! Returns the border used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT Border* getABorder(int pos) const;
+        DLLEXPORT Border* getSelectionBorder(int pos) const;
         //! Returns the border without increased reference counter used for
         //! a selected entry if MultiStyled is set
-        DLLEXPORT Border* zABorder(int pos) const;
+        DLLEXPORT Border* zSelectionBorder(int pos) const;
         //! Returns the background color in A8R8G8B8 format used for a
         //! selected entry if MultiStyled is set
-        DLLEXPORT int getAHColor(int pos) const;
+        DLLEXPORT int getSelectionBColor(int pos) const;
         //! Returns the background image used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT Image* getAHImage(int pos) const;
+        DLLEXPORT Image* getSelectionBImage(int pos) const;
         //! Returns the background image without increased reference counter
         //! used for a selected entry if MultiStyled is set
-        DLLEXPORT Image* zAHImage(int pos) const;
+        DLLEXPORT Image* zSelectionBImage(int pos) const;
         //! Returns the color gradient used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT AlphaField* getABuffer(int pos) const;
+        DLLEXPORT AlphaField* getSelectionBuffer(int pos) const;
         //! Returns the color gradient without increased reference counter
         //! used for a selected entry if MultiStyled is set
-        DLLEXPORT AlphaField* zABuffer(int pos) const;
+        DLLEXPORT AlphaField* zSelectionBuffer(int pos) const;
         //! Checks whether specific styles are set for a specific entry
         //! if MultiStyled is set. Also checks whether an entry is selected
         //! if MultiSelect is set \param pos The index of the entry

Logging.cpp

@@ -609,8 +609,7 @@ Framework::Logging::FileLoggingChannel::FileLoggingChannel(File* file)
     }
     if (!file->isOpen())
     {
-        file->open(
-            File::Style::schreiben | File::Style::ende | File::Style::readAll);
+        file->open(File::Style::write | File::Style::end | File::Style::read);
     }
 }
 

M2File.cpp

@@ -56,7 +56,7 @@ void M2File::readData()
 {
     File d;
     d.setFile(pfad->getText());
-    d.open(File::Style::readAll);
+    d.open(File::Style::read);
     char anz = 0;
     d.read(&anz, 1);
     modelName->clear();
@@ -98,13 +98,13 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
     anz = modelName->getEntryCount();
     File d;
     d.setFile(pfad->getText());
-    d.open(File::Style::readAll);
+    d.open(File::Style::read);
     File neu;
     neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
     while (neu.exists())
         neu.zPfad()->append("0");
-    if (!neu.open(File::Style::schreiben))
+    if (!neu.open(File::Style::write))
     {
         if (d.isOpen()) d.close();
         return 0;
@@ -130,8 +130,8 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
     }
     if (d.exists())
     {
-        d.setLPosition(modelPos->get(0) - offs, 0);
-        __int64 dl = d.getSize() - d.getLPosition();
+        d.setReadPosition(modelPos->get(0) - offs, 0);
+        __int64 dl = d.getSize() - d.getReadPosition();
         char bytes[2048];
         while (dl)
         {
@@ -206,13 +206,13 @@ bool M2File::removeModel(const char* name)
     if (p < 0) return 0;
     File d;
     d.setFile(pfad->getText());
-    if (!d.open(File::Style::readAll)) return 0;
+    if (!d.open(File::Style::read)) return 0;
     File neu;
     neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
     while (neu.exists())
         neu.zPfad()->append("0");
-    if (!neu.open(File::Style::schreiben))
+    if (!neu.open(File::Style::write))
     {
         if (d.isOpen()) d.close();
         return 0;
@@ -243,7 +243,7 @@ bool M2File::removeModel(const char* name)
     }
     if (d.isOpen())
     {
-        d.setLPosition(startP, 0);
+        d.setReadPosition(startP, 0);
         __int64 bLen = endP - startP;
         char bytes[2048];
         while (bLen > 0)
@@ -255,7 +255,7 @@ bool M2File::removeModel(const char* name)
         }
         if (start2P)
         {
-            d.setLPosition(start2P, 0);
+            d.setReadPosition(start2P, 0);
             bLen = d.getSize() - start2P;
             while (bLen > 0)
             {
@@ -286,17 +286,17 @@ Model2DData* M2File::loadModel(const char* name) const
 {
     File d;
     d.setFile(pfad->getText());
-    if (!d.open(File::Style::readAll)) return 0;
+    if (!d.open(File::Style::read)) return 0;
     int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         if (modelName->z(i)->isEqual(name))
         {
-            d.setLPosition(modelPos->get(i), 0);
+            d.setReadPosition(modelPos->get(i), 0);
             break;
         }
     }
-    if (!d.getLPosition())
+    if (!d.getReadPosition())
     {
         d.close();
         return 0;

M3File.cpp

@@ -107,7 +107,7 @@ void M3File::readData()
     modelPos = new Array<__int64>();
     File d;
     d.setFile(pfad);
-    if (!d.open(File::Style::readAll)) return;
+    if (!d.open(File::Style::read)) return;
     unsigned char anz = 0;
     d.read((char*)&anz, 1);
     for (int i = 0; i < anz; i++)
@@ -151,13 +151,13 @@ bool M3File::saveModel(Model3DData* zMdr, const char* name)
     anz = modelName->getEntryCount();
     File d;
     d.setFile(pfad);
-    d.open(File::Style::readAll);
+    d.open(File::Style::read);
     File neu;
     neu.setFile(pfad);
     neu.zPfad()->append("0");
     while (neu.exists())
         neu.zPfad()->append("0");
-    if (!neu.open(File::Style::schreiben))
+    if (!neu.open(File::Style::write))
     {
         if (d.isOpen()) d.close();
         return 0;
@@ -183,8 +183,8 @@ bool M3File::saveModel(Model3DData* zMdr, const char* name)
     }
     if (d.exists())
     {
-        d.setLPosition(modelPos->get(0) - offs, 0);
-        __int64 dl = d.getSize() - d.getLPosition();
+        d.setReadPosition(modelPos->get(0) - offs, 0);
+        __int64 dl = d.getSize() - d.getReadPosition();
         char bytes[2048];
         while (dl)
         {
@@ -263,14 +263,14 @@ bool M3File::removeModel(const char* name)
     if (!hasModel(name)) return 0;
     File d;
     d.setFile(pfad);
-    if (!d.open(File::Style::readAll)) return 0;
+    if (!d.open(File::Style::read)) return 0;
     __int64 startPosition = modelPos->get(0);
     File neu;
     neu.setFile(pfad);
     neu.zPfad()->append("0");
     while (neu.exists())
         neu.zPfad()->append("0");
-    if (!neu.open(File::Style::schreiben))
+    if (!neu.open(File::Style::write))
     {
         d.close();
         return 0;
@@ -307,7 +307,7 @@ bool M3File::removeModel(const char* name)
             }
         }
     }
-    d.setLPosition(startPosition, 0);
+    d.setReadPosition(startPosition, 0);
     __int64 dl = removedPosition - startPosition;
     char bytes[2048];
     while (dl)
@@ -317,7 +317,7 @@ bool M3File::removeModel(const char* name)
         neu.write(bytes, l);
         dl -= l;
     }
-    d.setLPosition(removedPosition + removedLength, 0);
+    d.setReadPosition(removedPosition + removedLength, 0);
     dl = d.getSize() - removedPosition - removedLength;
     while (dl)
     {
@@ -368,11 +368,11 @@ Model3DData* M3File::loadModel(
     {
         File d;
         d.setFile(pfad);
-        if (!d.open(File::Style::readAll))
+        if (!d.open(File::Style::read))
         {
             return 0;
         }
-        d.setLPosition(pos, 0);
+        d.setReadPosition(pos, 0);
         Model3DData* model;
         if (zApi)
         {

Model3D.cpp

@@ -347,8 +347,8 @@ Model3DData::~Model3DData()
 // updates the DX Buffer gpu memory if changed
 DLLEXPORT void Model3DData::updateGPUMemory()
 {
-    dxIndexBuffer->copyData();
-    dxVertexBuffer->copyData();
+    dxIndexBuffer->copyToGPU();
+    dxVertexBuffer->copyToGPU();
 }
 
 // Deletes all model data

ObjFile.cpp

@@ -9,7 +9,7 @@ ObjFile::ObjFile(const char* path)
     : ReferenceCounter()
 {
     file.setFile(path);
-    file.open(File::Style::readAll);
+    file.open(File::Style::read);
     Text* line = file.readLine();
     while (line)
     {
@@ -129,7 +129,7 @@ void ObjFile::readModel(Model3DData* zTarget)
 
 bool ObjFile::loadModel(const char* name, Model3DData* zTarget)
 {
-    file.open(File::Style::readAll);
+    file.open(File::Style::read);
     Text* line = file.readLine();
     while (line)
     {

Progress.h

@@ -51,8 +51,8 @@ namespace Framework
             //! Combines flags Visible, Border, Background, BackgroundImage,
             //! FBorder, FImage, L_R, Percent
             static const __int64 normal = Visible | Border | Background
-                                        | HImage | FBorder | FImage | L_R
-                                        | Prozent | Aktionen | HImageScale;
+                                        | BImage | FBorder | FImage | L_R
+                                        | Prozent | Aktionen | BImageScale;
         };
 
     private:

Reader.cpp

@@ -57,14 +57,14 @@ bool ByteArrayReader::isEnd() const
 //! \param pos The index of the byte
 //! \param ende 1 if the index counts from the end of the resource. 0 if the index
 //! counts from the beginning of the resource
-void ByteArrayReader::setLPosition(__int64 pos, bool ende)
+void ByteArrayReader::setReadPosition(__int64 pos, bool ende)
 {
     position = ende ? max(length - (int)pos, 0) : min((int)pos, length);
 }
 
 //! Returns the index of the byte from the resource that would be read next
 //! return -1 if an error occurred. Otherwise the position of the read pointer
-__int64 ByteArrayReader::getLPosition() const
+__int64 ByteArrayReader::getReadPosition() const
 {
     return position;
 }

Reader.h

@@ -28,10 +28,10 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if
         //! the index counts from the beginning of the resource
-        virtual void setLPosition(__int64 pos, bool ende) = 0;
+        virtual void setReadPosition(__int64 pos, bool ende) = 0;
         //! Returns the index of the byte from the resource that would be read next
         //! return -1 if an error occurred. Otherwise the position of the read pointer
-        virtual __int64 getLPosition() const = 0;
+        virtual __int64 getReadPosition() const = 0;
         //! Returns the number of bytes to be read
         virtual __int64 getSize() const = 0;
     };
@@ -67,10 +67,10 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if
         //! the index counts from the beginning of the resource
-        DLLEXPORT void setLPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setReadPosition(__int64 pos, bool ende) override;
         //! Returns the index of the byte from the resource that would be read next
         //! return -1 if an error occurred. Otherwise the position of the read pointer
-        DLLEXPORT __int64 getLPosition() const override;
+        DLLEXPORT __int64 getReadPosition() const override;
         //! Returns the number of bytes to be read
         DLLEXPORT __int64 getSize() const override;
     };

SelectionBox.cpp

@@ -952,13 +952,13 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
         }
         if (hasStyle(Style::Background))
         {
-            if (hasStyle(Style::HAlpha))
+            if (hasStyle(Style::BAlpha))
                 zRObj.alphaRegion(0, 0, br, hi, backgroundColor);
             else
                 zRObj.fillRegion(0, 0, br, hi, backgroundColor);
-            if (hasStyle(Style::HImage) && backgroundImage)
+            if (hasStyle(Style::BImage) && backgroundImage)
             {
-                if (hasStyle(Style::HAlpha))
+                if (hasStyle(Style::BAlpha))
                     zRObj.alphaImage(0, 0, br, hi, *backgroundImage);
                 else
                     zRObj.drawImage(0, 0, br, hi, *backgroundImage);
@@ -1022,14 +1022,14 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             tmpHImage = tf->getBackgroundImage();
                             tf->setBackgroundImageZ(
                                 dynamic_cast<Image*>(selBgB->getThis()));
-                            tmpHB = tf->hasStyle(TextField::Style::HImage);
+                            tmpHB = tf->hasStyle(TextField::Style::BImage);
                             tf->setStyle(
-                                TextField::Style::HImage, hasStyle(Style::HImage));
+                                TextField::Style::BImage, hasStyle(Style::BImage));
                         }
                         if (hasStyle(Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
-                            tf->setStyle(TextField::Style::HAlpha,
+                            tmpHAlpha = tf->hasStyle(TextField::Style::BAlpha);
+                            tf->setStyle(TextField::Style::BAlpha,
                                 hasStyle(Style::SelectionHAlpha));
                         }
                     }
@@ -1068,14 +1068,14 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                         {
                             tmpHImage = tf->getBackgroundImage();
                             tf->setBackgroundImageZ(msSelBgB->get(selection));
-                            tmpHB = tf->hasStyle(TextField::Style::HImage);
-                            tf->setStyle(TextField::Style::HImage,
-                                hasMsStyle(selection, Style::HImage));
+                            tmpHB = tf->hasStyle(TextField::Style::BImage);
+                            tf->setStyle(TextField::Style::BImage,
+                                hasMsStyle(selection, Style::BImage));
                         }
                         if (hasMsStyle(selection, Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
-                            tf->setStyle(TextField::Style::HAlpha,
+                            tmpHAlpha = tf->hasStyle(TextField::Style::BAlpha);
+                            tf->setStyle(TextField::Style::BAlpha,
                                 hasMsStyle(selection, Style::SelectionHAlpha));
                         }
                     }
@@ -1110,10 +1110,10 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                         if (hasStyle(Style::SelectionHImage))
                         {
                             tf->setBackgroundImageZ(tmpHImage);
-                            tf->setStyle(TextField::Style::HImage, tmpHB);
+                            tf->setStyle(TextField::Style::BImage, tmpHB);
                         }
                         if (hasStyle(Style::SelectionHAlpha))
-                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::BAlpha, tmpHAlpha);
                     }
                     if (hasStyle(Style::SelectionBorder))
                     {
@@ -1137,10 +1137,10 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             && msSelBgB)
                         {
                             tf->setBackgroundImageZ(tmpHImage);
-                            tf->setStyle(TextField::Style::HImage, tmpHB);
+                            tf->setStyle(TextField::Style::BImage, tmpHB);
                         }
                         if (hasMsStyle(selection, Style::SelectionHAlpha))
-                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::BAlpha, tmpHAlpha);
                     }
                     if (hasMsStyle(selection, Style::SelectionBorder)
                         && msSelBorder)
@@ -1227,15 +1227,15 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                                 tmpHImage = tf->getBackgroundImage();
                                 tf->setBackgroundImageZ(
                                     dynamic_cast<Image*>(selBgB->getThis()));
-                                tmpHB = tf->hasStyle(TextField::Style::HImage);
-                                tf->setStyle(TextField::Style::HImage,
-                                    hasStyle(Style::HImage));
+                                tmpHB = tf->hasStyle(TextField::Style::BImage);
+                                tf->setStyle(TextField::Style::BImage,
+                                    hasStyle(Style::BImage));
                             }
                             if (hasStyle(Style::SelectionHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hasStyle(TextField::Style::HAlpha);
-                                tf->setStyle(TextField::Style::HAlpha,
+                                    = tf->hasStyle(TextField::Style::BAlpha);
+                                tf->setStyle(TextField::Style::BAlpha,
                                     hasStyle(Style::SelectionHAlpha));
                             }
                         }
@@ -1273,15 +1273,15 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             {
                                 tmpHImage = tf->getBackgroundImage();
                                 tf->setBackgroundImageZ(msSelBgB->get(i));
-                                tmpHB = tf->hasStyle(TextField::Style::HImage);
-                                tf->setStyle(TextField::Style::HImage,
-                                    hasMsStyle(i, Style::HImage));
+                                tmpHB = tf->hasStyle(TextField::Style::BImage);
+                                tf->setStyle(TextField::Style::BImage,
+                                    hasMsStyle(i, Style::BImage));
                             }
                             if (hasMsStyle(i, Style::SelectionHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hasStyle(TextField::Style::HAlpha);
-                                tf->setStyle(TextField::Style::HAlpha,
+                                    = tf->hasStyle(TextField::Style::BAlpha);
+                                tf->setStyle(TextField::Style::BAlpha,
                                     hasMsStyle(i, Style::SelectionHAlpha));
                             }
                         }
@@ -1320,15 +1320,15 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                                 tmpHImage = tf->getBackgroundImage();
                                 tf->setBackgroundImageZ(
                                     dynamic_cast<Image*>(mouseBgB->getThis()));
-                                tmpHB = tf->hasStyle(TextField::Style::HImage);
-                                tf->setStyle(TextField::Style::HImage,
-                                    hasStyle(Style::HImage));
+                                tmpHB = tf->hasStyle(TextField::Style::BImage);
+                                tf->setStyle(TextField::Style::BImage,
+                                    hasStyle(Style::BImage));
                             }
                             if (hasStyle(Style::MouseHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hasStyle(TextField::Style::HAlpha);
-                                tf->setStyle(TextField::Style::HAlpha,
+                                    = tf->hasStyle(TextField::Style::BAlpha);
+                                tf->setStyle(TextField::Style::BAlpha,
                                     hasStyle(Style::MouseHAlpha));
                             }
                         }
@@ -1366,15 +1366,15 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             {
                                 tmpHImage = tf->getBackgroundImage();
                                 tf->setBackgroundImageZ(msMouseBgB->get(i));
-                                tmpHB = tf->hasStyle(TextField::Style::HImage);
-                                tf->setStyle(TextField::Style::HImage,
-                                    hasMsStyle(i, Style::HImage));
+                                tmpHB = tf->hasStyle(TextField::Style::BImage);
+                                tf->setStyle(TextField::Style::BImage,
+                                    hasMsStyle(i, Style::BImage));
                             }
                             if (hasMsStyle(i, Style::MouseHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hasStyle(TextField::Style::HAlpha);
-                                tf->setStyle(TextField::Style::HAlpha,
+                                    = tf->hasStyle(TextField::Style::BAlpha);
+                                tf->setStyle(TextField::Style::BAlpha,
                                     hasMsStyle(i, Style::MouseHAlpha));
                             }
                         }
@@ -1405,11 +1405,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             if (hasStyle(Style::SelectionHImage))
                             {
                                 tf->setBackgroundImageZ(tmpHImage);
-                                tf->setStyle(TextField::Style::HImage, tmpHB);
+                                tf->setStyle(TextField::Style::BImage, tmpHB);
                             }
                             if (hasStyle(Style::SelectionHAlpha))
                                 tf->setStyle(
-                                    TextField::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::BAlpha, tmpHAlpha);
                         }
                         if (hasStyle(Style::SelectionBorder))
                         {
@@ -1432,11 +1432,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             if (hasMsStyle(i, Style::SelectionHImage) && msSelBgB)
                             {
                                 tf->setBackgroundImageZ(tmpHImage);
-                                tf->setStyle(TextField::Style::HImage, tmpHB);
+                                tf->setStyle(TextField::Style::BImage, tmpHB);
                             }
                             if (hasMsStyle(i, Style::SelectionHAlpha))
                                 tf->setStyle(
-                                    TextField::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::BAlpha, tmpHAlpha);
                         }
                         if (hasMsStyle(i, Style::SelectionBorder) && msSelBorder)
                         {
@@ -1461,11 +1461,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             if (hasStyle(Style::MouseHImage))
                             {
                                 tf->setBackgroundImageZ(tmpHImage);
-                                tf->setStyle(TextField::Style::HImage, tmpHB);
+                                tf->setStyle(TextField::Style::BImage, tmpHB);
                             }
                             if (hasStyle(Style::MouseHAlpha))
                                 tf->setStyle(
-                                    TextField::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::BAlpha, tmpHAlpha);
                         }
                         if (hasStyle(Style::MouseBorder))
                         {
@@ -1488,11 +1488,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                             if (hasMsStyle(i, Style::MouseHImage) && msSelBgB)
                             {
                                 tf->setBackgroundImageZ(tmpHImage);
-                                tf->setStyle(TextField::Style::HImage, tmpHB);
+                                tf->setStyle(TextField::Style::BImage, tmpHB);
                             }
                             if (hasMsStyle(i, Style::MouseHAlpha))
                                 tf->setStyle(
-                                    TextField::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::BAlpha, tmpHAlpha);
                         }
                         if (hasMsStyle(i, Style::MouseBorder) && msSelBorder)
                         {

Shader.cpp

@@ -50,7 +50,7 @@ bool Shader::fillConstBuffer(char* data, int index, int len)
     if (!zB) return 0;
     if (len < 0) len = zB->getElementCount() * zB->getElementLength();
     zB->setData(data);
-    zB->copyData(len);
+    zB->copyToGPU(len);
     return 1;
 }
 
@@ -146,7 +146,7 @@ void DX11PixelShader::useShader()
     {
         if (!constBuffers->z(i)) continue;
         if (!((DX11Buffer*)constBuffers->z(i))->zBuffer())
-            constBuffers->z(i)->copyData();
+            constBuffers->z(i)->copyToGPU();
         ID3D11Buffer* buf = ((DX11Buffer*)constBuffers->z(i))->zBuffer();
         context->PSSetConstantBuffers(i, 1, &buf);
     }
@@ -216,7 +216,7 @@ void DX11VertexShader::useShader()
     {
         if (!constBuffers->z(i)) continue;
         if (!((DX11Buffer*)constBuffers->z(i))->zBuffer())
-            constBuffers->z(i)->copyData();
+            constBuffers->z(i)->copyToGPU();
         ID3D11Buffer* buf = ((DX11Buffer*)constBuffers->z(i))->zBuffer();
         context->VSSetConstantBuffers(i, 1, &buf);
     }

Text.cpp

@@ -1521,7 +1521,7 @@ TextReader::~TextReader()
 // Sets the position of the byte to be read next
 //  pos: The index of the byte
 //  ende: 1 if the index counts from the end of the text. 0 if from the beginning
-void TextReader::setLPosition(__int64 pos, bool ende)
+void TextReader::setReadPosition(__int64 pos, bool ende)
 {
     int l = txt->getLength();
     lPos = ende ? l - pos : pos;
@@ -1565,7 +1565,7 @@ bool TextReader::isEnd() const
 
 // Returns the index of the byte from the text that would be read next
 // return -1 if an error occurred. Otherwise the position of the read pointer
-__int64 TextReader::getLPosition() const
+__int64 TextReader::getReadPosition() const
 {
     return lPos;
 }

Text.h

@@ -585,7 +585,7 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the text. 0 if the
         //! index counts from the beginning of the text
-        DLLEXPORT void setLPosition(__int64 pos, bool ende) override;
+        DLLEXPORT void setReadPosition(__int64 pos, bool ende) override;
         //! Reads from the text
         //! \param bytes An array to be filled with bytes from the text
         //! \param len How many bytes should be read from the text
@@ -599,7 +599,7 @@ namespace Framework
         //! Returns the index of the byte from the text that would be read next
         //! return -1 if an error occurred. Otherwise the position of the read
         //! pointer
-        DLLEXPORT __int64 getLPosition() const override;
+        DLLEXPORT __int64 getReadPosition() const override;
         //! Returns the number of bytes to be read
         DLLEXPORT __int64 getSize() const override;
     };

TextField.cpp

@@ -272,7 +272,7 @@ TextField::~TextField()
 void TextField::doMouseEvent(MouseEvent& me, bool userRet) // Mouse event
 {
     if (!userRet) return;
-    if (hasStyleNot(Style::Editierbar))
+    if (hasStyleNot(Style::Editable))
     {
         int rbr = 0;
         if (border) rbr = border->getRWidth();
@@ -1064,7 +1064,7 @@ void TextField::setSchowChar(unsigned char c) // for password field *
 void TextField::setVScrollToRow(int zeile) // scrolls to line
 {
     if (vertikalScrollBar && tm->renderer && tm->renderer->getEntryCount()
-        && tm->text && hasStyle(Style::Mehrzeilig))
+        && tm->text && hasStyle(Style::Multiline))
     {
         lockDrawable();
         tm->resetIteration();
@@ -1115,7 +1115,7 @@ void TextField::updateVScroll(int pos) // scrolls down
         int sPosZH = 0;
         if (tm->text && tm->renderer)
         {
-            if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
+            if (hasStyleNot(Style::Multiline)) tm->text->remove('\n');
             hi = gr.y;
             if (hasStyle(Style::Border) && border)
                 hi -= border->getRWidth() * 2;
@@ -1183,7 +1183,7 @@ void TextField::updateHScroll(int pos) // scrolls to cursor position
     lockDrawable();
     if (horizontalScrollBar && tm->text && tm->renderer)
     {
-        if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
+        if (hasStyleNot(Style::Multiline)) tm->text->remove('\n');
         int br = gr.x;
         if (hasStyle(Style::Border) && border) br -= border->getRWidth() * 2;
         if (hasStyle(Style::VScroll) && vertikalScrollBar) br -= 15;
@@ -1269,7 +1269,7 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
     getThis();
     if (tak(takParam, this, te))
     {
-        if (hasStyleNot(Style::Editierbar))
+        if (hasStyleNot(Style::Editable))
         {
             release();
             return;
@@ -1310,7 +1310,7 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                 rend = 1;
                 break;
             case T_Enter:
-                if (hasStyle(TextField::Style::Mehrzeilig))
+                if (hasStyle(TextField::Style::Multiline))
                 {
                     if (!tm->getTextStyle(cpos).selected)
                         tm->insertText(cpos, "\n");
@@ -1494,7 +1494,7 @@ void TextField::render(Image& zRObj) // draws to zRObj
         unlockDrawable();
         return;
     }
-    if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
+    if (hasStyleNot(Style::Multiline)) tm->text->remove('\n');
     int tbr = getTextWidth();
     int thi = getTextHeight();
     int xxx = 0;
@@ -1543,7 +1543,7 @@ void TextField::render(Image& zRObj) // draws to zRObj
                 style.selected,
                 style.selectedBackcroundColor);
         if (i - corrector == cpos && tickVal <= 0.5 && hasStyle(Style::Focus)
-            && hasStyle(Style::Editierbar) && tm->zCurrentRenderer())
+            && hasStyle(Style::Editable) && tm->zCurrentRenderer())
             zRObj.drawLineV(
                 oldX, y, tm->zCurrentRenderer()->getRowHeight(), 0xFFFF5555);
         if (i >= realLen || text[i] != tm->text->getText()[i])

TextField.h

@@ -84,7 +84,7 @@ namespace Framework
         public:
             //! If this flag is not set, all line breaks are automatically
             //! removed from the text
-            static const __int64 Mehrzeilig = 0x001000;
+            static const __int64 Multiline = 0x001000;
             //! If this flag is set, the text is placed exactly in the
             //! horizontal center of the field
             static const __int64 HCenter = 0x002000;
@@ -92,7 +92,7 @@ namespace Framework
             //! vertical center of the field
             static const __int64 VCenter = 0x004000;
             //! If this flag is set, the text can be edited by the user
-            static const __int64 Editierbar = 0x2000000;
+            static const __int64 Editable = 0x2000000;
             //! Automatically inserts line breaks during rendering so that the
             //! width of the text field is not exceeded. The text itself is not
             //! modified. Requires Style Mehrzeilig
@@ -103,15 +103,15 @@ namespace Framework
             //! Combines the flags Visible, Allowed, Border,
             //! Buffered, VCenter
             static const __int64 TextField
-                = Visible | Allowed | Border | Buffered | VCenter | Editierbar;
+                = Visible | Allowed | Border | Buffered | VCenter | Editable;
             //! Combines the flags Visible,
             //! Mehrzeilig
-            static const __int64 Text = Visible | Mehrzeilig | Allowed;
+            static const __int64 Text = Visible | Multiline | Allowed;
             //! Combines the flags Visible, Allowed, Border,
             //! Background, Mehrzeilig, VScroll
             static const __int64 TextGebiet = Visible | Allowed | Border
-                                            | Background | Editierbar
-                                            | Mehrzeilig | VScroll;
+                                            | Background | Editable
+                                            | Multiline | VScroll;
             //! Combines the flags VScroll and HScroll
             static const __int64 Scroll = VScroll | HScroll;
         };

UIDialog.cpp

@@ -13,25 +13,25 @@ UIDialog::UIDialog(Font* font)
     addStyle(Window::Style::normal | Window::Style::BodyBackground
              | Window::Style::TitleBackground
              | Window::Style::ClosingBackground);
-    setKBgColor(0xFF000000);
+    setBodyBgColor(0xFF000000);
     setTBgColor(0xFF000000);
-    setSBgColor(0xFF000000);
+    setCloseBgColor(0xFF000000);
     setMouseEvent(_ret1ME);
     setKeyboardEvent(_ret1TE);
-    setRWidth(1);
-    setRColor(0xFFFFFFFF);
+    setBorderWidth(1);
+    setBorderColor(0xFFFFFFFF);
     setTitel("");
     setTFontZ(font);
-    setTSColor(0xFFFFFFFF);
+    setTFontColor(0xFFFFFFFF);
     zTTextField()->setSize(0, 20);
     zTTextField()->addStyle(TextField::Style::Visible | TextField::Style::Center
-                           | TextField::Style::Border);
-    setTRColor(0xFF00FF00);
-    setTRWidth(1);
+                            | TextField::Style::Border);
+    setTBorderColor(0xFF00FF00);
+    setTBorderWidth(1);
     setTAfColor(0x1000FF00);
     setTAfStrength(-15);
-    setSKAfColor(0xFF00FF00);
-    setSKAfStrength(30);
+    setCloseClickAfColor(0xFF00FF00);
+    setCloseClickAfStrength(30);
     setClosingMe([this](void* p, void* o, MouseEvent me) {
         if (me.id == ME_RLeft) removeStyle(Window::Style::Visible);
         return 1;
@@ -53,10 +53,10 @@ void UIDialog::adjustSize()
     }
     setSize(
         max
-        + Point(hasStyle(Window::Style::Border) ? getRWidth() * 2 : 0,
-            (hasStyle(Window::Style::Border) ? getRWidth() * 2 : 0)
+        + Point(hasStyle(Window::Style::Border) ? getBorderWidth() * 2 : 0,
+            (hasStyle(Window::Style::Border) ? getBorderWidth() * 2 : 0)
                 + (hasStyle(Window::Style::Title) ? zTTextField()->getHeight()
-                                                   : 0)));
+                                                  : 0)));
 }
 
 // Adds a drawing to the window

UIInitialization.cpp

@@ -1,20 +1,20 @@
 #include "UIInitialization.h"
 
 #include "Animation.h"
-#include "SelectionBox.h"
-#include "Image.h"
-#include "FileSystem.h"
-#include "Diagram.h"
-#include "Window.h"
-#include "Progress.h"
-#include "Camera2D.h"
 #include "Button.h"
+#include "Camera2D.h"
+#include "Diagram.h"
+#include "FileSystem.h"
+#include "Font.h"
+#include "Image.h"
 #include "List.h"
 #include "M2DPreview.h"
 #include "Model2D.h"
-#include "Font.h"
+#include "Progress.h"
+#include "SelectionBox.h"
 #include "Table.h"
 #include "UIMLView.h"
+#include "Window.h"
 
 using namespace Framework;
 
@@ -24,8 +24,7 @@ SelectionBox* createSelectionBox(const UIInitParam& p)
     ret->setStyle(SelectionBox::Style::Normal);
     ret->setBackgroundColor(0xFF000000);
     ret->setMouseEvent(_ret1ME);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setMaxAuskappHeight(100);
@@ -44,18 +43,17 @@ SelectionList* createSelectionList(const UIInitParam& p)
 {
     SelectionList* ret = new SelectionList();
     ret->setStyle(SelectionList::Style::Normal);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setAlphaFieldColor(0x5500FF00);
     ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setBackgroundColor(0xFF000000);
     ret->setMouseEvent(_ret1ME);
-    ret->setALRWidth(1);
-    ret->setALRColor(0xFF00FF00);
-    ret->setAAFColor(0x0000FF00);
-    ret->setAAFStrength(-8);
+    ret->setSelectionBorderWidth(1);
+    ret->setSelectionBorderColor(0xFF00FF00);
+    ret->setSelectionAFColor(0x0000FF00);
+    ret->setSelectionAFStrength(-8);
     ret->update();
     return ret;
 }
@@ -73,8 +71,7 @@ ProgressBar* createProgressBar(const UIInitParam& p)
 {
     ProgressBar* ret = new ProgressBar();
     ret->setStyle(ProgressBar::Style::normal);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setSColor(0xFFFFFFFF);
     ret->setSSize(12);
     ret->setBorderColor(0xFFFFFFFF);
@@ -107,30 +104,28 @@ Window* createWindow(const UIInitParam& p)
     ret->setMouseEvent(_ret1ME);
     ret->setKeyboardEvent(_ret1TE);
     ret->setStyle(Window::Style::normal);
-    ret->setRWidth(1);
-    ret->setRColor(0xFFFFFFFF);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     ret->setTitel("");
-    if (p.font)
-        ret->setTFontZ(dynamic_cast<Font*>(p.font->getThis()));
-    ret->setTSColor(0xFFFFFFFF);
+    if (p.font) ret->setTFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    ret->setTFontColor(0xFFFFFFFF);
     ret->zTTextField()->setSize(0, 20);
     ret->zTTextField()->addStyle(TextField::Style::Visible
-                                | TextField::Style::Center
-                                | TextField::Style::Border);
-    ret->setTRColor(0xFF00FF00);
-    ret->setTRWidth(1);
+                                 | TextField::Style::Center
+                                 | TextField::Style::Border);
+    ret->setTBorderColor(0xFF00FF00);
+    ret->setTBorderWidth(1);
     ret->setTAfColor(0x1000FF00);
     ret->setTAfStrength(-15);
-    ret->setSKAfColor(0xFF00FF00);
-    ret->setSKAfStrength(30);
+    ret->setCloseClickAfColor(0xFF00FF00);
+    ret->setCloseClickAfStrength(30);
     return ret;
 }
 
 Button* createButton(const UIInitParam& p)
 {
     Button* ret = new Button();
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setStyle(Button::Style::Normal);
     return ret;
 }
@@ -140,8 +135,7 @@ CheckBox* createCheckBox(const UIInitParam& p)
     CheckBox* ret = new CheckBox();
     ret->setMouseEvent(_ret1ME);
     ret->setStyle(CheckBox::Style::Normal);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setSColor(0xFFFFFFFF);
     ret->setSSize(12);
     ret->setAlphaFieldColor(0x5500FF00);
@@ -155,12 +149,11 @@ CheckBox* createCheckBox(const UIInitParam& p)
     return ret;
 }
 
-BarDiagram* createBarDiagram(const UIInitParam& p)
+LineDiagram* createLineDiagram(const UIInitParam& p)
 {
-    BarDiagram* ret = new BarDiagram();
-    ret->setStyle(BarDiagram::Style::normal);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    LineDiagram* ret = new LineDiagram();
+    ret->setStyle(LineDiagram::Style::normal);
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setDataBorderWidth(1);
@@ -195,8 +188,7 @@ TextField* createTextField(const UIInitParam& p)
 {
     TextField* ret = new TextField();
     ret->setStyle(TextField::Style::Text);
-    if (p.font)
-        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    if (p.font) ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setFontColor(0xFFFFFFFF);
     ret->setFontSize(12);
     ret->setAlphaFieldColor(0x5500FF00);
@@ -220,9 +212,9 @@ ObjTable* createObjTable(const UIInitParam& p)
     return ret;
 }
 
-LineDiagram* createLineDiagram(const UIInitParam& p)
+LiveLineDiagram* createLiveLineDiagram(const UIInitParam& p)
 {
-    LineDiagram* ret = new LineDiagram();
+    LiveLineDiagram* ret = new LiveLineDiagram();
     // TODO
     return ret;
 }
@@ -248,7 +240,7 @@ UIInit Framework::defaultUI(Font* zFont, Screen* zScreen)
     uii.createWindow = createWindow;
     uii.createButton = createButton;
     uii.createCheckBox = createCheckBox;
-    uii.createBarDiagram = createBarDiagram;
+    uii.createLiveLineDiagram = createLiveLineDiagram;
     uii.createM2DPreview = createM2DPreview;
     uii.createModel2D = createModel2D;
     uii.createAnimation2D = createAnimation2D;

UIInitialization.h

@@ -14,13 +14,13 @@ namespace Framework
     class Window;
     class Button;
     class CheckBox;
-    class BarDiagram;
+    class LineDiagram;
     class M2DPreview;
     class Model2D;
     class Animation2D;
     class TextField;
     class ObjTable;
-    class LineDiagram;
+    class LiveLineDiagram;
     class UIMLView;
     class Font;
     class Screen;
@@ -43,7 +43,8 @@ namespace Framework
         std::function<Window*(const UIInitParam& p)> createWindow;
         std::function<Button*(const UIInitParam& p)> createButton;
         std::function<CheckBox*(const UIInitParam& p)> createCheckBox;
-        std::function<BarDiagram*(const UIInitParam& p)> createBarDiagram;
+        std::function<LiveLineDiagram*(const UIInitParam& p)>
+            createLiveLineDiagram;
         std::function<M2DPreview*(const UIInitParam& p)> createM2DPreview;
         std::function<Model2D*(const UIInitParam& p)> createModel2D;
         std::function<Animation2D*(const UIInitParam& p)> createAnimation2D;

UIMLView.cpp

@@ -271,7 +271,7 @@ void UIMLElement::layout(XML::Element& element,
     }
     // recursive layout
     pWidth = z.getInnerWidth();
-    pHeight = z.getInnenHeight();
+    pHeight = z.getInnerHeight();
     for (auto i : getChildren(element))
     {
         Drawable* z = 0;
@@ -459,11 +459,11 @@ void UIMLTextField::layout(XML::Element& element,
             element.getAttributeValue("text-align-vertical")
                 .isEqual("center"));
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextField::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editable);
     if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::VScroll,
-            tf->getNeededHeight() > tf->getInnenHeight());
+            tf->getNeededHeight() > tf->getInnerHeight());
         tf->setVerticalClickScroll(tf->getFontSize());
         tf->updateVScroll();
     }
@@ -651,11 +651,11 @@ void UIMLText::layout(XML::Element& element,
             element.getAttributeValue("text-align-vertical")
                 .isEqual("center"));
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextField::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editable);
     if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::VScroll,
-            tf->getNeededHeight() > tf->getInnenHeight());
+            tf->getNeededHeight() > tf->getInnerHeight());
         tf->setVerticalClickScroll(tf->getFontSize());
         tf->updateVScroll();
     }
@@ -716,7 +716,7 @@ void UIMLTextArea::layout(XML::Element& element,
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextField::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editable);
     tf->setText(element.getText());
     tf->zTextRenderer()->formatText(tf->zText(), z.getInnerWidth());
     if (element.hasAttribute("width"))
@@ -752,7 +752,7 @@ void UIMLTextArea::layout(XML::Element& element,
         if (element.getAttributeValue("vScroll").isEqual("auto"))
         {
             tf->setStyle(TextField::Style::VScroll,
-                tf->getNeededHeight() > tf->getInnenHeight());
+                tf->getNeededHeight() > tf->getInnerHeight());
             tf->setVerticalClickScroll(tf->getFontSize());
             tf->updateVScroll();
         }
@@ -1058,7 +1058,7 @@ void UIMLFrame::layout(XML::Element& element,
     if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         f->setStyle(Window::Style::VScroll,
-            f->getNeededChildHeight() > f->getInnenHeight());
+            f->getNeededChildHeight() > f->getInnerHeight());
         f->setVSBScroll(10);
         f->updateVScroll();
     }
@@ -1279,7 +1279,7 @@ void UIMLView::layout()
                 layout(*i.val(),
                     *z,
                     this->getInnerWidth(),
-                    this->getInnenHeight(),
+                    this->getInnerHeight(),
                     *this);
             }
         }

Window.cpp

@@ -362,8 +362,7 @@ NativeWindow::~NativeWindow()
 }
 
 // non-constant
-void NativeWindow::create(
-    int style, WNDCLASS wc) // Creates a window in Windows
+void NativeWindow::create(int style, WNDCLASS wc) // Creates a window in Windows
 {
     if (!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc))
     {
@@ -662,7 +661,7 @@ void NativeWindow::setWindowHandle(HWND hWnd) // sets the operation window
 
 void NativeWindow::setMovable(
     bool movable) // determines whether the window can be
-                       // moved by dragging with the mouse
+                  // moved by dragging with the mouse
 {
     this->movable = movable;
 }
@@ -717,8 +716,7 @@ void NativeWindow::loadBorderWindow(Image* zImage,
                 = (unsigned char)((buffer[i2 + i * zImage->getWidth()] >> 8)
                                   & 0xFF);
             pRow[i2 * 4 + 2]
-                = (unsigned char)((buffer[i2 + i * zImage->getWidth()])
-                                  & 0xFF);
+                = (unsigned char)((buffer[i2 + i * zImage->getWidth()]) & 0xFF);
             pRow[i2 * 4 + 3]
                 = (unsigned char)((buffer[i2 + i * zImage->getWidth()] >> 24)
                                   & 0xFF);
@@ -1157,26 +1155,26 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
             if (minXb) fMinWidth = fMinWidth < min.x ? min.x : fMinWidth;
             if (kMinXb)
                 fMinWidth = fMinWidth < (rbr * 2 + kMin.x + scbr)
-                           ? (rbr * 2 + kMin.x + scbr)
-                           : fMinWidth;
+                              ? (rbr * 2 + kMin.x + scbr)
+                              : fMinWidth;
             int fMinHeight = rbr * 2 + th + schi;
             if (minYb) fMinHeight = fMinHeight < min.y ? min.y : fMinHeight;
             if (kMinYb)
                 fMinHeight = fMinHeight < (rbr * 2 + kMin.y + th + schi)
-                           ? (rbr * 2 + kMin.y + th + schi)
-                           : fMinHeight;
+                               ? (rbr * 2 + kMin.y + th + schi)
+                               : fMinHeight;
             int fMaxWidth = 0;
             if (maxXb) fMaxWidth = max.x;
             if (kMaxXb)
                 fMaxWidth = fMaxWidth < (rbr * 2 + kMax.x + scbr)
-                           ? (rbr * 2 + kMax.x + scbr)
-                           : fMaxWidth;
+                              ? (rbr * 2 + kMax.x + scbr)
+                              : fMaxWidth;
             int fMaxHeight = 0;
             if (maxYb) fMaxHeight = max.y;
             if (kMaxYb)
                 fMaxHeight = fMaxHeight < (rbr * 2 + kMax.y + th + schi)
-                           ? (rbr * 2 + kMax.y + th + schi)
-                           : fMaxHeight;
+                               ? (rbr * 2 + kMax.y + th + schi)
+                               : fMaxHeight;
             minXb |= kMinXb, maxXb |= kMaxXb, minYb |= kMinYb, maxYb |= kMaxYb;
             if (hasStyle(Style::HeightChangeable))
             {
@@ -1390,14 +1388,14 @@ void Window::setBorderZ(Border* ram) // sets the border
     rend = 1;
 }
 
-void Window::setRColor(int f) // sets the border color
+void Window::setBorderColor(int f) // sets the border color
 {
     if (!border) border = new LBorder();
     border->setColor(f);
     rend = 1;
 }
 
-void Window::setRWidth(int br) // sets the border width
+void Window::setBorderWidth(int br) // sets the border width
 {
     if (!border) border = new LBorder();
     border->setBorderWidth(br);
@@ -1441,14 +1439,14 @@ void Window::setTFontZ(Font* font) // sets the title font
     rend = 1;
 }
 
-void Window::setTSColor(int f) // sets the title font color
+void Window::setTFontColor(int f) // sets the title font color
 {
     if (!title) title = new TextField();
     title->setFontColor(f);
     rend = 1;
 }
 
-void Window::setTSSize(int gr) // sets the title font size
+void Window::setTFontSize(int gr) // sets the title font size
 {
     if (!title) title = new TextField();
     title->setFontSize((unsigned char)gr);
@@ -1508,14 +1506,14 @@ void Window::setTBorderZ(Border* ram) // sets the title border
     rend = 1;
 }
 
-void Window::setTRColor(int f) // sets the title border color
+void Window::setTBorderColor(int f) // sets the title border color
 {
     if (!title) title = new TextField();
     title->setBorderColor(f);
     rend = 1;
 }
 
-void Window::setTRWidth(int br) // sets the title border width
+void Window::setTBorderWidth(int br) // sets the title border width
 {
     if (!title) title = new TextField();
     title->setBorderWidth(br);
@@ -1523,14 +1521,14 @@ void Window::setTRWidth(int br) // sets the title border width
 }
 
 // -- Body Background --
-void Window::setKBgColor(int f) // sets the body background color
+void Window::setBodyBgColor(int f) // sets the body background color
 {
     bgBodyColor = f;
     rend = 1;
 }
 
 // -- Body Background Image --
-void Window::setKBgImage(Image* b) // sets the body background image
+void Window::setBodyBgImage(Image* b) // sets the body background image
 {
     if (!bgBodyPicture) bgBodyPicture = new Image();
     bgBodyPicture->newImage(b->getWidth(), b->getHeight(), 0);
@@ -1543,7 +1541,7 @@ void Window::setKBgImage(Image* b) // sets the body background image
     rend = 1;
 }
 
-void Window::setKBgImageZ(Image* b)
+void Window::setBodyBgImageZ(Image* b)
 {
     if (bgBodyPicture) bgBodyPicture->release();
     bgBodyPicture = b;
@@ -1551,21 +1549,22 @@ void Window::setKBgImageZ(Image* b)
 }
 
 // -- Body AlphaField --
-void Window::setKAlphaFieldZ(AlphaField* af) // sets the body AlphaField
+void Window::setBodyAlphaFieldZ(AlphaField* af) // sets the body AlphaField
 {
     if (bodyBuffer) bodyBuffer->release();
     bodyBuffer = af;
     rend = 1;
 }
 
-void Window::setKAfColor(int f) // sets body AlphaField color
+void Window::setBodyAfColor(int f) // sets body AlphaField color
 {
     if (!bodyBuffer) bodyBuffer = new AlphaField();
     bodyBuffer->setColor(f);
     rend = 1;
 }
 
-void Window::setKAfStrength(int st) // sets the strength of the body AlphaField
+void Window::setBodyAfStrength(
+    int st) // sets the strength of the body AlphaField
 {
     if (!bodyBuffer) bodyBuffer = new AlphaField();
     bodyBuffer->setStrength(st);
@@ -1584,14 +1583,14 @@ void Window::setClosingMe(MouseAction closingMe) // sets the close mouse event
 }
 
 // -- Close Background --
-void Window::setSBgColor(int f) // sets the close background color
+void Window::setCloseBgColor(int f) // sets the close background color
 {
     bgClosingColor = f;
     rend = 1;
 }
 
 // -- Close Background Image --
-void Window::setSBgImage(Image* b) // sets the close background image
+void Window::setCloseBgImage(Image* b) // sets the close background image
 {
     if (!bgClosingImage) bgClosingImage = new Image();
     bgClosingImage->newImage(b->getWidth(), b->getHeight(), 0);
@@ -1604,7 +1603,7 @@ void Window::setSBgImage(Image* b) // sets the close background image
     rend = 1;
 }
 
-void Window::setSBgImageZ(Image* b)
+void Window::setCloseBgImageZ(Image* b)
 {
     if (bgClosingImage) bgClosingImage->release();
     bgClosingImage = b;
@@ -1612,21 +1611,22 @@ void Window::setSBgImageZ(Image* b)
 }
 
 // -- Close AlphaField --
-void Window::setSAlphaFieldZ(AlphaField* af) // sets the close AlphaField
+void Window::setCloseAlphaFieldZ(AlphaField* af) // sets the close AlphaField
 {
     if (closeBuffer) closeBuffer->release();
     closeBuffer = af;
     rend = 1;
 }
 
-void Window::setSAfColor(int f) // sets the color of the close AlphaField
+void Window::setCloseAfColor(int f) // sets the color of the close AlphaField
 {
     if (!closeBuffer) closeBuffer = new AlphaField();
     closeBuffer->setColor(f);
     rend = 1;
 }
 
-void Window::setSAfStrength(int st) // sets the strength of the close AlphaField
+void Window::setCloseAfStrength(
+    int st) // sets the strength of the close AlphaField
 {
     if (!closeBuffer) closeBuffer = new AlphaField();
     closeBuffer->setStrength(st);
@@ -1634,21 +1634,23 @@ void Window::setSAfStrength(int st) // sets the strength of the close AlphaField
 }
 
 // -- Close Click AlphaField --
-void Window::setSKAlphaFieldZ(AlphaField* af) // sets the close click AlphaField
+void Window::setCloseClickAlphaFieldZ(
+    AlphaField* af) // sets the close click AlphaField
 {
     if (closeClickBuffer) closeClickBuffer->release();
     closeClickBuffer = af;
     rend = 1;
 }
 
-void Window::setSKAfColor(int f) // sets the color of the close click AlphaField
+void Window::setCloseClickAfColor(
+    int f) // sets the color of the close click AlphaField
 {
     if (!closeClickBuffer) closeClickBuffer = new AlphaField();
     closeClickBuffer->setColor(f);
     rend = 1;
 }
 
-void Window::setSKAfStrength(
+void Window::setCloseClickAfStrength(
     int st) // sets the strength of the close click AlphaField
 {
     if (!closeClickBuffer) closeClickBuffer = new AlphaField();
@@ -1679,24 +1681,24 @@ void Window::setMax(const Point& max)
     this->max = max;
 }
 
-void Window::setKMin(int mx, int my) // sets the minimum body size
+void Window::setBodyMin(int mx, int my) // sets the minimum body size
 {
     kMin.x = mx;
     kMin.y = my;
 }
 
-void Window::setKMin(const Point& min)
+void Window::setBodyMin(const Point& min)
 {
     kMin = min;
 }
 
-void Window::setKMax(int mx, int my) // sets the maximum body size
+void Window::setBodyMax(int mx, int my) // sets the maximum body size
 {
     kMax.x = mx;
     kMax.y = my;
 }
 
-void Window::setKMax(const Point& max)
+void Window::setBodyMax(const Point& max)
 {
     kMax = max;
 }
@@ -1767,7 +1769,7 @@ void Framework::Window::updateVScroll()
 {
     if (vScroll)
     {
-        vScroll->update(getNeededChildHeight(), getInnenHeight());
+        vScroll->update(getNeededChildHeight(), getInnerHeight());
     }
 }
 
@@ -1840,8 +1842,7 @@ void Window::doKeyboardEvent(KeyboardEvent& te)
             }
         }
     }
-    if (ntakc && te.processed && nTak)
-        te.processed = nTak(ntakParam, this, te);
+    if (ntakc && te.processed && nTak) te.processed = nTak(ntakParam, this, te);
 }
 
 // -- Render --
@@ -1868,12 +1869,12 @@ void Window::render(Image& zRObj) // draws to zRObj
             title->setStyle(TextField::Style::Visible, hasStyle(Style::Title));
         if (hasStyle(Style::Title) && title)
         {
-            title->setStyle(TextField::Style::Background,
-                hasStyle(Style::TitleBackground));
             title->setStyle(
-                TextField::Style::HAlpha, hasStyle(Style::TitleHAlpha));
+                TextField::Style::Background, hasStyle(Style::TitleBackground));
+            title->setStyle(
+                TextField::Style::BAlpha, hasStyle(Style::TitleBAlpha));
             title->setStyle(
-                TextField::Style::HImage, hasStyle(Style::TitleHImage));
+                TextField::Style::BImage, hasStyle(Style::TitleBImage));
             title->setStyle(
                 TextField::Style::Buffered, hasStyle(Style::TitleBuffered));
             th = title->getHeight();
@@ -1889,15 +1890,15 @@ void Window::render(Image& zRObj) // draws to zRObj
                 sbr = th;
                 if (hasStyle(Style::ClosingBackground))
                 {
-                    if (hasStyle(Style::ClosingHAlpha))
+                    if (hasStyle(Style::ClosingBAlpha))
                         zRObj.alphaRegion(
                             gr.x - th - rbr * 2, 0, th, th, bgClosingColor);
                     else
                         zRObj.fillRegion(
                             gr.x - th - rbr * 2, 0, th, th, bgClosingColor);
-                    if (hasStyle(Style::ClosingHImage) && bgClosingImage)
+                    if (hasStyle(Style::ClosingBImage) && bgClosingImage)
                     {
-                        if (hasStyle(Style::ClosingHAlpha))
+                        if (hasStyle(Style::ClosingBAlpha))
                             zRObj.alphaImage(gr.x - th - rbr * 2,
                                 0,
                                 th,
@@ -1911,7 +1912,7 @@ void Window::render(Image& zRObj) // draws to zRObj
                                 *bgClosingImage);
                     }
                 }
-                if (!hasStyle(Style::ClosingHImage) || !bgClosingImage)
+                if (!hasStyle(Style::ClosingBImage) || !bgClosingImage)
                 {
                     zRObj.drawLine(Point(gr.x - th - rbr * 2, 0),
                         Point(gr.x - rbr * 2, th),
@@ -1965,13 +1966,13 @@ void Window::render(Image& zRObj) // draws to zRObj
         }
         if (hasStyle(Style::BodyBackground))
         {
-            if (hasStyle(Style::BodyHAlpha))
+            if (hasStyle(Style::BodyBAlpha))
                 zRObj.alphaRegion(0, 0, br, hi, bgBodyColor);
             else
                 zRObj.fillRegion(0, 0, br, hi, bgBodyColor);
-            if (hasStyle(Style::BodyHImage) && bgBodyPicture)
+            if (hasStyle(Style::BodyBImage) && bgBodyPicture)
             {
-                if (hasStyle(Style::BodyHAlpha))
+                if (hasStyle(Style::BodyBAlpha))
                     zRObj.alphaImage(0, 0, br, hi, *bgBodyPicture);
                 else
                     zRObj.drawImage(0, 0, br, hi, *bgBodyPicture);
@@ -2004,15 +2005,15 @@ void Window::render(Image& zRObj) // draws to zRObj
 // Returns the width of the interior area of the drawing in pixels
 int Window::getInnerWidth() const
 {
-    return getWidth() - 2 * getRWidth();
+    return getWidth() - 2 * getBorderWidth();
 }
 
 // Returns the height of the interior area of the drawing in pixels
-int Window::getInnenHeight() const
+int Window::getInnerHeight() const
 {
     int th = 0;
     if (hasStyle(Style::Title) && title) th += title->getHeight();
-    return getHeight() - 2 * getRWidth() - th;
+    return getHeight() - 2 * getBorderWidth() - th;
 }
 
 // -- Border --
@@ -2027,13 +2028,13 @@ Border* Window::zBorder() const
     return border;
 }
 
-int Window::getRColor() const // returns the border color
+int Window::getBorderColor() const // returns the border color
 {
     if (!border) return 0;
     return border->getColor();
 }
 
-int Window::getRWidth() const // returns the border width
+int Window::getBorderWidth() const // returns the border width
 {
     if (!border || hasStyleNot(Style::Border)) return 0;
     return border->getRWidth();
@@ -2076,13 +2077,13 @@ Font* Window::zTFont() const
     return title->zFont();
 }
 
-int Window::getTSColor() const // returns the title font color
+int Window::getTFontColor() const // returns the title font color
 {
     if (!title) return 0;
     return title->getFontColor();
 }
 
-int Window::getTSSize() const // returns the title font size
+int Window::getTFontSize() const // returns the title font size
 {
     if (!title) return 0;
     return title->getFontSize();
@@ -2147,97 +2148,98 @@ Border* Window::zTBorder() const
     return title->zBorder();
 }
 
-int Window::getTRColor() const // returns the title border color
+int Window::getTBorderColor() const // returns the title border color
 {
     if (!title) return 0;
     return title->getBorderColor();
 }
 
-int Window::getTRWidth() const // returns the title border width
+int Window::getTBorderWidth() const // returns the title border width
 {
     if (!title) return 0;
     return title->getBorderWidth();
 }
 
 // -- Body Background --
-int Window::getKBgColor() const // returns the body background color
+int Window::getBodyBgColor() const // returns the body background color
 {
     return bgBodyColor;
 }
 
 // -- Body Background Image --
-Image* Window::getKBgImage() const // returns the body background image
+Image* Window::getBodyBgImage() const // returns the body background image
 {
     if (!bgBodyPicture) return 0;
     return dynamic_cast<Image*>(bgBodyPicture->getThis());
 }
 
-Image* Window::zKBgImage() const
+Image* Window::zBodyBgImage() const
 {
     return bgBodyPicture;
 }
 
 // -- Body AlphaField --
-AlphaField* Window::getKAlphaField() const // returns the body AlphaField
+AlphaField* Window::getBodyAlphaField() const // returns the body AlphaField
 {
     if (!bodyBuffer) return 0;
     return dynamic_cast<AlphaField*>(bodyBuffer->getThis());
 }
 
-AlphaField* Window::zKAlphaField() const
+AlphaField* Window::zBodyAlphaField() const
 {
     return bodyBuffer;
 }
 
-int Window::getKAfColor() const // returns the body AlphaField color
+int Window::getBodyAfColor() const // returns the body AlphaField color
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getColor();
 }
 
-int Window::getKAfStrength() const // returns the strength of the body AlphaField
+int Window::getBodyAfStrength()
+    const // returns the strength of the body AlphaField
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getStrength();
 }
 
 // -- Close Background --
-int Window::getSBgColor() const // returns the close background color
+int Window::getCloseBgColor() const // returns the close background color
 {
     return bgClosingColor;
 }
 
 // -- Close Background Image --
-Image* Window::getSBgImage() const // returns the close background image
+Image* Window::getCloseBgImage() const // returns the close background image
 {
     if (!bgClosingImage) return 0;
     return dynamic_cast<Image*>(bgClosingImage->getThis());
 }
 
-Image* Window::zSBgImage() const
+Image* Window::zCloseBgImage() const
 {
     return bgClosingImage;
 }
 
 // -- Close AlphaField --
-AlphaField* Window::getSAlphaField() const // returns the close AlphaField
+AlphaField* Window::getCloseAlphaField() const // returns the close AlphaField
 {
     if (!closeBuffer) return 0;
     return dynamic_cast<AlphaField*>(closeBuffer->getThis());
 }
 
-AlphaField* Window::zSAlphaField() const
+AlphaField* Window::zCloseAlphaField() const
 {
     return closeBuffer;
 }
 
-int Window::getSAfColor() const // returns the close AlphaField color
+int Window::getCloseAfColor() const // returns the close AlphaField color
 {
     if (!closeBuffer) return 0;
     return closeBuffer->getColor();
 }
 
-int Window::getSAfStrength()
+int Window::getCloseAfStrength()
     const // returns the strength of the close AlphaField
 {
     if (!closeBuffer) return 0;
@@ -2245,24 +2247,26 @@ int Window::getSAfStrength()
 }
 
 // -- Close Click AlphaField --
-AlphaField* Window::getSKAlphaField() const // returns the close click AlphaField
+AlphaField*
+Window::getCloseClickAlphaField() const // returns the close click AlphaField
 {
     if (!closeClickBuffer) return 0;
     return dynamic_cast<AlphaField*>(closeClickBuffer->getThis());
 }
 
-AlphaField* Window::zSKAlphaField() const
+AlphaField* Window::zCloseClickAlphaField() const
 {
     return closeClickBuffer;
 }
 
-int Window::getSKAfColor() const // returns the close click AlphaField color
+int Window::getCloseClickAfColor()
+    const // returns the close click AlphaField color
 {
     if (!closeClickBuffer) return 0;
     return closeClickBuffer->getColor();
 }
 
-int Window::getSKAfStrength()
+int Window::getCloseClickAfStrength()
     const // returns the strength of the close click AlphaField
 {
     if (!closeClickBuffer) return 0;
@@ -2280,12 +2284,12 @@ const Point& Window::getMax() const // returns the maximum window size
     return max;
 }
 
-const Point& Window::getKMin() const // returns the minimum body size
+const Point& Window::getBodyMin() const // returns the minimum body size
 {
     return kMin;
 }
 
-const Point& Window::getKMax() const // returns the maximum body size
+const Point& Window::getBodyMax() const // returns the maximum body size
 {
     return kMax;
 }
@@ -2355,30 +2359,30 @@ Drawable* Window::duplicate() const // Creates a copy of the window
     ret->setClosingMe(closingMe);
     if (border)
     {
-        ret->setRWidth(border->getRWidth());
-        ret->setRColor(border->getColor());
+        ret->setBorderWidth(border->getRWidth());
+        ret->setBorderColor(border->getColor());
     }
     if (title) ret->setTTextFieldZ((TextField*)title->duplicate());
-    ret->setKBgColor(bgBodyColor);
+    ret->setBodyBgColor(bgBodyColor);
     if (bgBodyPicture)
-        ret->setKBgImage(dynamic_cast<Image*>(bgBodyPicture->getThis()));
+        ret->setBodyBgImage(dynamic_cast<Image*>(bgBodyPicture->getThis()));
     if (bodyBuffer)
     {
-        ret->setKAfColor(bodyBuffer->getColor());
-        ret->setKAfStrength(bodyBuffer->getStrength());
+        ret->setBodyAfColor(bodyBuffer->getColor());
+        ret->setBodyAfStrength(bodyBuffer->getStrength());
     }
-    ret->setSBgColor(bgClosingColor);
+    ret->setCloseBgColor(bgClosingColor);
     if (bgClosingImage)
-        ret->setSBgImage(dynamic_cast<Image*>(bgClosingImage->getThis()));
+        ret->setCloseBgImage(dynamic_cast<Image*>(bgClosingImage->getThis()));
     if (closeBuffer)
     {
-        ret->setSAfColor(closeBuffer->getColor());
-        ret->setSAfStrength(closeBuffer->getStrength());
+        ret->setCloseAfColor(closeBuffer->getColor());
+        ret->setCloseAfStrength(closeBuffer->getStrength());
     }
     if (closeClickBuffer)
     {
-        ret->setSKAfColor(closeClickBuffer->getColor());
-        ret->setSKAfStrength(closeClickBuffer->getStrength());
+        ret->setCloseClickAfColor(closeClickBuffer->getColor());
+        ret->setCloseClickAfStrength(closeClickBuffer->getStrength());
     }
     if (vScroll)
     {
@@ -2392,7 +2396,7 @@ Drawable* Window::duplicate() const // Creates a copy of the window
     }
     ret->setMin(min);
     ret->setMax(max);
-    ret->setKMin(kMin);
-    ret->setKMax(kMax);
+    ret->setBodyMin(kMin);
+    ret->setBodyMax(kMax);
     return ret;
 }

Window.h

@@ -6,18 +6,18 @@
 
 namespace Framework
 {
-    class VScrollBar;    //! Scroll.h
-    class HScrollBar;    //! Scroll.h
-    class TextField;      //! TextField.h
-    class Border;        //! Border.h
-    class Screen;    //! Screen.h
-    class AlphaField;     //! AlphaField.h
-    class Font;       //! Font.h
-    class Text;          //! Text.h
-    class Image;          //! Image.h
+    class VScrollBar;        //! Scroll.h
+    class HScrollBar;        //! Scroll.h
+    class TextField;         //! TextField.h
+    class Border;            //! Border.h
+    class Screen;            //! Screen.h
+    class AlphaField;        //! AlphaField.h
+    class Font;              //! Font.h
+    class Text;              //! Text.h
+    class Image;             //! Image.h
     class NativeWindow;      //! from this file
     class NativeWindowArray; //! from this file
-    class Window;       //! from this file
+    class Window;            //! from this file
 #ifdef WIN32
     //! Creates a normal window class of the Windows API
     //! \param hInst The HINSTANCE of the program (passed by the Framework to
@@ -171,8 +171,7 @@ namespace Framework
         //! \param hins The HINSTANCE of the program (passed by the Framework to
         //! the start function in the Startparam structure)
         DLLEXPORT void loadBorderWindow(Image* zImage,
-            HINSTANCE
-                hinst); //! sets a transparent frame around the window
+            HINSTANCE hinst); //! sets a transparent frame around the window
         //! Returns the handle of the managed window
         DLLEXPORT HWND getWindowHandle() const;
         //! Returns the position of the window in pixels
@@ -270,9 +269,9 @@ namespace Framework
             static const __int64 BodyBackground = 0x000000008;
             //! Determines whether alpha blending is used when drawing
             //! the body background
-            static const __int64 BodyHAlpha = 0x000000010;
+            static const __int64 BodyBAlpha = 0x000000010;
             //! Determines whether an image is used as the body background
-            static const __int64 BodyHImage = 0x000000020;
+            static const __int64 BodyBImage = 0x000000020;
             //! Determines whether the body has a color gradient
             static const __int64 BodyBuffered = 0x000000040;
             //! Determines whether the window has a title bar
@@ -281,9 +280,9 @@ namespace Framework
             static const __int64 TitleBackground = 0x000000100;
             //! Determines whether alpha blending is used when drawing
             //! the title background
-            static const __int64 TitleHAlpha = 0x000000200;
+            static const __int64 TitleBAlpha = 0x000000200;
             //! Determines whether an image is used for the title background
-            static const __int64 TitleHImage = 0x000000400;
+            static const __int64 TitleBImage = 0x000000400;
             //! Determines whether the title bar has a color gradient
             static const __int64 TitleBuffered = 0x000000800;
             //! Determines whether a close button is displayed in the title bar
@@ -292,9 +291,10 @@ namespace Framework
             static const __int64 ClosingBackground = 0x000002000;
             //! Determines whether alpha blending is used when drawing
             //! the close button background
-            static const __int64 ClosingHAlpha = 0x000004000;
-            //! Determines whether an image is used for the close button background
-            static const __int64 ClosingHImage = 0x000008000;
+            static const __int64 ClosingBAlpha = 0x000004000;
+            //! Determines whether an image is used for the close button
+            //! background
+            static const __int64 ClosingBImage = 0x000008000;
             //! Determines whether the close button has a color gradient
             static const __int64 ClosingBuffer = 0x000010000;
             //! Determines whether the close button has a color gradient
@@ -304,13 +304,16 @@ namespace Framework
             //! the left mouse button in the title bar
             static const __int64 Movable = 0x000040000;
             //! Determines whether the user can change the width of the window
-            //! by holding the left mouse button on the right or left window edge
+            //! by holding the left mouse button on the right or left window
+            //! edge
             static const __int64 WidthChangeable = 0x000080000;
             //! Determines whether the user can change the height of the window
-            //! by holding the left mouse button on the top or bottom window edge
+            //! by holding the left mouse button on the top or bottom window
+            //! edge
             static const __int64 HeightChangeable = 0x000100000;
             //! Determines whether the user can change the title bar height
-            //! by holding the left mouse button on the bottom edge of the title bar
+            //! by holding the left mouse button on the bottom edge of the title
+            //! bar
             static const __int64 TitleHeightChangeable = 0x000200000;
             //! Determines whether there is a minimum window width
             static const __int64 MinWidth = 0x000400000;
@@ -353,7 +356,8 @@ namespace Framework
             //! should remain unchanged
             static const __int64 CustomTitle = 0x4000000000;
             //! Combines flags MinHeight, MaxHeight, MaxWidth, MaxHeight
-            static const __int64 min_max = MinHeight | MaxHeight | MaxWidth | MaxHeight;
+            static const __int64 min_max
+                = MinHeight | MaxHeight | MaxWidth | MaxHeight;
             //! Combines flags BodyMinWidth, BodyMaxWidth, BodyMinHeight,
             //! BodyMaxWidth
             static const __int64 body_min_max
@@ -362,16 +366,16 @@ namespace Framework
             static const __int64 scroll = VScroll | HScroll;
             //! Combines flags TitleHeightChangeable, HeightChangeable,
             //! WidthChangeable, Movable
-            static const __int64 nichtfixiert = TitleHeightChangeable
-                                              | HeightChangeable
-                                              | WidthChangeable | Movable;
+            static const __int64 notFixed = TitleHeightChangeable
+                                          | HeightChangeable | WidthChangeable
+                                          | Movable;
 
             //! Combines flags Visible, Enabled, Border, Title,
             //! TitleBuffered, Closable, ClosingImage, ClosingClickBuffer,
             //! Movable
             static const __int64 normal
                 = Visible | Allowed | Border | Title | TitleBuffered | Closable
-                | ClosingHImage | ClosingClickBuffer | Movable
+                | ClosingBImage | ClosingClickBuffer | Movable
                 | MEIgnoreProcessed | MEIgnoreVisible | MEIgnoreParentInside
                 | MEIgnoreInside;
         };
@@ -412,10 +416,10 @@ namespace Framework
         DLLEXPORT void setBorderZ(Border* ram);
         //! Sets the color of the window border
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setRColor(int f);
+        DLLEXPORT void setBorderColor(int f);
         //! Sets the width of the window border
         //! \param br The width in pixels
-        DLLEXPORT void setRWidth(int br);
+        DLLEXPORT void setBorderWidth(int br);
         //! Sets the title of the window
         //! \param txt The text
         DLLEXPORT void setTitel(Text* txt);
@@ -433,10 +437,10 @@ namespace Framework
         DLLEXPORT void setTFontZ(Font* font);
         //! Sets the color of the font used for the title
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setTSColor(int f);
+        DLLEXPORT void setTFontColor(int f);
         //! Sets the size of the font used for the title
         //! \param gr The height of a line in pixels
-        DLLEXPORT void setTSSize(int gr);
+        DLLEXPORT void setTFontSize(int gr);
         //! Sets the background color of the title
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setTBgColor(int f);
@@ -460,28 +464,28 @@ namespace Framework
         DLLEXPORT void setTBorderZ(Border* ram);
         //! Sets the color of the border of the title
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setTRColor(int f);
+        DLLEXPORT void setTBorderColor(int f);
         //! Sets the width of the border of the title
         //! \param br The width in pixels
-        DLLEXPORT void setTRWidth(int br);
+        DLLEXPORT void setTBorderWidth(int br);
         //! Sets the background color of the body
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKBgColor(int f);
+        DLLEXPORT void setBodyBgColor(int f);
         //! Sets the background image of the body by copying
         //! \param b The image to copy
-        DLLEXPORT void setKBgImage(Image* b);
+        DLLEXPORT void setBodyBgImage(Image* b);
         //! Sets a pointer to the background image of the body
         //! \param b The image
-        DLLEXPORT void setKBgImageZ(Image* b);
+        DLLEXPORT void setBodyBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the body
         //! \param af The color gradient
-        DLLEXPORT void setKAlphaFieldZ(AlphaField* af);
+        DLLEXPORT void setBodyAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient of the body
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKAfColor(int f);
+        DLLEXPORT void setBodyAfColor(int f);
         //! Sets the strength of the color gradient of the body
         //! \param st The strength
-        DLLEXPORT void setKAfStrength(int st);
+        DLLEXPORT void setBodyAfStrength(int st);
         //! Sets the parameter of the callback function called when the close
         //! button receives a mouse event \param param The parameter
         DLLEXPORT void setClosingMeParam(void* param);
@@ -494,31 +498,31 @@ namespace Framework
         DLLEXPORT void setClosingMe(MouseAction closingMe);
         //! Sets the background color of the close button
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSBgColor(int f);
+        DLLEXPORT void setCloseBgColor(int f);
         //! Sets the background image of the close button by copying
         //! \param b The image to copy
-        DLLEXPORT void setSBgImage(Image* b);
+        DLLEXPORT void setCloseBgImage(Image* b);
         //! Sets a pointer to the background image of the close button
         //! \param b The image
-        DLLEXPORT void setSBgImageZ(Image* b);
+        DLLEXPORT void setCloseBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the close button
         //! \param af The color gradient
-        DLLEXPORT void setSAlphaFieldZ(AlphaField* af);
+        DLLEXPORT void setCloseAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient of the close button
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSAfColor(int f);
+        DLLEXPORT void setCloseAfColor(int f);
         //! Sets the strength of the color gradient of the close button
         //! \param st The strength
-        DLLEXPORT void setSAfStrength(int st);
+        DLLEXPORT void setCloseAfStrength(int st);
         //! Sets a pointer to the color gradient used when clicking the
         //! close button \param af The color gradient
-        DLLEXPORT void setSKAlphaFieldZ(AlphaField* af);
+        DLLEXPORT void setCloseClickAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient used when clicking the
         //! close button \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSKAfColor(int f);
+        DLLEXPORT void setCloseClickAfColor(int f);
         //! Sets the strength of the color gradient used when clicking the
         //! close button \param st The strength
-        DLLEXPORT void setSKAfStrength(int st);
+        DLLEXPORT void setCloseClickAfStrength(int st);
         //! Sets the minimum size of the window
         //! \param mx The minimum width in pixels
         //! \param my The minimum height in pixels
@@ -536,17 +540,17 @@ namespace Framework
         //! Sets the minimum size of the window body
         //! \param mx The minimum width in pixels
         //! \param my The minimum height in pixels
-        DLLEXPORT void setKMin(int mx, int my);
+        DLLEXPORT void setBodyMin(int mx, int my);
         //! Sets the minimum size of the window body
         //! \param min The minimum width and height in pixels
-        DLLEXPORT void setKMin(const Point& min);
+        DLLEXPORT void setBodyMin(const Point& min);
         //! Sets the maximum size of the window body
         //! \param mx The maximum width in pixels
         //! \param my The maximum height in pixels
-        DLLEXPORT void setKMax(int mx, int my);
+        DLLEXPORT void setBodyMax(int mx, int my);
         //! Sets the maximum size of the window body
         //! \param min The maximum width and height in pixels
-        DLLEXPORT void setKMax(const Point& max);
+        DLLEXPORT void setBodyMax(const Point& max);
         //! Sets a pointer to the scrollbar at the bottom of the window
         //! \param hScroll The scrollbar
         DLLEXPORT void setHScrollBarZ(HScrollBar* hScroll);
@@ -560,7 +564,8 @@ namespace Framework
         //! \param max The height in pixels
         DLLEXPORT void setVSBMax(int max);
         //! Scrolls to a specific x position in the window body
-        //! \param scroll The number of pixels the content should be shifted left
+        //! \param scroll The number of pixels the content should be shifted
+        //! left
         DLLEXPORT void setHSBScroll(int scroll);
         //! Scrolls to a specific y position in the window body
         //! \param scroll The number of pixels the content should be shifted up
@@ -596,15 +601,15 @@ namespace Framework
         //! Returns the inner width of the drawing in pixels
         DLLEXPORT int getInnerWidth() const override;
         //! Returns the inner height of the drawing in pixels
-        DLLEXPORT int getInnenHeight() const override;
+        DLLEXPORT int getInnerHeight() const override;
         //! Returns the border of the window
         DLLEXPORT Border* getBorder() const;
         //! Returns the border of the window without increased reference counter
         DLLEXPORT Border* zBorder() const;
         //! Returns the color of the window border in A8R8G8B8 format
-        DLLEXPORT int getRColor() const;
+        DLLEXPORT int getBorderColor() const;
         //! Returns the width of the window border in pixels
-        DLLEXPORT int getRWidth() const;
+        DLLEXPORT int getBorderWidth() const;
         //! Returns the title of the window
         DLLEXPORT Text* getTitel() const;
         //! Returns the title of the window without increased reference counter
@@ -616,84 +621,91 @@ namespace Framework
         DLLEXPORT TextField* zTTextField() const;
         //! Returns the font used for the title
         DLLEXPORT Font* getTFont() const;
-        //! Returns the font without increased reference counter used for the title
+        //! Returns the font without increased reference counter used for the
+        //! title
         DLLEXPORT Font* zTFont() const;
         //! Returns the font color of the title in A8R8G8B8 format
-        DLLEXPORT int getTSColor() const;
+        DLLEXPORT int getTFontColor() const;
         //! Returns the height of a line of the title in pixels
-        DLLEXPORT int getTSSize() const;
+        DLLEXPORT int getTFontSize() const;
         //! Returns the background color of the title in A8R8G8B8 format
         DLLEXPORT int getTBgColor() const;
         //! Returns the color gradient of the title
         DLLEXPORT AlphaField* getTAlphaField() const;
-        //! Returns the color gradient of the title without increased reference counter
+        //! Returns the color gradient of the title without increased reference
+        //! counter
         DLLEXPORT AlphaField* zTAlphaField() const;
-        //! Returns the color of the color gradient of the title in A8R8G8B8 format
+        //! Returns the color of the color gradient of the title in A8R8G8B8
+        //! format
         DLLEXPORT int getTAfColor() const;
         //! Returns the strength of the color gradient of the title
         DLLEXPORT int getTAfStrength() const;
         //! Returns the background image of the title
         DLLEXPORT Image* getTBgImage() const;
-        //! Returns the background image of the title without increased reference counter
+        //! Returns the background image of the title without increased
+        //! reference counter
         DLLEXPORT Image* zTBgImage() const;
         //! Returns the border of the title
         DLLEXPORT Border* getTBorder() const;
         //! Returns the border of the title without increased reference counter
         DLLEXPORT Border* zTBorder() const;
         //! Returns the color of the title border in A8R8G8B8 format
-        DLLEXPORT int getTRColor() const;
+        DLLEXPORT int getTBorderColor() const;
         //! Returns the width of the title border
-        DLLEXPORT int getTRWidth() const;
+        DLLEXPORT int getTBorderWidth() const;
         //! Returns the background color of the body
-        DLLEXPORT int getKBgColor() const;
+        DLLEXPORT int getBodyBgColor() const;
         //! Returns the background image of the body
-        DLLEXPORT Image* getKBgImage() const;
-        //! Returns the background image of the body without increased reference counter
-        DLLEXPORT Image* zKBgImage() const;
+        DLLEXPORT Image* getBodyBgImage() const;
+        //! Returns the background image of the body without increased reference
+        //! counter
+        DLLEXPORT Image* zBodyBgImage() const;
         //! Returns the color gradient of the body
-        DLLEXPORT AlphaField* getKAlphaField() const;
-        //! Returns the color gradient of the body without increased reference counter
-        DLLEXPORT AlphaField* zKAlphaField() const;
-        //! Returns the color of the color gradient of the body in A8R8G8B8 format
-        DLLEXPORT int getKAfColor() const;
+        DLLEXPORT AlphaField* getBodyAlphaField() const;
+        //! Returns the color gradient of the body without increased reference
+        //! counter
+        DLLEXPORT AlphaField* zBodyAlphaField() const;
+        //! Returns the color of the color gradient of the body in A8R8G8B8
+        //! format
+        DLLEXPORT int getBodyAfColor() const;
         //! Returns the strength of the color gradient of the body
-        DLLEXPORT int getKAfStrength() const;
+        DLLEXPORT int getBodyAfStrength() const;
         //! Returns the background color of the close button in A8R8G8B8 format
-        DLLEXPORT int getSBgColor() const;
+        DLLEXPORT int getCloseBgColor() const;
         //! Returns the background image of the close button
-        DLLEXPORT Image* getSBgImage() const;
+        DLLEXPORT Image* getCloseBgImage() const;
         //! Returns the background image of the close button without increased
         //! reference counter
-        DLLEXPORT Image* zSBgImage() const;
+        DLLEXPORT Image* zCloseBgImage() const;
         //! Returns the color gradient of the close button
-        DLLEXPORT AlphaField* getSAlphaField() const;
+        DLLEXPORT AlphaField* getCloseAlphaField() const;
         //! Returns the color gradient of the close button without increased
         //! reference counter
-        DLLEXPORT AlphaField* zSAlphaField() const;
+        DLLEXPORT AlphaField* zCloseAlphaField() const;
         //! Returns the color of the color gradient of the close button in
         //! A8R8G8B8 format
-        DLLEXPORT int getSAfColor() const;
+        DLLEXPORT int getCloseAfColor() const;
         //! Returns the strength of the color gradient of the close button
-        DLLEXPORT int getSAfStrength() const;
+        DLLEXPORT int getCloseAfStrength() const;
         //! Returns the color gradient used when the close button is pressed
-        DLLEXPORT AlphaField* getSKAlphaField() const;
+        DLLEXPORT AlphaField* getCloseClickAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used when the close button is pressed
-        DLLEXPORT AlphaField* zSKAlphaField() const;
+        DLLEXPORT AlphaField* zCloseClickAlphaField() const;
         //! Returns the color of the color gradient in A8R8G8B8 format
         //! used when the close button is pressed
-        DLLEXPORT int getSKAfColor() const;
+        DLLEXPORT int getCloseClickAfColor() const;
         //! Returns the strength of the color gradient used when the close
         //! button is pressed
-        DLLEXPORT int getSKAfStrength() const;
+        DLLEXPORT int getCloseClickAfStrength() const;
         //! Returns the minimum window size in pixels
         DLLEXPORT const Point& getMin() const;
         //! Returns the maximum window size in pixels
         DLLEXPORT const Point& getMax() const;
         //! Returns the minimum body size in pixels
-        DLLEXPORT const Point& getKMin() const;
+        DLLEXPORT const Point& getBodyMin() const;
         //! Returns the maximum body size in pixels
-        DLLEXPORT const Point& getKMax() const;
+        DLLEXPORT const Point& getBodyMax() const;
         //! Returns the scrollbar from the right window edge
         DLLEXPORT VScrollBar* getVScrollBar() const;
         //! Returns the scrollbar from the right window edge without increased

World3D.cpp

@@ -242,10 +242,10 @@ void Framework::World3D::copyLight(DXBuffer* zDiffuse, DXBuffer* zPoints) const
 {
     zDiffuse->setData(diffuseLights);
     zDiffuse->setLength(diffuseLightCount * (int)sizeof(DiffuseLight));
-    zDiffuse->copyData();
+    zDiffuse->copyToGPU();
     zPoints->setData(pointLights);
     zPoints->setLength(pointLightCount * (int)sizeof(PointLight));
-    zPoints->copyData();
+    zPoints->copyToGPU();
 }
 
 //! adds a new diffuse light source

Writer.h

@@ -28,10 +28,10 @@ namespace Framework
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if
         //! the index counts from the beginning of the resource
-        virtual void setSPosition(__int64 pos, bool ende) = 0;
+        virtual void setWritePosition(__int64 pos, bool ende) = 0;
         //! Returns the index of the byte from the resource that would be written next
         //! return -1 if an error occurred. Otherwise the position of the write pointer
-        virtual __int64 getSPosition() const = 0;
+        virtual __int64 getWritePosition() const = 0;
         //! Returns the number of bytes to be written
         virtual __int64 getSize() const = 0;
     };