released v4.1.20.117

ikoude · Jan 18, 2020 · 3df117b · 3df117b
1 parent 958028d
commit 3df117b
Show file tree

Hide file tree

Showing 25 changed files with 836 additions and 843 deletions.
diff --git a/Default.ext b/Default.ext
diff --git a/Demo/drawing/demo.shader.e b/Demo/drawing/demo.shader.e
diff --git a/Demo/object/[扩展]navbtn(导航按钮)及选择夹的控制/demo.navbtn.exdui[带缓动效果].e b/Demo/object/[扩展]navbtn(导航按钮)及选择夹的控制/demo.navbtn.exdui[带缓动效果].e
diff --git a/Demo/object/[扩展]switch/demo.switch.e b/Demo/object/[扩展]switch/demo.switch.e
diff --git a/Demo/object/[扩展]图标列表框/demo.iconlistview.e b/Demo/object/[扩展]图标列表框/demo.iconlistview.e
diff --git a/Demo/object/combobox/demo.combobox.bak b/Demo/object/combobox/demo.combobox.bak
diff --git a/Demo/object/edit/demo.edit.bak b/Demo/object/edit/demo.edit.bak
diff --git a/Demo/object/menubtn/demo.menubtn.rc b/Demo/object/menubtn/demo.menubtn.rc
@@ -1,60 +1,60 @@
-#define IDR_MENU_MAIN 10000
-#define IDM_MENUBAR_MAIN 10001
-#define IDM_FILE 10002
-#define IDM_FILE_NEW 10003
-#define IDM_FILE_OPEN 10004
-#define IDM_FILE_SAVE 10005
-#define IDM_FILE_SPLIT1 10006
-#define IDM_FILE_EXIT 10007
-#define IDM_EDIT 10008
-#define IDM_EDIT_CUT 10009
-#define IDM_EDIT_COPY 10010
-#define IDM_EDIT_PASTE 10011
-#define IDM_EDIT_SPLIT1 10012
-#define IDM_EDIT_UNDO 10013
-#define IDM_EDIT_REDO 10014
-#define IDM_OPTION 10015
-#define IDM_OPTION_SETTING 10016
-#define IDM_HELP 10017
-#define IDM_HELP_ABOUT 10018
-#define IDM_HELP_SPLIT1 10021
-#define IDM_HELP_DOC 10020
-#define IDM_HELP_HELP 10019
-
-LANGUAGE 4,2
-
-IDR_MENU_MAIN MENU
-BEGIN
-  POPUP "�˵���"
-  BEGIN
-    POPUP "�ļ�(&F)"
-    BEGIN
-      MENUITEM "�½�(&N)\tCtrl+N",IDM_FILE_NEW
-      MENUITEM "��(&O)\tCtrl+O",IDM_FILE_OPEN
-      MENUITEM "����(&S)\tCtrl+S",IDM_FILE_SAVE
-      MENUITEM SEPARATOR
-      MENUITEM "�˳�(&E)",IDM_FILE_EXIT
-    END
-    POPUP "�༭(&E)"
-    BEGIN
-      MENUITEM "����(&T)\tCtrl+X",IDM_EDIT_CUT
-      MENUITEM "����(&C)\tCtrl+C",IDM_EDIT_COPY
-      MENUITEM "ճ��(&P)\tCtrl+V",IDM_EDIT_PASTE,GRAYED
-      MENUITEM SEPARATOR
-      MENUITEM "����(&U)",IDM_EDIT_UNDO,GRAYED
-      MENUITEM "����(&R)",IDM_EDIT_REDO,GRAYED
-    END
-    POPUP "ѡ��(&O)"
-    BEGIN
-      MENUITEM "����(&S)",IDM_OPTION_SETTING
-    END
-    POPUP "����(&H)"
-    BEGIN
-      MENUITEM "����(&A)",IDM_HELP_ABOUT
-      MENUITEM SEPARATOR
-      MENUITEM "�ĵ�(&D)",IDM_HELP_DOC
-      MENUITEM "����(&H)\tF1",IDM_HELP_HELP
-    END
-  END
-END
-
+#define IDR_MENU_MAIN 10000
+#define IDM_MENUBAR_MAIN 10001
+#define IDM_FILE 10002
+#define IDM_FILE_NEW 10003
+#define IDM_FILE_OPEN 10004
+#define IDM_FILE_SAVE 10005
+#define IDM_FILE_SPLIT1 10006
+#define IDM_FILE_EXIT 10007
+#define IDM_EDIT 10008
+#define IDM_EDIT_CUT 10009
+#define IDM_EDIT_COPY 10010
+#define IDM_EDIT_PASTE 10011
+#define IDM_EDIT_SPLIT1 10012
+#define IDM_EDIT_UNDO 10013
+#define IDM_EDIT_REDO 10014
+#define IDM_OPTION 10015
+#define IDM_OPTION_SETTING 10016
+#define IDM_HELP 10017
+#define IDM_HELP_ABOUT 10018
+#define IDM_HELP_SPLIT1 10021
+#define IDM_HELP_DOC 10020
+#define IDM_HELP_HELP 10019
+
+LANGUAGE 4,2
+
+IDR_MENU_MAIN MENU
+BEGIN
+  POPUP "�˵���"
+  BEGIN
+    POPUP "�ļ�(&F)"
+    BEGIN
+      MENUITEM "�½�(&N)\tCtrl+N",IDM_FILE_NEW
+      MENUITEM "��(&O)\tCtrl+O",IDM_FILE_OPEN
+      MENUITEM "����(&S)\tCtrl+S",IDM_FILE_SAVE
+      MENUITEM SEPARATOR
+      MENUITEM "�˳�(&E)",IDM_FILE_EXIT
+    END
+    POPUP "�༭(&E)"
+    BEGIN
+      MENUITEM "����(&T)\tCtrl+X",IDM_EDIT_CUT
+      MENUITEM "����(&C)\tCtrl+C",IDM_EDIT_COPY
+      MENUITEM "ճ��(&P)\tCtrl+V",IDM_EDIT_PASTE,GRAYED
+      MENUITEM SEPARATOR
+      MENUITEM "����(&U)",IDM_EDIT_UNDO,GRAYED
+      MENUITEM "����(&R)",IDM_EDIT_REDO,GRAYED
+    END
+    POPUP "ѡ��(&O)"
+    BEGIN
+      MENUITEM "����(&S)",IDM_OPTION_SETTING
+    END
+    POPUP "����(&H)"
+    BEGIN
+      MENUITEM "����(&A)",IDM_HELP_ABOUT
+      MENUITEM SEPARATOR
+      MENUITEM "�ĵ�(&D)",IDM_HELP_DOC
+      MENUITEM "����(&H)\tF1",IDM_HELP_HELP
+    END
+  END
+END
+
diff --git a/Demo/object/menubtn/注意.txt b/Demo/object/menubtn/注意.txt
@@ -1,2 +1,2 @@
-��demo��Ҫ���±�����֧�֡�
+��demo��Ҫ���±�����֧�֡�
 ���޺��£���˵���Ҫ������API������
diff --git a/Demo/object/tab/demo.ctrl.tab.e b/Demo/object/tab/demo.ctrl.tab.e
diff --git a/Demo/window/demo.menu.rc b/Demo/window/demo.menu.rc
@@ -1,28 +1,28 @@
-#define IDR_MENU1 10000
-#define IDM_ 10001
-#define IDM_ 10002
-#define IDM_ 10003
-#define IDM_ 10004
-#define IDM_ 10005
-#define IDM_ 10006
-#define IDM_ 10007
-#define IDM_ 10008
-
-LANGUAGE 4,2
-
-IDR_MENU1 MENU
-BEGIN
-  POPUP "�����˵�"
-  BEGIN
-    POPUP "��Ա����"
-    BEGIN
-      MENUITEM "��Ա����",IDM_
-      MENUITEM "��Ա����",IDM_
-    END
-    MENUITEM "��ȫ",IDM_
-    MENUITEM "����",IDM_
-    MENUITEM SEPARATOR
-    MENUITEM "�˳�",IDM_
-  END
-END
-
+#define IDR_MENU1 10000
+#define IDM_ 10001
+#define IDM_ 10002
+#define IDM_ 10003
+#define IDM_ 10004
+#define IDM_ 10005
+#define IDM_ 10006
+#define IDM_ 10007
+#define IDM_ 10008
+
+LANGUAGE 4,2
+
+IDR_MENU1 MENU
+BEGIN
+  POPUP "�����˵�"
+  BEGIN
+    POPUP "��Ա����"
+    BEGIN
+      MENUITEM "��Ա����",IDM_
+      MENUITEM "��Ա����",IDM_
+    END
+    MENUITEM "��ȫ",IDM_
+    MENUITEM "����",IDM_
+    MENUITEM SEPARATOR
+    MENUITEM "�˳�",IDM_
+  END
+END
+
diff --git a/Res/icon.ico b/Res/icon.ico
diff --git a/Res/xpmanifest.xml b/Res/xpmanifest.xml
diff --git a/Source/0.LibExDui.Helper.bak b/Source/0.LibExDui.Helper.bak
diff --git a/Source/0.LibExDui.Helper.e b/Source/0.LibExDui.Helper.e
diff --git a/Source/0.LibExDui.Helper.ec b/Source/0.LibExDui.Helper.ec
diff --git a/Source/0.YHan.Helper.e b/Source/0.YHan.Helper.e
diff --git a/Source/0.YHan.Helper.ec b/Source/0.YHan.Helper.ec