From 3d184073d7ac11128e34cd21e823bcdcbdeb0251 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Tue, 5 Mar 2024 10:29:05 +0300
Subject: [PATCH] Adjust HTML editor / add-on config editor font (#3054)

* Reduce font size of add-on config editor

* Change HTML editor font to Consolas

* Remove unused form
---
 qt/aqt/addons.py            |  2 +-
 qt/aqt/forms/__init__.py    |  1 -
 qt/aqt/forms/editaddon.py   |  8 ----
 qt/aqt/forms/editaddon.ui   | 76 -------------------------------------
 ts/editor/CodeMirror.svelte |  1 +
 5 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 qt/aqt/forms/editaddon.py
 delete mode 100644 qt/aqt/forms/editaddon.ui

diff --git a/qt/aqt/addons.py b/qt/aqt/addons.py
index c8d9a1296..70561b9a0 100644
--- a/qt/aqt/addons.py
+++ b/qt/aqt/addons.py
@@ -1585,7 +1585,7 @@ class ConfigEditor(QDialog):
         font_mono = QFont("Consolas")
         if not font_mono.exactMatch():
             font_mono = QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont)
-        font_mono.setPointSize(font_mono.pointSize() + 1)
+        font_mono.setPointSize(font_mono.pointSize())
         self.form.editor.setFont(font_mono)
 
     def updateHelp(self) -> None:
diff --git a/qt/aqt/forms/__init__.py b/qt/aqt/forms/__init__.py
index 313645e8f..9484f91ec 100644
--- a/qt/aqt/forms/__init__.py
+++ b/qt/aqt/forms/__init__.py
@@ -14,7 +14,6 @@ from . import (
     customstudy,
     dconf,
     debug,
-    editaddon,
     editcurrent,
     edithtml,
     emptycards,
diff --git a/qt/aqt/forms/editaddon.py b/qt/aqt/forms/editaddon.py
deleted file mode 100644
index 6fdc2f267..000000000
--- a/qt/aqt/forms/editaddon.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from typing import TYPE_CHECKING
-
-from aqt.qt import qtmajor
-
-if qtmajor > 5 or TYPE_CHECKING:
-    from _aqt.forms.editaddon_qt6 import *
-else:
-    from _aqt.forms.editaddon_qt5 import *  # type: ignore
diff --git a/qt/aqt/forms/editaddon.ui b/qt/aqt/forms/editaddon.ui
deleted file mode 100644
index 75eb94473..000000000
--- a/qt/aqt/forms/editaddon.ui
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>753</width>
-    <height>475</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QPlainTextEdit" name="text">
-     <property name="font">
-      <font>
-       <family>Courier 10 Pitch</family>
-      </font>
-     </property>
-     <property name="plainText">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/ts/editor/CodeMirror.svelte b/ts/editor/CodeMirror.svelte
index e72036748..df27a21ca 100644
--- a/ts/editor/CodeMirror.svelte
+++ b/ts/editor/CodeMirror.svelte
@@ -103,6 +103,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
         :global(.CodeMirror) {
             height: auto;
+            font-family: Consolas monospace;
         }
 
         :global(.CodeMirror-wrap pre) {