change ! -> ? and add cp file to other

puutaro · Apr 3, 2024 · c4515fa · c4515fa
1 parent 34baaf6
commit c4515fa
Show file tree

Hide file tree

Showing 42 changed files with 388 additions and 146 deletions.
diff --git a/app/src/main/assets/appSystemDir/system/appDirManagerDir/settings/settingButtonConfig.js b/app/src/main/assets/appSystemDir/system/appDirManagerDir/settings/settingButtonConfig.js
@@ -3,10 +3,10 @@ longClick=
 	jsPath=MENU
 	|args=
 		menuPath=`${CMDCLICK_APP_DIR_ADMIN_MENU_PATH}`
-		!onHideFooter=,
+		?onHideFooter=,
 click=
 	jsPath=MENU
 	|args=
 		menuPath=`${CMDCLICK_APP_DIR_ADMIN_MENU_PATH}`
-		!onHideFooter=,
+		?onHideFooter=,
 icon=plus,
diff --git a/app/src/main/assets/appSystemDir/system/cmdTerminalDir/settingVariables/setVariableTypes.js b/app/src/main/assets/appSystemDir/system/cmdTerminalDir/settingVariables/setVariableTypes.js
@@ -2,75 +2,75 @@
 sendkeys1
 	:BTN:BTN:BTN:BTN:BTN:HL=
 		${BTN_CMD}=jsf '${0}' ${COPY} 
-			!${BTN_LABEL}=CP
-			!${DISABLE_KEYBOARD_HIDDEN}=true
+			?${BTN_LABEL}=CP
+			?${DISABLE_KEYBOARD_HIDDEN}=true
 		|
 			${BTN_CMD}=jsf '${0}' ${PASTE} 
-				!${BTN_LABEL}=PST
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=PST
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		|
 			${BTN_CMD}=jsf '${0}' ${UP} 
-				!${BTN_LABEL}=↑
-				!${IS_CONSEC}=true
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=↑
+				?${IS_CONSEC}=true
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		|
 			${BTN_CMD}=jsf '${0}' ${BACKSPACE} 
-				!${BTN_LABEL}=BS
-				!${IS_CONSEC}=true
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=BS
+				?${IS_CONSEC}=true
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		|
 			${BTN_CMD}=jsf '${0}' ${PAGE_UP} 
-				!${BTN_LABEL}=P_U
-				!${DISABLE_KEYBOARD_HIDDEN}=true,
+				?${BTN_LABEL}=P_U
+				?${DISABLE_KEYBOARD_HIDDEN}=true,
 
 sendkeys2
 	:BTN:BTN:BTN:BTN:ELSB:HL=
 		${BTN_CMD}=jsf '${0}' ${SPACE}
-			!${BTN_LABEL}=SPC
+			?${BTN_LABEL}=SPC
 		| 
 			${BTN_CMD}=jsf '${0}' ${LEFT} 
-				!${BTN_LABEL}=←
-				!${IS_CONSEC}=true
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=←
+				?${IS_CONSEC}=true
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		| 
 			${BTN_CMD}=jsf '${0}' ${DOWN} 
-				!${BTN_LABEL}=↓
-				!${IS_CONSEC}=true
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=↓
+				?${IS_CONSEC}=true
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		| 
 			${BTN_CMD}=jsf '${0}' ${RIGHT} 
-				!${BTN_LABEL}=→
-				!${IS_CONSEC}=true
-				!${DISABLE_KEYBOARD_HIDDEN}=true
+				?${BTN_LABEL}=→
+				?${IS_CONSEC}=true
+				?${DISABLE_KEYBOARD_HIDDEN}=true
 		|
 		${LIST_PATH}=${cmdTerminalExtraKeyListFilePath}
-			!${LIMIT_NUM}=50
-			!${SELECT_JS_PATH}="${cmdTerminalSelectCmdScriptPath}",
+			?${LIMIT_NUM}=50
+			?${SELECT_JS_PATH}="${cmdTerminalSelectCmdScriptPath}",
 
 sendkeys3
 	:BTN:BTN:BTN:HL= 
 		${BTN_CMD}=jsf '${0}' ${CTRL_C} 
-			!${BTN_LABEL}=C_C
-			!${DISABLE_KEYBOARD_HIDDEN}=true
+			?${BTN_LABEL}=C_C
+			?${DISABLE_KEYBOARD_HIDDEN}=true
 	|	
 		${BTN_CMD}=jsf '${0}' ${ENTER}
-			!${BTN_LABEL}=ENTER
+			?${BTN_LABEL}=ENTER
 	|
 			${BTN_CMD}=jsf '${0}' ${INPUT}
-				!${BTN_LABEL}=INPUT,
+				?${BTN_LABEL}=INPUT,
 
 cmdInput
 	:LBL:TXT:ELSB:BTN=
 		${TXT_LABEL}=this
 		|
 			${LIST_PATH}=${cmdTerminalCmdListFilePath}
-				!${LIMIT_NUM}=50
-				!${SELECT_JS_PATH}="${cmdTerminalSelectCmdScriptPath}"
+				?${LIMIT_NUM}=50
+				?${SELECT_JS_PATH}="${cmdTerminalSelectCmdScriptPath}"
 		|
 			${BTN_CMD}=jsf '${0}' ${CMD_INPUT}
-				!${BTN_LABEL}=RG,
+				?${BTN_LABEL}=RG,
 
 REGISTER_EXTRA_KEY
 	:TXT:BTN= 
 		${BTN_CMD}=jsf '${0}' ${REGISTER_EXTRA_KEY}
-			!${BTN_LABEL}=RG_EX_KEY,
+			?${BTN_LABEL}=RG_EX_KEY,
diff --git a/app/src/main/assets/appSystemDir/system/fannelRepoDir/settingVariables/setVariableTypes.js b/app/src/main/assets/appSystemDir/system/fannelRepoDir/settingVariables/setVariableTypes.js
@@ -2,4 +2,4 @@
 qrListIndex:
 	LI=
 		${LIST_INDEX_DIR_PATH}=${fannelListDirPath}
-			!${LIST_SUFFIX}=.js,
+			?${LIST_SUFFIX}=.js,
diff --git a/app/src/main/assets/appSystemDir/system/fannelRepoDir/settings/settingButtonConfig.js b/app/src/main/assets/appSystemDir/system/fannelRepoDir/settings/settingButtonConfig.js
@@ -4,7 +4,7 @@ longClick=
     jsPath=MENU
     |args=
         menuPath=`${fannelRepoSettingButtonMenuPath}`
-        !onHideFooter=,
+        ?onHideFooter=,
 click=
     jsPath=FANNEL_REPO_SYNC
     |args=

diff --git a/app/src/main/assets/appSystemDir/system/jsImportManagerDir/settings/settingButtonConfig.js b/app/src/main/assets/appSystemDir/system/jsImportManagerDir/settings/settingButtonConfig.js
@@ -3,10 +3,10 @@ longClick=
 	jsPath=MENU
 	|args=
 		menuPath=`${JS_IMPORT_MANAGER_MENU_PATH}`
-		!onHideFooter=,
+		?onHideFooter=,
 click=
 	jsPath=MENU
 	|args=
 		menuPath=`${JS_IMPORT_MANAGER_MENU_PATH}`
-		!onHideFooter=,
+		?onHideFooter=,
 icon=plus,
diff --git a/app/src/main/assets/appSystemDir/system/saveGmailConDialog.js b/app/src/main/assets/appSystemDir/system/saveGmailConDialog.js
@@ -45,8 +45,8 @@ function makeUrl(){
 function makeMenuMapStr(){
     // const onSearchBtn = `${EXTERNAL_EXEC_REPLACE_TXT2}`;
     return  [
-        `clickMenuFilePath=${leftMenuListFilePath}!longPressMenuFilePath=${leftLongPressMenuListFilePath}!dismissType=longpress!iconName=back`,
-        `clickMenuFilePath=${rightMenuListFilePath}!iconName=download_done`,
+        `clickMenuFilePath=${leftMenuListFilePath}?longPressMenuFilePath=${leftLongPressMenuListFilePath}?dismissType=longpress?iconName=back`,
+        `clickMenuFilePath=${rightMenuListFilePath}?iconName=download_done`,
     ].join("|");
     // switch(true){
     //     case onSearchBtn === "OFF":

diff --git a/app/src/main/assets/appSystemDir/system/savePageUrlDialog.js b/app/src/main/assets/appSystemDir/system/savePageUrlDialog.js
@@ -15,7 +15,7 @@ function launchWebview(launchUrlString){
     const longPressMenuListStr = [
         `srcImageAnchorMenuFilePath=${srcImageAnchorMenuListFilePath}`,
         `srcAnchorMenuFilePath=${srcAnchorMenuListFilePath}`,
-    ].join("!");
+    ].join("?");
     jsDialog.webView_S(
         launchUrlString,
         "${0}",
@@ -43,14 +43,14 @@ function makeMenuMapStr(){
     switch(true){
         case onSearchBtn === "OFF":
             return [
-                `clickMenuFilePath=${leftMenuListFilePath}!longPressMenuFilePath=${leftLongPressMenuListFilePath}!dismissType=longpress!iconName=back`,
-                `clickMenuFilePath=${rightMenuListFilePath}!iconName=download_done`,
+                `clickMenuFilePath=${leftMenuListFilePath}?longPressMenuFilePath=${leftLongPressMenuListFilePath}?dismissType=longpress?iconName=back`,
+                `clickMenuFilePath=${rightMenuListFilePath}?iconName=download_done`,
             ].join("|");
         default:
             return [
-                `clickMenuFilePath=${leftMenuListFilePath}!longPressMenuFilePath=${leftLongPressMenuListFilePath}!dismissType=longpress!iconName=back`,
-                `clickMenuFilePath=${centerMenuListFilePath}!longPressMenuFilePath=${centerLongPressMenuListFilePath}!iconName=search`,
-                `clickMenuFilePath=${rightMenuListFilePath}!iconName=download_done`,
+                `clickMenuFilePath=${leftMenuListFilePath}?longPressMenuFilePath=${leftLongPressMenuListFilePath}?dismissType=longpress?iconName=back`,
+                `clickMenuFilePath=${centerMenuListFilePath}?longPressMenuFilePath=${centerLongPressMenuListFilePath}?iconName=search`,
+                `clickMenuFilePath=${rightMenuListFilePath}?iconName=download_done`,
             ].join("|");
     }
 }
diff --git a/app/src/main/assets/appSystemDir/system/saveWebConDialog.js b/app/src/main/assets/appSystemDir/system/saveWebConDialog.js
@@ -47,14 +47,14 @@ function makeMenuMapStr(){
     switch(true){
         case onSearchBtn === "OFF":
             return [
-                `clickMenuFilePath=${leftMenuListFilePath}!longPressMenuFilePath=${leftLongPressMenuListFilePath}!dismissType=longpress!iconName=back`,
-                `clickMenuFilePath=${rightMenuListFilePath}!iconName=download_done`,
+                `clickMenuFilePath=${leftMenuListFilePath}?longPressMenuFilePath=${leftLongPressMenuListFilePath}?dismissType=longpress?iconName=back`,
+                `clickMenuFilePath=${rightMenuListFilePath}?iconName=download_done`,
             ].join("|");
         default:
             return [
-                `clickMenuFilePath=${leftMenuListFilePath}!longPressMenuFilePath=${leftLongPressMenuListFilePath}!dismissType=longpress!iconName=back`,
-                `clickMenuFilePath=${centerMenuListFilePath}!longPressMenuFilePath=${centerLongPressMenuListFilePath}!iconName=search`,
-                `clickMenuFilePath=${rightMenuListFilePath}!iconName=download_done`,
+                `clickMenuFilePath=${leftMenuListFilePath}?longPressMenuFilePath=${leftLongPressMenuListFilePath}?dismissType=longpress?iconName=back`,
+                `clickMenuFilePath=${centerMenuListFilePath}?longPressMenuFilePath=${centerLongPressMenuListFilePath}?iconName=search`,
+                `clickMenuFilePath=${rightMenuListFilePath}?iconName=download_done`,
             ].join("|");
     }
 }
diff --git a/app/src/main/assets/ubuntu_setup/support/cmd/isend b/app/src/main/assets/ubuntu_setup/support/cmd/isend
@@ -79,7 +79,7 @@ isend(){
 		concat(extraInts, "extraInts")
 		concat(extraLongs, "extraLongs")
 		concat(extraFloats, "extraFloats")
-		gsub(",", "!", output_con)
+		gsub(",", "?", output_con)
 		gsub(/\n/, ",\n", output_con)
 		print output_con
 	}' \

diff --git a/app/src/main/assets/ubuntu_setup/support/cmd/mplay b/app/src/main/assets/ubuntu_setup/support/cmd/mplay
@@ -81,7 +81,7 @@ mplay(){
 		concat(fannelRawName, "fannelRawName")
 		concat(listFilePath, "listFilePath")
 		concat(extraSettingMapStr, "extraSettingMapStr")
-		gsub(",", "!", output_con)
+		gsub(",", "?", output_con)
 		gsub(/\n/, ",\n", output_con)
 		print output_con
 	}' \

diff --git a/app/src/main/assets/ubuntu_setup/support/cmd/noti b/app/src/main/assets/ubuntu_setup/support/cmd/noti
@@ -108,7 +108,7 @@ noti(){
 		concat(delete_key, "delete")
 		concat(notificationStyle, "notificationStyle")
 		concat(button, "button")
-		gsub(",", "!", output_con)
+		gsub(",", "?", output_con)
 		gsub(/\n/, ",\n", output_con)
 		print output_con
 	}' \

diff --git a/app/src/main/assets/ubuntu_setup/support/cmd/send-broadcast b/app/src/main/assets/ubuntu_setup/support/cmd/send-broadcast
@@ -51,7 +51,7 @@ send-broadcast(){
 		ouput_con = ouput_con"intentType=broadcast\n"
 		concat(action, "action")
 		concat(extras, "extras")
-		gsub(",", "!", ouput_con)
+		gsub(",", "?", ouput_con)
 		gsub(/\n/, ",\n", ouput_con)
 		print ouput_con
 	}' \

diff --git a/app/src/main/assets/ubuntu_setup/support/cmd/tspeech b/app/src/main/assets/ubuntu_setup/support/cmd/tspeech
@@ -81,7 +81,7 @@ tspeech(){
 		concat(fannelRawName, "fannelRawName")
 		concat(listFilePath, "listFilePath")
 		concat(extraSettingMapStr, "extraSettingMapStr")
-		gsub(",", "!", output_con)
+		gsub(",", "?", output_con)
 		gsub(/\n/, ",\n", output_con)
 		print output_con
 	}' \

diff --git a/app/src/main/java/com/puutaro/commandclick/common/variable/LogTool.kt b/app/src/main/java/com/puutaro/commandclick/common/variable/LogTool.kt
@@ -197,7 +197,7 @@ object LogTool {
         ).let {
             QuoteTool.replaceBySurroundedIgnore(
                 it,
-                '!',
+                '?',
                 "\n !"
             )
         }.let {