色々修正

Author: new-sankaku

.claude/settings.local.json

@@ -22,7 +22,15 @@
       "Bash(taskkill:*)",
       "Bash(netstat:*)",
       "Bash(ls:*)",
-      "Bash(dir /s /b \"C:\\\\01_work\\\\00_Git\\\\manga-editor-desu\\\\js\\\\*generator*\")"
+      "Bash(dir /s /b \"C:\\\\01_work\\\\00_Git\\\\manga-editor-desu\\\\js\\\\*generator*\")",
+      "Bash(node format-translations.js:*)",
+      "Bash(move:*)",
+      "Bash(node format-translations.cjs:*)",
+      "Bash(ren:*)",
+      "Bash(node -c:*)",
+      "Bash(node -e:*)",
+      "Bash(dd:*)",
+      "Bash(node debug-json.cjs:*)"
     ]
   },
   "hooks": {

css/ui/bottom-bar.css

@@ -36,9 +36,7 @@ display:flex;
 justify-content:center;
 align-items:center;
 font-size:14px;
-text-transform:uppercase;
 letter-spacing:2px;
-/* transition:background-color 0.3s ease; */
 }
 
 .btm-drawer-handle:hover {

index.html

@@ -275,9 +275,9 @@
                                 </a>
                             </li>
                             <li>
-                                <a class="dropdown-item" href="#" id="settingsLoad">
-                                    <i class="material-icons">settings</i> <span data-i18n="settingsLoad">Settings
-                                        Load</span>
+                                <a class="dropdown-item" href="#" onclick="inputImageFile()">
+                                    <span class="material-symbols-outlined">image</span>
+                                    <span data-i18n="imageImport">画像インポート</span>
                                 </a>
                             </li>
                             <li>
@@ -339,7 +339,7 @@
                             <div class="A1111_api_content">
                                 <li>
                                     <label>
-                                        <h5 data-i18n="">WebUI(A1111/Forge)</h5>
+                                        <h5>WebUI(A1111/Forge)</h5>
                                     </label>
                                     <label for="sdWebUIPageUrl">
                                         <span data-i18n="apiUrl">URL</span>
@@ -844,7 +844,7 @@ <h5 data-i18n="comfyUI">ComfyUI</h5>
                     <button id="add" onclick="panelAllChange()"><i class="material-icons">border_all</i> <span
                             data-i18n="all_change">All Change</span></button>
                     <button id="edit" onclick="Edit()"><i class="material-icons">edit_square</i> <span
-                            data-i18n="editingMode">Editing Mode</span></button>
+                            data-i18n="editModeOn">Panel Edit Mode ON</span></button>
 
                     <hr>
                     <div class="input-group">
@@ -1727,26 +1727,7 @@ <h5 data-i18n="comfyUI">ComfyUI</h5>
                 <div class="area-header">
 
 
-                    <button id="inputImageFile" onclick="inputImageFile()">
-                        <span class="material-symbols-outlined">image</span>
-                        <input type="file" id="imageInput" multiple style="display: none;" accept="image/*">
-                        <label data-i18n="importButton" style="margin: 0px; ">
-                            Import
-                        </label>
-                    </button>
-
-                    <button id="cropMode">
-                        <i class="material-icons">crop_free</i>
-                        <label data-i18n="cropButton" style="margin: 0px; ">
-                            切り抜き
-                        </label>
-                    </button>
-                    <button id="crop" anim="glow" class="toggled">
-                        <i class="material-icons">crop</i>
-                        <label data-i18n="cropButton" style="margin: 0px; ">
-                            切り抜き
-                        </label>
-                    </button>
+                    <input type="file" id="imageInput" multiple style="display: none;" accept="image/*">
 
                     <button id="clearMode" onclick="operationModeClear()">
                         <span class="material-symbols-outlined">cancel_presentation</span>
@@ -1859,7 +1840,7 @@ <h5 data-i18n="comfyUI">ComfyUI</h5>
 
                         <div id="comfyUIWorkflowId" class="controls-mini">
                             <div class="input-group" data-group="comfyUIWorkflowGroup">
-                                <button id="openWorkflowButton">ComfyUI Workflow's Settings</button>
+                                <button id="openWorkflowButton" data-i18n="comfyuiWorkflowSettings">ComfyUI Workflows設定</button>
                             </div>
                         </div>
 
@@ -2017,7 +1998,7 @@ <h5 data-i18n="comfyUI">ComfyUI</h5>
 
     <div id="btm-drawer" class="btm-drawer btm-closed" style="display: none;">
         <div id="btm-drawer-handle" class="btm-drawer-handle neon-text">
-            OPEN
+            OPEN (Ctrl+B)
         </div>
         <div class="btm-drawer-content">
             <div id="btm-image-container" class="btm-image-container"></div>

js/fabric/fabric-management.js

@@ -106,15 +106,13 @@ eventLogger.trace('11: selection:cleared');
 if (cropFrame) {
 canvas.remove(cropFrame);
 cropFrame=null;
-$('crop').style.display='none';
 }
 });
 canvas.on('selection:updated',function() {
 eventLogger.trace('12: selection:updated');
 if (cropFrame&&canvas.getActiveObject()!==cropFrame) {
 canvas.remove(cropFrame);
 cropFrame=null;
-$('crop').style.display='none';
 }
 });
 //Crop Mode from finish

js/project-management.js

@@ -17,9 +17,7 @@ var apiMode=apis.A1111;
 
 document.addEventListener("DOMContentLoaded",function () {
 var settingsSave=$("settingsSave");
-var settingsLoad=$("settingsLoad");
 settingsSave.addEventListener("click",function () {saveSettingsLocalStrage();});
-settingsLoad.addEventListener("click",function () {loadSettingsLocalStrage();});
 
 var saveButton=$("projectSave");
 var loadButton=$("projectLoad");

js/shortcut.js

@@ -27,6 +27,8 @@ moveDownFast: 'shift+down',
 projectSave:!isMacOs ? 'ctrl+s' : 'command+s',
 projectLoad:!isMacOs ? 'ctrl+o' : 'command+o',
 toggleBottomBar:!isMacOs ? 'ctrl+b' : 'command+b',
+imageDownload:!isMacOs ? 'ctrl+d' : 'command+d',
+settingsSave:!isMacOs ? 'ctrl+shift+s' : 'command+shift+s',
 }
 
 var isLongPressDirection=false;
@@ -188,6 +190,30 @@ btmToggleDrawer();
 e.preventDefault();
 });
 
+// bind image download shortcut
+hotkeys(hotkeysMap.imageDownload,'all',function (e) {
+if (!isEditableTagsActive()) {
+cropAndDownload();
+e.preventDefault();
+}
+});
+
+// bind settings save shortcut
+hotkeys(hotkeysMap.settingsSave,'all',function (e) {
+if (!isEditableTagsActive()) {
+$('settingsSave').click();
+e.preventDefault();
+}
+});
+
+// bind enter key for crop completion
+hotkeys('enter','all',function (e) {
+if (!isEditableTagsActive()&&cropFrame) {
+completeCrop();
+e.preventDefault();
+}
+});
+
 // bind fast move shortcuts (10px)
 hotkeys(hotkeysMap.moveLeftFast,'all',function (e) {
 moveActiveObjectFast('left',e);

js/sidebar/panel/panel-manager.js

@@ -441,8 +441,23 @@ return scale;
 
 function Edit() {
 var poly=canvas.getActiveObject();
-if (!poly) return;
-
+var editButton=$("edit");
+if (!poly) {
+createToast(getText("editModeNotPanel"),"");
+return;
+}
+if (!isPanel(poly)) {
+createToast(getText("editModeNotPanel"),"");
+return;
+}
+if (!(poly instanceof fabric.Polygon)) {
+createToast(getText("editModeNotPolygon"),"");
+return;
+}
+if (!poly.points||poly.points.length<3) {
+createToast(getText("editModeNoPoints"),"");
+return;
+}
 poly.edit=!poly.edit;
 if (poly.edit) {
 var lastControl=poly.points.length-1;
@@ -460,9 +475,15 @@ pointIndex: index,
 });
 return acc;
 },{});
+activeClearButton();
+editButton.classList.add("selected");
+editButton.querySelector("span").textContent=getText("editModeOff");
 } else {
 poly.cornerStyle="rect";
 poly.controls=fabric.Object.prototype.controls;
+nonActiveClearButton();
+editButton.classList.remove("selected");
+editButton.querySelector("span").textContent=getText("editModeOn");
 }
 poly.hasBorders=!poly.edit;
 canvas.requestRenderAll();

js/ui/bottom-bar.js

@@ -23,7 +23,7 @@ btmUpdateHandleText();
 }
 
 function btmUpdateHandleText() {
-btmDrawerHandle.textContent=btmDrawer.classList.contains("btm-closed") ? "OPEN" : "CLOSE";
+btmDrawerHandle.textContent=btmDrawer.classList.contains("btm-closed") ? "OPEN (Ctrl+B)" : "CLOSE (Ctrl+B)";
 }
 
 

js/ui/canvas-object-menu.js

@@ -109,6 +109,7 @@ var clearLeftClipPath=createObjectMenuButton('clearLeftClipPath');
 
 var flipHorizontal=createObjectMenuButton('flipHorizontal');
 var flipVertical=createObjectMenuButton('flipVertical');
+var cropImage=createObjectMenuButton('cropImage');
 
 var font=createObjectMenuDiv('fontSelectorMenu');
 
@@ -169,7 +170,7 @@ menuItems.push(canvasFit);
 
 menuItems.push(flipHorizontal);
 menuItems.push(flipVertical);
-
+menuItems.push(cropImage);
 }
 }else if (isSpeechBubbleSVG(activeObject)||isSpeechBubbleText(activeObject)) {
 menuItems=[visible];
@@ -439,6 +440,11 @@ case 'clearRightClipPath':
 case 'clearLeftClipPath':
 removeClipPath(activeObject,action);
 break;
+case 'cropImage':
+if(isImage(activeObject)){
+startCropMode(activeObject);
+}
+break;
 }
 canvas.requestRenderAll();
 closeMenu();