Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/ConfigurationPages/HexEditorPage.ui	Tue Dec 28 19:10:38 2021 +0100
+++ b/eric7/Preferences/ConfigurationPages/HexEditorPage.ui	Wed Dec 29 16:38:32 2021 +0100
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>519</width>
-    <height>664</height>
+    <width>520</width>
+    <height>550</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -61,7 +61,7 @@
       <string>Address Area</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0" colspan="4">
+      <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="addressAreaCheckBox">
         <property name="toolTip">
          <string>Select whether the address area shall be shown</string>
@@ -71,7 +71,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="4">
+      <item row="1" column="0" colspan="2">
        <layout class="QHBoxLayout">
         <item>
          <widget class="QLabel" name="textLabel1_20">
@@ -123,52 +123,6 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel1_3_4">
-        <property name="text">
-         <string>Foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="addressAreaForeGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the foreground color of the address area</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="TextLabel1_3_2_4">
-        <property name="text">
-         <string>Background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QPushButton" name="addressAreaBackGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background color of the address area</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -197,7 +151,7 @@
       <string>Highlighting</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="4">
+      <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="highlightingCheckBox">
         <property name="toolTip">
          <string>Select whether changed data shall be highlighted</string>
@@ -207,107 +161,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel1_3_2">
-        <property name="text">
-         <string>Foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="highlightingForeGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the foreground color for highlighted data</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="TextLabel1_3_2_2">
-        <property name="text">
-         <string>Background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="highlightingBackGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background color for highlighted data</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Selection</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="TextLabel1_3_3">
-        <property name="text">
-         <string>Foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="selectionForeGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the foreground color of the selection</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="TextLabel1_3_2_3">
-        <property name="text">
-         <string>Background:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="selectionBackGroundButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background color of the selection</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -411,14 +264,8 @@
   <tabstop>overwriteCheckBox</tabstop>
   <tabstop>addressAreaCheckBox</tabstop>
   <tabstop>addressAreaWidthSpinBox</tabstop>
-  <tabstop>addressAreaForeGroundButton</tabstop>
-  <tabstop>addressAreaBackGroundButton</tabstop>
   <tabstop>asciiAreaCheckBox</tabstop>
   <tabstop>highlightingCheckBox</tabstop>
-  <tabstop>highlightingForeGroundButton</tabstop>
-  <tabstop>highlightingBackGroundButton</tabstop>
-  <tabstop>selectionForeGroundButton</tabstop>
-  <tabstop>selectionBackGroundButton</tabstop>
   <tabstop>monospacedFontButton</tabstop>
  </tabstops>
  <resources/>