Tweaks on widget sizes and UI

* changed layout of preferences
* removed geometry attributes from ui

Author: Cubitect

rc/lang/de_DE.qm

@@ -6,7 +6,7 @@
 
 #define VERS_MAJOR 3
 #define VERS_MINOR 4
-#define VERS_PATCH -1   // negative patch number designates a development version
+#define VERS_PATCH 0   // negative patch number designates a development version
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)

rc/lang/de_DE.ts

@@ -32,16 +32,15 @@ BiomeColorDialog::BiomeColorDialog(QWidget *parent, QString initrc, int mc, int
 
     QPushButton *button;
     ui->gridLayout->setSpacing(2);
-    QIcon alignicon = getColorIcon(QColor(0,0,0,0));
 
     separator = new QLabel(tr("Currently inactive biomes:"), this);
     separator->setVisible(false);
 
-    button = new QPushButton(QIcon(alignicon), tr("All to default"), this);
+    button = new QPushButton(getColorIcon(QColor(255,255,255,128)), tr("All to default"), this);
     connect(button, &QPushButton::clicked, this, &BiomeColorDialog::onAllToDefault);
     ui->gridLayout->addWidget(button, 0, 1);
 
-    button = new QPushButton(QIcon(alignicon), tr("All to dimmed"), this);
+    button = new QPushButton(getColorIcon(QColor(0,0,0,128)), tr("All to dimmed"), this);
     connect(button, &QPushButton::clicked, this, &BiomeColorDialog::onAllToDimmed);
     ui->gridLayout->addWidget(button, 0, 2);
 

src/aboutdialog.h

@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>BiomeColorDialog</class>
  <widget class="QDialog" name="BiomeColorDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>580</width>
-    <height>600</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Biome Color Editor</string>
   </property>
@@ -55,18 +47,13 @@
    </item>
    <item row="1" column="0" colspan="3">
     <widget class="QScrollArea" name="scrollArea">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>562</width>
-        <height>521</height>
-       </rect>
-      </property>
       <property name="styleSheet">
        <string notr="true">text-align: left; padding: 2px;</string>
       </property>

src/biomecolordialog.cpp

@@ -20,14 +20,6 @@
 #include <QInputDialog>
 #include <QFontMetricsF>
 
-#define SETUP_TEMPCAT_SPINBOX(B) do {\
-        tempsboxes[B] = new SpinExclude();\
-        QLabel *l = new QLabel(#B);\
-        ui->gridLayoutTemps->addWidget(tempsboxes[B], (B) % Special, (B) / Special * 2 + 0);\
-        ui->gridLayoutTemps->addWidget(l, (B) % Special, (B) / Special * 2 + 1);\
-        if (mc > MC_1_6 && mc <= MC_1_17) \
-            l->setToolTip(getTip(mc, L_SPECIAL_1024, 0, (B) % Special + ((B)>=Special?256:0) ));\
-    } while (0)
 
 static QString getTip(int mc, int layer, uint32_t flags, int id)
 {
@@ -70,12 +62,17 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
     ui->textEditLua->setTabStopDistance(QFontMetricsF(ui->textEditLua->font()).horizontalAdvance(" ") * 4);
 #endif
 
+    ui->lineSummary->setMinimumWidth(
+                ui->lineSummary->minimumSizeHint().width() +
+                QFontMetrics(ui->lineSummary->font()).horizontalAdvance('#') * 26
+                );
+
     // prevent bold font of group box title getting inherited
-    QFont dfont = font();
-    dfont.setBold(false);
-    const QList<QWidget*> children = ui->groupBoxPosition->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly);
-    for (QWidget *w : children)
-        w->setFont(dfont);
+    //QFont dfont = font();
+    //dfont.setBold(false);
+    //const QList<QWidget*> children = ui->groupBoxPosition->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly);
+    //for (QWidget *w : children)
+    //    w->setFont(dfont);
 
     int initindex = -1;
     const QVector<Condition> existing = parent->getConditions();
@@ -159,14 +156,14 @@ ConditionDialog::ConditionDialog(FormConditions *parent, Config *config, int mcv
 
     memset(tempsboxes, 0, sizeof(tempsboxes));
 
-    SETUP_TEMPCAT_SPINBOX(Oceanic);
-    SETUP_TEMPCAT_SPINBOX(Warm);
-    SETUP_TEMPCAT_SPINBOX(Lush);
-    SETUP_TEMPCAT_SPINBOX(Cold);
-    SETUP_TEMPCAT_SPINBOX(Freezing);
-    SETUP_TEMPCAT_SPINBOX(Special+Warm);
-    SETUP_TEMPCAT_SPINBOX(Special+Lush);
-    SETUP_TEMPCAT_SPINBOX(Special+Cold);
+    addTempCat(Oceanic, tr("Oceanic"));
+    addTempCat(Warm, tr("Warm"));
+    addTempCat(Lush, tr("Lush"));
+    addTempCat(Cold, tr("Cold"));
+    addTempCat(Freezing, tr("Freezing"));
+    addTempCat(Special+Warm, tr("Special Warm"));
+    addTempCat(Special+Lush, tr("Special Lush"));
+    addTempCat(Special+Cold, tr("Special Cold"));
 
     for (const StartPiece *sp = g_start_pieces; sp->stype >= 0; sp++)
     {
@@ -463,6 +460,18 @@ ConditionDialog::~ConditionDialog()
     delete ui;
 }
 
+void ConditionDialog::addTempCat(int temp, QString name)
+{
+    tempsboxes[temp] = new SpinExclude();
+    QLabel *l = new QLabel(name);
+    int c = temp / Special;
+    int r = temp % Special;
+    ui->gridLayoutTemps->addWidget(tempsboxes[temp], r, c * 2 + 0);
+    ui->gridLayoutTemps->addWidget(l, r, c * 2 + 1);
+    if (mc > MC_1_6 && mc <= MC_1_17)
+        l->setToolTip(getTip(mc, L_SPECIAL_1024, 0, r + (temp >= Special ? 256 : 0)));
+}
+
 void ConditionDialog::updateMode()
 {
     int filterindex = ui->comboBoxType->currentData().toInt();

src/biomecolordialog.ui

@@ -63,6 +63,22 @@ class ComboBoxDelegate : public QStyledItemDelegate
     QComboBox *combo;
 };
 
+// QLineEdit defaults to a style hint width 17 characters, which is too long for coordinates
+class CoordEdit : public QLineEdit
+{
+    Q_OBJECT
+public:
+    CoordEdit(QWidget *parent = nullptr) : QLineEdit(parent) {}
+
+    virtual QSize sizeHint() const override
+    {
+        QSize size = QLineEdit::minimumSizeHint();
+        QFontMetrics fm(font());
+        size.setWidth(size.width() + fm.horizontalAdvance("-30000000"));
+        return size;
+    }
+};
+
 class SpinExclude : public QSpinBox
 {
     Q_OBJECT
@@ -162,7 +178,7 @@ class ConditionDialog : public QDialog
     explicit ConditionDialog(FormConditions *parent, Config *config, int mc, QListWidgetItem *item = 0, Condition *initcond = 0);
     virtual ~ConditionDialog();
 
-    void addVariant(QString name, int biome, int variant);
+    void addTempCat(int temp, QString name);
     void updateMode();
     void updateBiomeSelection();
     int warnIfBad(Condition cond);