diff --git a/LunaTranslator/LunaTranslator/gui/setting_display_text.py b/LunaTranslator/LunaTranslator/gui/setting_display_text.py index 2ce35930..2b0e7334 100644 --- a/LunaTranslator/LunaTranslator/gui/setting_display_text.py +++ b/LunaTranslator/LunaTranslator/gui/setting_display_text.py @@ -24,6 +24,8 @@ from gui.usefulwidget import ( listediter, FocusFontCombo, LFocusCombo, + getspinbox, + LLabel, FocusDoubleSpin, FocusSpin, SplitLine, @@ -38,6 +40,7 @@ def __changeuibuttonstate(self, x): except: pass + def __changeuibuttonstate2(self, x): gobject.baseobject.translation_ui.refreshtoolicon() @@ -105,6 +108,40 @@ def createinternalfontsettings(self, forml: LFormLayout, group, _type): line = __internal["argstype"][key] name = line["name"] _type = line["type"] + if key in ["width", "shadowR_ex"]: + if key == "width": + keyx = "width_rate" + elif key == "shadowR_ex": + keyx = "shadowR" + widthline = __internal["argstype"].get(keyx, None) + if widthline is not None: + forml.addRow( + name, + getboxlayout( + [ + getspinbox( + widthline.get("min", 0), + widthline.get("max", 100), + dd, + keyx, + True, + widthline.get("step", 0.1), + ), + LLabel("x_字体大小_+"), + getspinbox( + line.get("min", 0), + line.get("max", 100), + dd, + key, + True, + line.get("step", 0.1), + ), + ] + ), + ) + continue + elif key in ["width_rate", "shadowR"]: + continue if _type == "colorselect": lineW = getcolorbutton( dd, diff --git a/LunaTranslator/files/defaultconfig/config.json b/LunaTranslator/files/defaultconfig/config.json index 3637c404..81cd47de 100644 --- a/LunaTranslator/files/defaultconfig/config.json +++ b/LunaTranslator/files/defaultconfig/config.json @@ -54,14 +54,14 @@ "step": 1 }, "shadowR": { - "name": "阴影半径_字体倍率", + "name": "阴影半径", "type": "spin", "min": 0, "max": 10, "step": 0.01 }, "shadowR_ex": { - "name": "阴影半径_固定值", + "name": "阴影半径", "type": "spin", "min": 0, "max": 100, @@ -108,14 +108,14 @@ "type": "colorselect" }, "width": { - "name": "描边宽度_固定值", + "name": "描边宽度", "type": "spin", "min": 0, "max": 100, "step": 0.1 }, "width_rate": { - "name": "描边宽度_字体倍率", + "name": "描边宽度", "type": "spin", "min": 0, "max": 10, @@ -174,14 +174,14 @@ "type": "colorselect" }, "width": { - "name": "描边宽度_固定值", + "name": "描边宽度", "type": "spin", "min": 0, "max": 100, "step": 0.1 }, "width_rate": { - "name": "描边宽度_字体倍率", + "name": "描边宽度", "type": "spin", "min": 0, "max": 10, @@ -217,14 +217,14 @@ "step": 1 }, "shadowR": { - "name": "阴影半径_字体倍率", + "name": "阴影半径", "type": "spin", "min": 0, "max": 10, "step": 0.01 }, "shadowR_ex": { - "name": "阴影半径_固定值", + "name": "阴影半径", "type": "spin", "min": 0, "max": 100, diff --git a/LunaTranslator/files/lang/ar.json b/LunaTranslator/files/lang/ar.json index ae2c1653..da3db5c1 100644 --- a/LunaTranslator/files/lang/ar.json +++ b/LunaTranslator/files/lang/ar.json @@ -733,8 +733,6 @@ "填充颜色": "ملء اللون", "阴影强度": "كثافة الظل", "阴影半径": "مكان الظل", - "字体倍率": "معدل الخط", - "固定值": "قيمة ثابتة", "可选取的": "قابل للاختيار", "投影距离": "المسافة المتوقعة", "反转颜色": "عكس اللون", diff --git a/LunaTranslator/files/lang/cht.json b/LunaTranslator/files/lang/cht.json index 2f4979cc..ea680e68 100644 --- a/LunaTranslator/files/lang/cht.json +++ b/LunaTranslator/files/lang/cht.json @@ -733,8 +733,6 @@ "填充颜色": "填充顏色", "阴影强度": "陰影強度", "阴影半径": "陰影半徑", - "字体倍率": "字體倍率", - "固定值": "固定值", "可选取的": "可選取的", "投影距离": "投影距離", "反转颜色": "反轉顏色", @@ -856,4 +854,4 @@ "增强效果": "增強效果", "显示/隐藏翻译": "顯示 / 隱藏翻譯", "全局": "全域" -} +} \ No newline at end of file diff --git a/LunaTranslator/files/lang/cs.json b/LunaTranslator/files/lang/cs.json index 903d7e66..279200aa 100644 --- a/LunaTranslator/files/lang/cs.json +++ b/LunaTranslator/files/lang/cs.json @@ -739,8 +739,6 @@ "填充颜色": "barva výplně", "阴影强度": "Intenzita stínu", "阴影半径": "Poloměr stínu", - "字体倍率": "Zvětšení písma", - "固定值": "Pevná hodnota", "投影距离": "Projekční vzdálenost", "反转颜色": "invertovat barvy", "内嵌": "Vložené", diff --git a/LunaTranslator/files/lang/de.json b/LunaTranslator/files/lang/de.json index 7d0c5828..c7ef9b9a 100644 --- a/LunaTranslator/files/lang/de.json +++ b/LunaTranslator/files/lang/de.json @@ -739,8 +739,6 @@ "填充颜色": "Füllfarbe", "阴影强度": "Schattenintensität", "阴影半径": "Schattenradius", - "字体倍率": "Schriftvergrößerung", - "固定值": "Festwert", "投影距离": "Projektionsabstand", "反转颜色": "Farben invertieren", "内嵌": "Eingebettet", diff --git a/LunaTranslator/files/lang/en.json b/LunaTranslator/files/lang/en.json index 00ff0935..f6535a26 100644 --- a/LunaTranslator/files/lang/en.json +++ b/LunaTranslator/files/lang/en.json @@ -732,8 +732,6 @@ "填充颜色": "Fill Color", "阴影强度": "Shadow Intensity", "阴影半径": "Shadow Radius", - "字体倍率": "Font Magnification", - "固定值": "Fixed Value", "可选取的": "Selectable", "投影距离": "Projection Distance", "反转颜色": "Invert Colors", diff --git a/LunaTranslator/files/lang/es.json b/LunaTranslator/files/lang/es.json index 07bab6b5..6bdeab37 100644 --- a/LunaTranslator/files/lang/es.json +++ b/LunaTranslator/files/lang/es.json @@ -733,8 +733,6 @@ "填充颜色": "Color de relleno", "阴影强度": "Intensidad de la sombra", "阴影半径": "Radio de sombra", - "字体倍率": "Multiplicación de fuentes", - "固定值": "Valor fijo", "可选取的": "Seleccionable", "投影距离": "Distancia de proyección", "反转颜色": "Invertir color", diff --git a/LunaTranslator/files/lang/fr.json b/LunaTranslator/files/lang/fr.json index 8747333c..8828e8d6 100644 --- a/LunaTranslator/files/lang/fr.json +++ b/LunaTranslator/files/lang/fr.json @@ -733,8 +733,6 @@ "填充颜色": "Couleur de remplissage", "阴影强度": "Intensité de l'ombre", "阴影半径": "Rayon d'ombre", - "字体倍率": "Multiplication des polices", - "固定值": "Valeur fixe", "可选取的": "Sélectionnable", "投影距离": "Distance de projection", "反转颜色": "Inverser les couleurs", diff --git a/LunaTranslator/files/lang/it.json b/LunaTranslator/files/lang/it.json index 68499546..90c9f4f5 100644 --- a/LunaTranslator/files/lang/it.json +++ b/LunaTranslator/files/lang/it.json @@ -733,8 +733,6 @@ "填充颜色": "colore di riempimento", "阴影强度": "Intensità ombra", "阴影半径": "Raggio ombra", - "字体倍率": "Ingrandimento dei caratteri", - "固定值": "Valore fisso", "可选取的": "Selezionabile", "投影距离": "Distanza di proiezione", "反转颜色": "inverti colori", diff --git a/LunaTranslator/files/lang/ja.json b/LunaTranslator/files/lang/ja.json index ec587e21..142dfc91 100644 --- a/LunaTranslator/files/lang/ja.json +++ b/LunaTranslator/files/lang/ja.json @@ -733,8 +733,6 @@ "填充颜色": "塗りつぶしカラーぬりつぶしからー", "阴影强度": "シャドウ強度", "阴影半径": "シャドウ半径", - "字体倍率": "フォント倍率", - "固定值": "固定値", "可选取的": "選択可能", "投影距离": "とうえいきょり", "反转颜色": "色を反転", diff --git a/LunaTranslator/files/lang/ko.json b/LunaTranslator/files/lang/ko.json index 86205436..d0221f80 100644 --- a/LunaTranslator/files/lang/ko.json +++ b/LunaTranslator/files/lang/ko.json @@ -733,8 +733,6 @@ "填充颜色": "채우기 색상", "阴影强度": "그림자 강도", "阴影半径": "그림자 반지름", - "字体倍率": "글꼴 배율", - "固定值": "고정값", "可选取的": "선택 가능", "投影距离": "투영 거리", "反转颜色": "색상 반전", diff --git a/LunaTranslator/files/lang/nl.json b/LunaTranslator/files/lang/nl.json index a3269dd1..b4d44ee5 100644 --- a/LunaTranslator/files/lang/nl.json +++ b/LunaTranslator/files/lang/nl.json @@ -739,8 +739,6 @@ "填充颜色": "vulkleur", "阴影强度": "Schaduwintensiteit", "阴影半径": "Schaduwstraal", - "字体倍率": "Lettertypevergroting", - "固定值": "Vaste waarde", "投影距离": "Projectieafstand", "反转颜色": "kleuren omkeren", "内嵌": "Ingesloten", diff --git a/LunaTranslator/files/lang/pl.json b/LunaTranslator/files/lang/pl.json index 9876a7eb..1adf7fd9 100644 --- a/LunaTranslator/files/lang/pl.json +++ b/LunaTranslator/files/lang/pl.json @@ -733,8 +733,6 @@ "填充颜色": "kolor wypełnienia", "阴影强度": "Intensywność cienia", "阴影半径": "Promień cienia", - "字体倍率": "Powiększenie czcionki", - "固定值": "Wartość stała", "可选取的": "Wybór", "投影距离": "Odległość projekcji", "反转颜色": "odwróć kolory", diff --git a/LunaTranslator/files/lang/pt.json b/LunaTranslator/files/lang/pt.json index e697b626..7f3e0c1f 100644 --- a/LunaTranslator/files/lang/pt.json +++ b/LunaTranslator/files/lang/pt.json @@ -739,8 +739,6 @@ "填充颜色": "cor do preenchimento", "阴影强度": "Intensidade da sombra", "阴影半径": "Raio da sombra", - "字体倍率": "Ampliação do tipo de letra", - "固定值": "Valor fixo", "投影距离": "Distância de projeção", "反转颜色": "inverter as cores", "内嵌": "Incorporado", diff --git a/LunaTranslator/files/lang/ru.json b/LunaTranslator/files/lang/ru.json index 2c8d76fc..a6e5bf33 100644 --- a/LunaTranslator/files/lang/ru.json +++ b/LunaTranslator/files/lang/ru.json @@ -733,8 +733,6 @@ "填充颜色": "Цвет заполнения", "阴影强度": "Интенсивность тени", "阴影半径": "Радиус тени", - "字体倍率": "Увеличить шрифт", - "固定值": "Постоянная величина", "可选取的": "Выбор", "投影距离": "Расстояние проекции", "反转颜色": "Инвертировать цвет", diff --git a/LunaTranslator/files/lang/sv.json b/LunaTranslator/files/lang/sv.json index 9e678259..b75f0254 100644 --- a/LunaTranslator/files/lang/sv.json +++ b/LunaTranslator/files/lang/sv.json @@ -739,8 +739,6 @@ "填充颜色": "fyllningsfärg", "阴影强度": "Skuggintensitet", "阴影半径": "Skuggradie", - "字体倍率": "Teckensförstoring", - "固定值": "Fast värde", "投影距离": "Projektionsavstånd", "反转颜色": "invertera färger", "内嵌": "Inbäddad", diff --git a/LunaTranslator/files/lang/th.json b/LunaTranslator/files/lang/th.json index 2a6af16f..0d3bcfd1 100644 --- a/LunaTranslator/files/lang/th.json +++ b/LunaTranslator/files/lang/th.json @@ -733,8 +733,6 @@ "填充颜色": "เติมสี", "阴影强度": "ความเข้มเงา", "阴影半径": "รัศมีเงา", - "字体倍率": "แบบอักษรคูณ", - "固定值": "ค่าคงที่", "可选取的": "เลือกได้", "投影距离": "ระยะการฉาย", "反转颜色": "การย้อนกลับสี", diff --git a/LunaTranslator/files/lang/tr.json b/LunaTranslator/files/lang/tr.json index 9881cf66..c42cf707 100644 --- a/LunaTranslator/files/lang/tr.json +++ b/LunaTranslator/files/lang/tr.json @@ -733,8 +733,6 @@ "填充颜色": "doldurum rengi", "阴影强度": "Gölge şiddeti", "阴影半径": "Gölge Yardımcısı", - "字体倍率": "Yazıtipi büyütmesi", - "固定值": "Tam değer", "可选取的": "Seçilebilir", "投影距离": "Projeksyon mesafesi", "反转颜色": "Ters renkler", diff --git a/LunaTranslator/files/lang/uk.json b/LunaTranslator/files/lang/uk.json index 73aa5176..1170b50e 100644 --- a/LunaTranslator/files/lang/uk.json +++ b/LunaTranslator/files/lang/uk.json @@ -733,8 +733,6 @@ "填充颜色": "колір заповнення", "阴影强度": "Інтензитет тіні", "阴影半径": "Радіус тіні", - "字体倍率": "Збільшення шрифту", - "固定值": "Визначене значення", "可选取的": "Вибраний", "投影距离": "Відстань проекту", "反转颜色": "звернути кольори", diff --git a/LunaTranslator/files/lang/vi.json b/LunaTranslator/files/lang/vi.json index 28f20acd..2cd2a218 100644 --- a/LunaTranslator/files/lang/vi.json +++ b/LunaTranslator/files/lang/vi.json @@ -733,8 +733,6 @@ "填充颜色": "Màu tô", "阴影强度": "Cường độ bóng", "阴影半径": "Bán kính bóng", - "字体倍率": "Độ phóng đại phông chữ", - "固定值": "Giá trị cố định", "可选取的": "Chọn", "投影距离": "Khoảng cách chiếu", "反转颜色": "Đảo ngược màu", diff --git a/LunaTranslator/files/lang/zh.json b/LunaTranslator/files/lang/zh.json index 48105d7a..d731d074 100644 --- a/LunaTranslator/files/lang/zh.json +++ b/LunaTranslator/files/lang/zh.json @@ -740,8 +740,6 @@ "填充颜色": "", "阴影强度": "", "阴影半径": "", - "字体倍率": "", - "固定值": "", "投影距离": "", "反转颜色": "", "内嵌": "",