Version 1.0.13 New StyleFramework

edwig · Jul 16, 2022 · 31be76a · 31be76a
1 parent 1cd2afc
commit 31be76a
Show file tree

Hide file tree

Showing 59 changed files with 1,344 additions and 265 deletions.
diff --git a/Documentation/Releasenotes.txt b/Documentation/Releasenotes.txt
@@ -1,6 +1,12 @@
 KWATTA RELEASNOTES
 ==================
 
+Version 1.0.13 Release date: 16-07-2022
+---------------------------------------
+1) Upgraded to new version of the StyleFramework, fixing many bugs
+   e.g. No erasure in non-mutable fields with DEL/DELETE keys
+2) Support for OData 4.00 batches and Concept-ID of batches
+
 Version 1.0.10 Release date: 03-05-2022
 ---------------------------------------
 1) Added the SQL test type. Add your SQL tests!!

diff --git a/Installer/kwatta.nsi b/Installer/kwatta.nsi
@@ -6,12 +6,12 @@
 ; Copyright (c) 2021 ir. W.E. Huisman
 ; All rights reserved
 ;
-; Last change:       3-05-2022
-; Versionnumber:     1.0.11
+; Last change:       16-07-2022
+; Versionnumber:     1.0.13
 ;-------------------------------------------------------
  !define PRODUCT_NAME                         "Kwatta"
- !define PRODUCT_VERSION                      "1.0.11"
- !define PRODUCT_BUILDNUMBER                  "132"
+ !define PRODUCT_VERSION                      "1.0.13"
+ !define PRODUCT_BUILDNUMBER                  "138"
  !define PRODUCT_PUBLISHER                    "EDO"
  !define PRODUCT_WEB_SITE                     "https://github.com/edwig/kwatta"
  !define PRODUCT_DIR_REGKEY                   "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"

diff --git a/Kwatta/KwattaAppDlg.cpp b/Kwatta/KwattaAppDlg.cpp
@@ -43,6 +43,8 @@ static char THIS_FILE[] = __FILE__;
 #define new DEBUG_NEW
 #endif
 
+using namespace ThemeColor;
+
 IMPLEMENT_DYNAMIC(KwattaAppDlg, StyleDialog)
 
 KwattaAppDlg::KwattaAppDlg(CWnd* p_parent,CString p_suiteFilename)
@@ -108,7 +110,7 @@ KwattaAppDlg::DoDataExchange(CDataExchange* pDX)
 
   }
   m_editTestsuite.SetMutable(m_testsuite.IsEmpty());
-  m_editTestsuite.SetBkColor(m_testsuite.IsEmpty() ? ClrEditBkgnd : ThemeColor::_Color2);
+  m_editTestsuite.SetBkColor(m_testsuite.IsEmpty() ? ClrEditBkgnd : ThemeColor::GetColor(Colors::AccentColor2));
 }
 
 BEGIN_MESSAGE_MAP(KwattaAppDlg, StyleDialog)

diff --git a/Kwatta/MutateNamesDlg.cpp b/Kwatta/MutateNamesDlg.cpp
@@ -25,6 +25,8 @@
 #include "ExtraExtensions.h"
 #include <filesystem>
 
+using namespace ThemeColor;
+
 // MutateNamesDlg dialog
 
 IMPLEMENT_DYNAMIC(MutateNamesDlg, StyleDialog)
@@ -72,9 +74,9 @@ MutateNamesDlg::OnInitDialog()
   SetWindowText("Change directory or filename");
 
   m_editOrigDirectory.SetMutable(false);
-  m_editOrigDirectory.SetBkColor(ThemeColor::_Color2);
+  m_editOrigDirectory.SetBkColor(ThemeColor::GetColor(Colors::AccentColor2));
   m_editOrigFilename .SetMutable(false);
-  m_editOrigFilename .SetBkColor(ThemeColor::_Color2);
+  m_editOrigFilename .SetBkColor(ThemeColor::GetColor(Colors::AccentColor2));
 
   m_newDirectory = m_origDirectory;
   m_newFilename  = m_origFilename;

diff --git a/Kwatta/SplashDlg.cpp b/Kwatta/SplashDlg.cpp
@@ -70,7 +70,6 @@ SplashDlg::OnInitDialog()
   m_editTitle.SetMutable(false);
   m_editTitle.SetFontName("Verdana",420);
   m_editTitle.SetFontStyle(true);
-  m_editTitle.SetMutable(false);
 
   UpdateData(FALSE);
 

diff --git a/Kwatta/StarterDlg.cpp b/Kwatta/StarterDlg.cpp
@@ -28,6 +28,8 @@
 #include <FileDialog.h>
 #include <filesystem>
 
+using namespace ThemeColor;
+
 // StarterDlg dialog
 
 IMPLEMENT_DYNAMIC(StarterDlg, StyleDialog)
@@ -89,7 +91,7 @@ void
 StarterDlg::InitTitle()
 {
   m_title = "Kwatta Test Suite " KWATTA_YEAR;
-  m_editTitle.SetBkColor(ThemeColor::_Color1);
+  m_editTitle.SetBkColor(ThemeColor::GetColor(Colors::AccentColor1));
   m_editTitle.SetTextColor(RGB(255, 255, 255));
   m_editTitle.SetFontSize(240);
   m_editTitle.SetFontStyle(true);

diff --git a/Kwatta/SystemDlg.cpp b/Kwatta/SystemDlg.cpp
@@ -23,6 +23,8 @@
 #include <FileDialog.h>
 #include "resource.h"
 
+using namespace ThemeColor;
+
 // SystemDlg dialog
 
 IMPLEMENT_DYNAMIC(SystemDlg, StyleDialog)
@@ -84,7 +86,7 @@ SystemDlg::InitButtons()
   m_buttonCancel .SetStyle("can");
 
   m_editPassword.SetMutable(false);
-  m_editPassword.SetBkColor(ThemeColor::_Color2);
+  m_editPassword.SetBkColor(ThemeColor::GetColor(Colors::AccentColor2));
 
   m_comboLoglevel.AddString("No logging");                                          // HLL_NOLOG      0       // No logging is ever done
   m_comboLoglevel.AddString("Error logging only");                                  // HLL_ERRORS     1       // Only errors are logged
@@ -95,7 +97,7 @@ SystemDlg::InitButtons()
 
   m_help.SetTipText("Use to set the KWATTA_PASSWORD variable with the 'setx /m' command!");
   m_help.SetURL("https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/setx");
-  m_help.SetColours(ThemeColor::_Color1,RGB(0,0,255));
+  m_help.SetColours(ThemeColor::GetColor(Colors::AccentColor1),RGB(0,0,255));
 }
 
 void

diff --git a/ResultViewer/resource.h b/ResultViewer/resource.h
diff --git a/StepEditor/resource.h b/StepEditor/resource.h
diff --git a/StyleFramework/Grid/GridCellCombo.cpp b/StyleFramework/Grid/GridCellCombo.cpp
@@ -48,6 +48,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+using namespace ThemeColor;
 
 /////////////////////////////////////////////////////////////////////////////
 // CComboEdit
@@ -482,7 +483,7 @@ void CInPlaceList::DrawComboButton()
   rect.left = rect.right - rect.Height() - WS(1);
 
   // Find the frame color
-  COLORREF color = ThemeColor::_Color1;
+  COLORREF color = ThemeColor::GetColor(Colors::AccentColor1); //   ThemeColor::_Color1
 
   // Create pen
   CPen pen;
@@ -616,7 +617,7 @@ BOOL CGridCellCombo::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bErase
 void  CGridCellCombo::DrawComboButton(CDC* pDC,CRect p_rect)
 {
   // Find the frame color
-  COLORREF color = ThemeColor::_Color1;
+  COLORREF color = ThemeColor::GetColor(Colors::AccentColor1);
 
   // Create pen
   CPen pen;

diff --git a/StyleFramework/Grid/GridCtrl.cpp b/StyleFramework/Grid/GridCtrl.cpp
@@ -134,6 +134,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+using namespace ThemeColor;
+
 // Spit out some messages as a sanity check for programmers
 #ifdef GRIDCONTROL_NO_TITLETIPS
 #pragma message(" -- CGridCtrl: No titletips for cells with large data")
@@ -1787,7 +1789,7 @@ void CGridCtrl::OnDraw(CDC* pDC)
 
 
   CPen pen;
-  pen.CreatePen(PS_SOLID,0,ThemeColor::_Color2); //m_crGridLineColour);
+  pen.CreatePen(PS_SOLID,0,ThemeColor::GetColor(Colors::AccentColor2)); //m_crGridLineColour);
   pDC->SelectObject(&pen);
 
   // draw vertical lines (drawn at ends of cells)

diff --git a/StyleFramework/SkinScrollWnd.cpp b/StyleFramework/SkinScrollWnd.cpp
@@ -33,6 +33,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+using namespace ThemeColor;
+
 #define TIMER_UPDATE      100               // Update the scrollbars after this amount of milliseconds
 #define SF_LIMITERMOVE	  (WM_USER+100)     // User message to move the scrollbars, limiter and control
 
@@ -175,7 +177,7 @@ HookWndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
       rcVert.top    = border;
       rcVert.bottom = nBottom - border + 1 - bias;
       rcHorz.left   = border;
-      rcHorz.right  = nRight  - border;
+      rcHorz.right  = nRight  - border + 1;
       rcHorz.top    = nBottom + bias;
       rcHorz.bottom = nBottom + nWid + bias;
     }
@@ -642,14 +644,14 @@ SkinScrollWnd::OnNcPaint()
     readonly = (control->GetStyle() & ES_READONLY) > 0 || !control->IsWindowEnabled();
     if(readonly)
     {
-      color = ClrFrameBkGnd;
+      color = ThemeColor::GetColor(Colors::ColorWindowFrame); //ClrFrameBkGnd;
     }
   }
 
   StyleEdit* edit = reinterpret_cast<StyleEdit*>(control);
   if(edit && edit->GetIsComboBox())
   {
-    color = readonly ? m_borderColor : Assistant0;
+    color = readonly ? m_borderColor : ThemeColor::GetColor(Colors::ColorCtrlBackground); // Assistant0
   }
 
   if(dc)
@@ -822,7 +824,7 @@ SkinScrollWnd::DrawFrame()
     return;
   }
 
-  COLORREF color = ThemeColor::_Color2;
+  COLORREF color = ThemeColor::GetColor(Colors::AccentColor2);
   if (m_wndLimit.m_hWnd)
   {
     CWnd* control = m_wndLimit.GetWindow(GW_CHILD);
@@ -843,7 +845,7 @@ SkinScrollWnd::DrawFrame()
     }
     if(control == GetFocus())
     {
-      color = ThemeColor::_Color1;
+      color = ThemeColor::GetColor(Colors::AccentColor1);
     }
   }
   DrawFrame(color);

diff --git a/StyleFramework/StyleButton.cpp b/StyleFramework/StyleButton.cpp
@@ -31,6 +31,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+using namespace ThemeColor;
+
 //////////////////////////////////////////////////////////////////////////
 //
 // SERVICE FUNCTIONS FOR STYLE BUTTON
@@ -474,8 +476,8 @@ StyleButton::Draw(CDC*    pDC
       }
       else
       {
-        filling   = ClrControlNormal;
-        textcolor = ClrControlTextNormal;
+        filling   = ThemeColor::GetColor(Colors::ColorWindowFrame); // ClrControlNormal;
+        textcolor = ThemeColor::GetColor(Colors::AccentColor3);     // ClrControlTextNormal;
         outline   = ClrControlFrameNormal;
       }
     }
@@ -491,15 +493,15 @@ StyleButton::Draw(CDC*    pDC
       {
         if (over || (style & BS_DEFPUSHBUTTON))
         {
-          filling   = ClrControlDefault; 
+          filling   = ThemeColor::GetColor(Colors::AccentColor1);  // ClrControlDefault;
           textcolor = ClrControlTextHover;
           outline   = ClrControlFrameHover;
         }
         else
         {
-          filling   = ClrControlNormal;
-          textcolor = ClrControlTextNormal;
-          outline   = ThemeColor::_Color1; 
+          filling   = ThemeColor::GetColor(Colors::ColorCtrlBackground);   // ClrControlNormal;
+          textcolor = ThemeColor::GetColor(Colors::AccentColor1);          //ClrControlTextNormal;
+          outline   = ThemeColor::GetColor(Colors::AccentColor1); 
         }
       }
     }
@@ -518,9 +520,9 @@ StyleButton::Draw(CDC*    pDC
 
     else
     {
-      filling   = ClrControlNormal;
-      textcolor = ClrControlTextNormal;
-      outline   = ClrControlFrameNormal;
+      filling   = ThemeColor::GetColor(Colors::ColorButtonBackground);  // ClrControlNormal      = UsersBackground
+      textcolor = ThemeColor::GetColor(Colors::ColorButtonText);        // ClrControlTextNormal
+      outline   = ThemeColor::GetColor(Colors::AccentColor1);           // ClrControlFrameNormal
     }
   }
   else
@@ -532,7 +534,7 @@ StyleButton::Draw(CDC*    pDC
 
   if (p_mandatory)
   {
-    outline = ClrEditFrameVerplicht;
+    outline = ThemeColor::NoWhite(ThemeColor::GetColor(Colors::AccentColor1)); //ClrEditFrameVerplicht;
   }
   if (pInError)
   {
@@ -559,7 +561,9 @@ StyleButton::Draw(CDC*    pDC
     {
       if (p_themeColor)
       {
-        CWSExpander(pDC, rect).DrawIcon(hicon, ClrFrameBkGnd,ComboBoxActive);
+        CWSExpander(pDC, rect).DrawIcon(hicon
+                                       ,ThemeColor::GetColor(Colors::ColorWindowFrame)
+                                       ,ThemeColor::GetColor(Colors::ColorComboActive));
         // Alternative without scaling
         // bmpRect.DeflateRect(1, 1);
         // br.DeleteObject();
@@ -583,7 +587,7 @@ StyleButton::Draw(CDC*    pDC
     }
     else
     {
-      CWSExpander(pDC, rect).DrawIcon(hicon, ClrFrameBkGnd, textcolor);
+      CWSExpander(pDC, rect).DrawIcon(hicon,ThemeColor::GetColor(Colors::ColorWindowFrame),textcolor);
       // Alternative without scaling
       // br.DeleteObject();
       // br.CreateSolidBrush(textcolor);

diff --git a/StyleFramework/StyleCalendar.cpp b/StyleFramework/StyleCalendar.cpp
@@ -27,6 +27,8 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+using namespace ThemeColor;
+
 StyleCalendar::StyleCalendar(CWnd* p_parent,CString p_select,int top,int left)
               :StyleDialog(IDD_CALENDAR,p_parent)
               ,m_select(p_select)
@@ -62,8 +64,8 @@ StyleCalendar::OnInitDialog()
   {
     m_control.SetFont(m_font);
   }
-  m_control.SetColor(MCSC_MONTHBK,ThemeColor::_Color1);
-  m_control.SetColor(MCSC_TEXT,   ThemeColor::_Color1);
+  m_control.SetColor(MCSC_MONTHBK,ThemeColor::GetColor(Colors::AccentColor1));
+  m_control.SetColor(MCSC_TEXT,   ThemeColor::GetColor(Colors::AccentColor1));
 
   // Find the size and position of the window
   CRect rect;