From af9c0192e075725a07ddf07b32c84fecbc288de0 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Wed, 28 Sep 2022 01:13:19 -0400
Subject: [PATCH] hide heal location z spinner, and label every event type in
 frames

---
 include/ui/eventframes.h |  1 +
 src/ui/eventframes.cpp   | 31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/include/ui/eventframes.h b/include/ui/eventframes.h
index e7f752e9..2d9424b8 100644
--- a/include/ui/eventframes.h
+++ b/include/ui/eventframes.h
@@ -38,6 +38,7 @@ public:
     NoScrollSpinBox *spinner_x;
     NoScrollSpinBox *spinner_y;
     NoScrollSpinBox *spinner_z;
+    QLabel *hideable_label_z;
 
     QLabel *label_icon;
 
diff --git a/src/ui/eventframes.cpp b/src/ui/eventframes.cpp
index 3da845e5..1c196ac7 100644
--- a/src/ui/eventframes.cpp
+++ b/src/ui/eventframes.cpp
@@ -30,6 +30,7 @@ void EventFrame::setup() {
 
     // set frame style
     this->setFrameStyle(QFrame::Box | QFrame::Raised);
+    this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
     ///
     /// init widgets
@@ -69,16 +70,18 @@ void EventFrame::setup() {
     this->spinner_z->setMinimum(numeric_limits<int16_t>::min());
     this->spinner_z->setMaximum(numeric_limits<int16_t>::max());
 
-    QLabel *l_label_z = new QLabel("z");
+    this->hideable_label_z = new QLabel("z");
 
     QHBoxLayout *l_layout_z = new QHBoxLayout();
-    l_layout_z->addWidget(l_label_z);
+    l_layout_z->addWidget(hideable_label_z);
     l_layout_z->addWidget(this->spinner_z);
 
     l_layout_xyz->addLayout(l_layout_z);
 
     QVBoxLayout *l_vbox_1 = new QVBoxLayout();
-    l_vbox_1->addItem(createSpacerV());
+
+    this->label_id = new QLabel("event_type");
+    l_vbox_1->addWidget(this->label_id);
     l_vbox_1->addLayout(l_layout_xyz);
 
     // icon / pixmap label
@@ -102,7 +105,6 @@ void EventFrame::setup() {
     this->layout_main->addLayout(this->layout_contents);
 }
 
-// TODO: add / delete buttons?
 void EventFrame::initCustomAttributesTable() {
     CustomAttributesTable *customAttributes = new CustomAttributesTable(this->event, this);
     this->layout_contents->addWidget(customAttributes);
@@ -170,6 +172,8 @@ void EventFrame::setActive(bool active) {
 void ObjectFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Object");
+
     // sprite combo
     QFormLayout *l_form_sprite = new QFormLayout();
     this->combo_sprite = new NoScrollComboBox(this);
@@ -384,6 +388,8 @@ void ObjectFrame::populate(Project *project) {
 void CloneObjectFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Clone Object");
+
     this->spinner_z->setEnabled(false);
 
     // sprite combo (edits disabled)
@@ -467,6 +473,8 @@ void CloneObjectFrame::populate(Project *project) {
 void WarpFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Warp");
+
     // desination map combo
     QFormLayout *l_form_dest_map = new QFormLayout();
     this->combo_dest_map = new NoScrollComboBox(this);
@@ -535,6 +543,8 @@ void WarpFrame::populate(Project *project) {
 void TriggerFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Trigger");
+
     // script combo
     QFormLayout *l_form_script = new QFormLayout();
     this->combo_script = new NoScrollComboBox(this);
@@ -633,6 +643,8 @@ void TriggerFrame::populate(Project *project) {
 void WeatherTriggerFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Weather Trigger");
+
     // weather combo
     QFormLayout *l_form_weather = new QFormLayout();
     this->combo_weather = new NoScrollComboBox(this);
@@ -684,6 +696,8 @@ void WeatherTriggerFrame::populate(Project *project) {
 void SignFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Sign");
+
     // facing dir combo
     QFormLayout *l_form_facing_dir = new QFormLayout();
     this->combo_facing_dir = new NoScrollComboBox(this);
@@ -763,6 +777,8 @@ void SignFrame::populate(Project *project) {
 void HiddenItemFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Hidden Item");
+
     // item combo
     QFormLayout *l_form_item = new QFormLayout();
     this->combo_item = new NoScrollComboBox(this);
@@ -882,6 +898,8 @@ void HiddenItemFrame::populate(Project *project) {
 void SecretBaseFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Secret Base");
+
     this->spinner_z->setEnabled(false);
 
     // item combo
@@ -935,6 +953,11 @@ void SecretBaseFrame::populate(Project *project) {
 void HealLocationFrame::setup() {
     EventFrame::setup();
 
+    this->label_id->setText("Heal Location");
+
+    this->hideable_label_z->setVisible(false);
+    this->spinner_z->setVisible(false);
+
     // respawn map combo
     this->hideable_respawn_map = new QFrame;
     QFormLayout *l_form_respawn_map = new QFormLayout(hideable_respawn_map);