Update RectifyStart

Rectify11 · May 29, 2024 · 17ebbdb · 17ebbdb
1 parent b13fff6
commit 17ebbdb
Show file tree

Hide file tree

Showing 38 changed files with 221 additions and 111 deletions.
diff --git a/RectifyStart/1000.png b/RectifyStart/1000.png
diff --git a/RectifyStart/1001.png b/RectifyStart/1001.png
diff --git a/RectifyStart/1002.png b/RectifyStart/1002.png
diff --git a/RectifyStart/1003.png b/RectifyStart/1003.png
diff --git a/RectifyStart/1004.png b/RectifyStart/1004.png
diff --git a/RectifyStart/1005.png b/RectifyStart/1005.png
diff --git a/RectifyStart/1006.png b/RectifyStart/1006.png
diff --git a/RectifyStart/1007.png b/RectifyStart/1007.png
diff --git a/RectifyStart/1008.png b/RectifyStart/1008.png
diff --git a/RectifyStart/1009.png b/RectifyStart/1009.png
diff --git a/RectifyStart/1010.png b/RectifyStart/1010.png
diff --git a/RectifyStart/1011.png b/RectifyStart/1011.png
diff --git a/RectifyStart/1012.png b/RectifyStart/1012.png
diff --git a/RectifyStart/1013.png b/RectifyStart/1013.png
diff --git a/RectifyStart/1014.png b/RectifyStart/1014.png
diff --git a/RectifyStart/1015.png b/RectifyStart/1015.png
diff --git a/RectifyStart/1016.png b/RectifyStart/1016.png
diff --git a/RectifyStart/1017.png b/RectifyStart/1017.png
diff --git a/RectifyStart/1018.png b/RectifyStart/1018.png
diff --git a/RectifyStart/1019.png b/RectifyStart/1019.png
diff --git a/RectifyStart/1020.png b/RectifyStart/1020.png
diff --git a/RectifyStart/1021.png b/RectifyStart/1021.png
diff --git a/RectifyStart/1022.png b/RectifyStart/1022.png
diff --git a/RectifyStart/1023.png b/RectifyStart/1023.png
diff --git a/RectifyStart/1024.png b/RectifyStart/1024.png
diff --git a/RectifyStart/1025.png b/RectifyStart/1025.png
diff --git a/RectifyStart/1026.png b/RectifyStart/1026.png
diff --git a/RectifyStart/1027.png b/RectifyStart/1027.png
diff --git a/RectifyStart/1028.png b/RectifyStart/1028.png
diff --git a/RectifyStart/1029.png b/RectifyStart/1029.png
diff --git a/RectifyStart/1030.png b/RectifyStart/1030.png
diff --git a/RectifyStart/1031.png b/RectifyStart/1031.png
diff --git a/RectifyStart/1032.png b/RectifyStart/1032.png
diff --git a/RectifyStart/RectifyStart.aps b/RectifyStart/RectifyStart.aps
diff --git a/RectifyStart/RectifyStart.cpp b/RectifyStart/RectifyStart.cpp
@@ -214,8 +214,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	DUIXmlParser::Create(&pParser, NULL, NULL, NULL, NULL);
 	pParser->SetParseErrorCallback(
 		[](UCString err1, UCString err2, int unk, void* ctx) {
-			MessageBox(hwnd, std::format(L"err: {}; {}; {}\n", (LPCWSTR)err1, (LPCWSTR)err2, unk).c_str(),
-			L"Error while parsing DirectUI", S_OK);
+			MessageBox(hwnd, std::format(L"Error from DirectUI: {}; {}; {}\n", (LPCWSTR)err1, (LPCWSTR)err2, unk).c_str(),
+				L"Error while parsing DirectUI", MB_ICONERROR);
 		}, NULL);
 
 	hr = pParser->SetXMLFromResource(IDR_UIFILE, hInstance, (HINSTANCE)hInstance);
@@ -224,9 +224,14 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	HWNDElement::Create(pwnd->GetHWND(), true, 0, NULL, &defer_key, (Element**)&hwnd_element);
 
 	// Create the root element
-	Element* pWizardMain;
+	Element* pWizardMain = NULL;
 	hr = pParser->CreateElement((UCString)L"WizardMain", hwnd_element, NULL, NULL, (Element**)&pWizardMain);
 
+	if (pWizardMain == NULL)
+	{
+		MessageBox(hwnd, TEXT("A error has occured while creating the main element. The application will now close."), L"Error while creating main window", MB_ICONERROR);
+		return -1;
+	}
 	// Host the window with the element
 	pWizardMain->SetVisible(true);
 	pWizardMain->EndDefer(defer_key);

diff --git a/RectifyStart/RectifyStart.rc b/RectifyStart/RectifyStart.rc
@@ -22,6 +22,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -77,13 +78,38 @@ IDR_UIFILE              UIFILE                  "uifile.xml"
 // IMAGE
 //
 
-IDB_BLANK               IMAGE                   "blank.png"
-
-IDB_CPL                 IMAGE                   "cpl.png"
-
-IDB_THEMESWITCH         IMAGE                   "themeswitch.png"
-
-IDB_ANIMATIONS          IMAGE                   "animations.png"
+1001          IMAGE                   "1001.png"
+1002          IMAGE                   "1002.png"
+1003          IMAGE                   "1003.png"
+1004          IMAGE                   "1004.png"
+1005          IMAGE                   "1005.png"
+1006          IMAGE                   "1006.png"
+1007          IMAGE                   "1007.png"
+1008          IMAGE                   "1008.png"
+1009          IMAGE                   "1009.png"
+1010          IMAGE                   "1010.png"
+1011          IMAGE                   "1011.png"
+1012          IMAGE                   "1012.png"
+1013          IMAGE                   "1013.png"
+1014          IMAGE                   "1014.png"
+1015          IMAGE                   "1015.png"
+1016          IMAGE                   "1016.png"
+1017          IMAGE                   "1017.png"
+1018          IMAGE                   "1018.png"
+1019          IMAGE                   "1019.png"
+1020          IMAGE                   "1020.png"
+1021          IMAGE                   "1021.png"
+1022          IMAGE                   "1022.png"
+1023          IMAGE                   "1023.png"
+1024          IMAGE                   "1024.png"
+1025          IMAGE                   "1025.png"
+1026          IMAGE                   "1026.png"
+1027          IMAGE                   "1027.png"
+1028          IMAGE                   "1028.png"
+1029          IMAGE                   "1029.png"
+1030          IMAGE                   "1030.png"
+1031          IMAGE                   "1031.png"
+1032          IMAGE                   "1032.png"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -108,62 +134,23 @@ BEGIN
     IDS_ALREADYON           "Already turned on"
     IDS_SMOOTHUI            "Smoother UI"
     IDS_SMOOTHUIDESC        "Rectify11 v3.2 adds smooth animations to more Windows UI components, as well as making existing UI animations smoother."
-    IDS_CARD                "Title TBD"
-    IDS_CARDDESC            "Description TBD"
+    IDS_CARD                "Better File Explorer"
+    IDS_CARDDESC            "Rectify11 enhances File Explorer by adding a new selection indicator, large check boxes, and subtle animations."
     IDS_STARTUP             "Show this window when Windows starts."
     IDS_CLOSE               "Close"
+    IDS_WIN11ONLY           "Only on Windows 11."
 END
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE           "RectifyStart"
-    IDS_WHATSNEW            "Was ist neu in v3.2 ?"
-    IDS_NEWCPL              "Die neuen Rectify11 Einstellungen"
-    IDS_NEWCPLDESC          "In den Rectify11-Einstellungen können Sie alles, was Rectify11 betrifft, bequem ändern und optimieren."
-    IDS_CHECKITOUT          "Probier es aus"
-    IDS_THEMESWITCH         "Einfacher Designwechsel"
-    IDS_THEMESWITCHDESC     "Mit dem neuen Rectify11-Menü im Infobereich können Sie direkt von Ihrer Taskleiste aus das Design wechseln."
-END
-
-STRINGTABLE
-BEGIN
-    IDS_TURNON              "Aktivieren"
-    IDS_ALREADYON           "Bereits aktiviert"
-    IDS_SMOOTHUI            "Eine flüssigere Benutzeroberfläche"
-    IDS_SMOOTHUIDESC        "Rectify11 v3.2 fügt einige Animationen zu weiteren Komponenten der Windows-Benutzeroberfläche hinzu und macht bestehende Animationen flüssiger."
-    IDS_CARD                "Titel NZD"
-    IDS_CARDDESC            "Beschreibung NZD"
-    IDS_STARTUP             "RectifyStart mit Windows starten."
-    IDS_CLOSE               "Schließen"
-END
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
 
 /////////////////////////////////////////////////////////////////////////////
 // Arabic (Saudi Arabia) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ARA)
 LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA
+#pragma code_page(1256)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -173,24 +160,25 @@ LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA
 STRINGTABLE
 BEGIN
     IDS_APP_TITLE           "RectifyStart"
-    IDS_WHATSNEW            "الجديد في الإصدار 3.2"
-    IDS_NEWCPL              "إعدادات Rectify11 الجديدة"
-    IDS_NEWCPLDESC          "مكان سهل الاستخدام لتغيير وضبط كل شيء متعلق بـ Rectify11"
-    IDS_CHECKITOUT          "الاطلاع عليه"
-    IDS_THEMESWITCH         "تغيير الألوان بسهولة"
-    IDS_THEMESWITCHDESC     "مع أداة شريط المهام الجديدة، يمكنك ضبط الوضع الفاتح أو الداكن"
+    IDS_WHATSNEW            "������ �� ������� 3.2"
+    IDS_NEWCPL              "������� Rectify11 �������"
+    IDS_NEWCPLDESC          "���� ��� ��������� ������ ���� �� ��� ����� �� Rectify11"
+    IDS_CHECKITOUT          "������� ����"
+    IDS_THEMESWITCH         "����� ������� ������"
+    IDS_THEMESWITCHDESC     "�� ���� ���� ������ ������ɡ ����� ��� ����� ������ �� ������"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_TURNON              "تفعيل"
-    IDS_ALREADYON           "تم التفعيل"
-    IDS_SMOOTHUI            "واجهة سلسة"
-    IDS_SMOOTHUIDESC        "تم إضافة عناصر متحركة في النظام، وجعل الحركات الافتراضية أكثر سلاسة"
-    IDS_CARD                "عنوان"
-    IDS_CARDDESC            "وصف"
-    IDS_STARTUP             "عرض النافذة عند تشغيل الجهاز"
-    IDS_CLOSE               "إغلاق"
+    IDS_TURNON              "�����"
+    IDS_ALREADYON           "�� �������"
+    IDS_SMOOTHUI            "����� ����"
+    IDS_SMOOTHUIDESC        "�� ����� ����� ������ �� ������ ���� ������� ���������� ���� �����"
+    IDS_CARD                "������� ������ �������"
+    IDS_CARDDESC            "��� Rectify11 ������� ������� ������� ��� ���� ������� �������� ������ ���� ���������"
+    IDS_STARTUP             "��� ������� ��� ����� ������"
+    IDS_CLOSE               "�����"
+    IDS_WIN11ONLY           "������ ��� Windows 11"
 END
 
 #endif    // Arabic (Saudi Arabia) resources

diff --git a/RectifyStart/resource.h b/RectifyStart/resource.h
@@ -3,23 +3,30 @@
 // Used by RectifyStart.rc
 //
 #define IDC_MYICON                      2
-#define IDS_APP_TITLE                   100
-#define IDS_WHATSNEW                    101
-#define IDI_RECTIFYSTART                102
-#define IDS_NEWCPL                      103
-#define IDS_NEWCPLDESC                  104
-#define IDS_CHECKITOUT                  105
-#define IDS_THEMESWITCH                 106
-#define IDS_THEMESWITCHDESC             107
-#define IDS_TURNON                      108
-#define IDS_ALREADYON                   109
-#define IDS_SMOOTHUI                    110
-#define IDS_SMOOTHUIDESC                111
-#define IDS_CARD                        112
-#define IDS_CARDDESC                    113
-#define IDS_STARTUP                     114
-#define IDS_CLOSE                       115
-#define IDR_UIFILE                      999
+#define IDD_RECTIFYSTART_DIALOG         102
+#define IDS_APP_TITLE                   103
+#define IDS_STRING104                   104
+#define IDC_RECTIFYSTART                106
+#define IDS_WHATSNEW                    106
+#define IDI_RECTIFYSTART                107
+#define IDS_NEWCPL                      107
+#define IDI_SMALL                       108
+#define IDS_NEWCPLDESC                  108
+#define IDS_CHECKITOUT                  109
+#define IDS_THEMESWITCH                 110
+#define IDS_THEMESWITCHDESC             111
+#define IDS_TURNON                      112
+#define IDS_ALREADYON                   113
+#define IDS_SMOOTHUI                    114
+#define IDS_SMOOTHUIDESC                115
+#define IDS_CARD                        116
+#define IDS_CARDDESC                    117
+#define IDS_STARTUP                     118
+#define IDS_CLOSE                       119
+#define IDS_WIN11ONLY                   120
+#define IDR_MAINFRAME                   128
+#define IDR_UIFILE1                     129
+#define IDR_UIFILE                      130
 #define IDB_BLANK                       1000
 #define IDB_CPL                         1001
 #define IDB_THEMESWITCH                 1002