🐛 fix: Fix some style problem and image info bugs

canisminor1990 · canisminor1990 · commit 3e0e9421a88a · 2023-11-29T11:05:07.000+08:00
diff --git a/javascript/main.js b/javascript/main.js
diff --git a/locales/de_DE.json b/locales/de_DE.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Benutzerdefiniert"
   },
+  "cancel": "Abbrechen",
+  "confirm": "Bestätigen",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme initialisiert, bitte warten..."
   },
diff --git a/locales/en_US.json b/locales/en_US.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Custom"
   },
+  "cancel": "Cancel",
+  "confirm": "Confirm",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme is initializing, please wait..."
   },
diff --git a/locales/es_ES.json b/locales/es_ES.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Personalizado"
   },
+  "cancel": "Cancelar",
+  "confirm": "Confirmar",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme se está inicializando, por favor espere..."
   },
diff --git a/locales/fr_FR.json b/locales/fr_FR.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Personnalisé"
   },
+  "cancel": "Annuler",
+  "confirm": "Confirmer",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme est en cours d'initialisation, veuillez patienter..."
   },
diff --git a/locales/ja_JP.json b/locales/ja_JP.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "カスタム"
   },
+  "cancel": "キャンセル",
+  "confirm": "確認",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme が初期化中です。お待ちください..."
   },
diff --git a/locales/ko_KR.json b/locales/ko_KR.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "사용자 정의"
   },
+  "cancel": "취소",
+  "confirm": "확인",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme이 초기화 중입니다. 잠시 기다려주세요..."
   },
diff --git a/locales/pt_BR.json b/locales/pt_BR.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Personalizado"
   },
+  "cancel": "Cancelar",
+  "confirm": "Confirmar",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme está inicializando, por favor aguarde..."
   },
diff --git a/locales/ru_RU.json b/locales/ru_RU.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "Пользовательский"
   },
+  "cancel": "Отмена",
+  "confirm": "Подтвердить",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme инициализируется, пожалуйста, подождите..."
   },
diff --git a/locales/zh_CN.json b/locales/zh_CN.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "自定义"
   },
+  "cancel": "取消",
+  "confirm": "确认",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme 正在初始化，请稍候..."
   },
diff --git a/locales/zh_HK.json b/locales/zh_HK.json
@@ -4,6 +4,8 @@
     "lobe": "LobeHub",
     "custom": "自定義"
   },
+  "cancel": "取消",
+  "confirm": "確認",
   "custom": {
     "initializing": "StableDiffusion / LobeTheme 正在初始化，請稍候..."
   },
diff --git a/src/features/Setting/Form/Footer.tsx b/src/features/Setting/Form/Footer.tsx
@@ -1,4 +1,4 @@
-import { Button } from 'antd';
+import { Button, Popconfirm } from 'antd';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -16,9 +16,17 @@ const Footer = memo(() => {
 
   return (
     <>
-      <Button danger onClick={onReset} style={{ borderRadius: 4 }} type="text">
-        {t('setting.button.reset')}
-      </Button>
+      <Popconfirm
+        cancelText={t('cancel')}
+        okText={t('confirm')}
+        okType={'danger'}
+        onConfirm={onReset}
+        title={t('setting.button.reset')}
+      >
+        <Button danger style={{ borderRadius: 4 }}>
+          {t('setting.button.reset')}
+        </Button>
+      </Popconfirm>
       <Button htmlType="submit" style={{ borderRadius: 4 }} type="primary">
         {t('setting.button.submit')}
       </Button>
diff --git a/src/modules/ImageInfo/features/formatInfo.ts b/src/modules/ImageInfo/features/formatInfo.ts
@@ -23,9 +23,20 @@ export const formatInfo = (info: string) => {
     configs[items[0].trim()] = items[1].trim();
   }
 
+  let position = data[0];
+  let negative = data[2] ? data[1] : '';
+
+  if (position.includes('Negative prompt:')) {
+    negative = position;
+    position = '';
+  }
+
+  position = formatPrompt(position);
+  negative = formatPrompt(negative.split('Negative prompt: ')[1]);
+
   return {
     config: configs,
-    negative: formatPrompt(data[2] ? decodeURI(data[1]).split('Negative prompt: ')[1] : ''),
-    positive: formatPrompt(decodeURI(data[0])),
+    negative: negative,
+    positive: position,
   };
 };
diff --git a/src/styles/components/gallery.ts b/src/styles/components/gallery.ts
@@ -84,13 +84,17 @@ export default (token: Theme) => {
     [id$='_gallery_container'] {
       min-height: 470px;
 
-      > div {
+      > div:not([id$='_generate_box']) {
         flex-grow: 1;
 
         [id$='_gallery'] {
           flex-grow: 1;
         }
       }
     }
+
+    div[id^='img2img_'].block.gradio-image {
+      height: auto !important;
+    }
   `;
 };
