Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-22 08:36:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/huderlem/porymap into event-selection

Browse Source
This commit is contained in:
GriffinR
2025-02-12 16:10:01 -05:00
parent c20de521b8 6574e1b68a
commit e67790a8d3
36 changed files with 533 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forms/mainwindow.ui
View File

@@ -2042,9 +2042,9 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_Healspots">
<widget class="QWidget" name="tab_HealLocations">
<attribute name="title">
<string>Healspots</string>
<string>Heal Locations</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
@@ -2091,7 +2091,7 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer_Healspots">
<spacer name="horizontalSpacer_HealLocations">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
@@ -2106,7 +2106,7 @@
</layout>
</item>
<item>
<widget class="QScrollArea" name="scrollArea_Healspots">
<widget class="QScrollArea" name="scrollArea_HealLocations">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
@@ -2116,7 +2116,7 @@
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_Healspots">
<widget class="QWidget" name="scrollAreaWidgetContents_HealLocations">
<property name="geometry">
<rect>
<x>0</x>

10
forms/preferenceeditor.ui
View File

@@ -54,6 +54,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_DisableEventWarning">
<property name="toolTip">
<string>If checked, no warning will be shown when deleting an event that has an associated #define that may also be deleted.</string>
</property>
<property name="text">
<string>Disable warning when deleting events with IDs</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

10
forms/projectsettingseditor.ui
View File

@@ -1119,9 +1119,9 @@
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_HealspotsIcon">
<widget class="QLineEdit" name="lineEdit_HealLocationsIcon">
<property name="toolTip">
<string>The icon that will be used to represent Healspot events</string>
<string>The icon that will be used to represent Heal Location events</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
@@ -1136,9 +1136,9 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_HealspotsIcon">
<widget class="QLabel" name="label_HealLocationsIcon">
<property name="text">
<string>Healspots</string>
<string>Heal Locations</string>
</property>
</widget>
</item>
@@ -1224,7 +1224,7 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QToolButton" name="button_HealspotsIcon">
<widget class="QToolButton" name="button_HealLocationsIcon">
<property name="text">
<string>...</string>
</property>