Skip to content

Commit ceaba88

Browse files
authored
Merge branch 'qe3' into fix-issue-1060-qe3
2 parents 500b4d4 + 9ee8542 commit ceaba88

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

quickevent/app/quickevent/plugins/Event/src/eventconfig.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ EventConfig::EventConfig(QObject *parent)
3636
: QObject(parent)
3737
{
3838
}
39+
3940
QVariant EventConfig::value(const QStringList &path, const QVariant &default_value) const
4041
{
4142
//QF_ASSERT(knownKeys().contains(key), "Key " + key + " is not known key!", return QVariant());

quickevent/app/quickevent/plugins/Event/src/eventconfig.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class EventConfig : public QObject
3434
explicit EventConfig(QObject *parent = nullptr);
3535
public:
3636
QVariantMap values() const {return m_data;}
37-
//void setValues(const QVariantMap &vals);
3837
QVariant value(const QStringList &path, const QVariant &default_value = QVariant()) const;
3938
QVariant value(const QString &path, const QVariant &default_value = QVariant()) const {return value(path.split('.'), default_value);}
4039
void setValue(const QStringList &path, const QVariant &val);

quickevent/app/quickevent/plugins/Event/src/eventdialogwidget.ui

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
10-
<height>675</height>
9+
<width>469</width>
10+
<height>805</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -169,11 +169,14 @@
169169
</item>
170170
<item row="9" column="1">
171171
<widget class="QSpinBox" name="ed_handicapLength">
172+
<property name="specialValueText">
173+
<string>No handicap</string>
174+
</property>
172175
<property name="suffix">
173176
<string> min</string>
174177
</property>
175178
<property name="minimum">
176-
<number>1</number>
179+
<number>0</number>
177180
</property>
178181
<property name="maximum">
179182
<number>99999</number>
@@ -182,7 +185,7 @@
182185
<number>10</number>
183186
</property>
184187
<property name="value">
185-
<number>50</number>
188+
<number>0</number>
186189
</property>
187190
</widget>
188191
</item>
@@ -383,7 +386,7 @@
383386
source - ORIS-&gt;Event-&gt;Information-&gt;Event key</string>
384387
</property>
385388
<property name="alignment">
386-
<set>Qt::AlignCenter</set>
389+
<set>Qt::AlignmentFlag::AlignCenter</set>
387390
</property>
388391
</widget>
389392
</item>
@@ -404,7 +407,7 @@ source - ORIS-&gt;Event-&gt;Information-&gt;Event key</string>
404407
<item row="1" column="1">
405408
<widget class="QLineEdit" name="ed_orisImportId">
406409
<property name="alignment">
407-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
410+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
408411
</property>
409412
<property name="readOnly">
410413
<bool>true</bool>

0 commit comments

Comments
 (0)