Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign creation dialogs #652

Draft
wants to merge 38 commits into
base: dev
Choose a base branch
from
Draft

Redesign creation dialogs #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
18308fa
Stop writing map_groups.h
GriffinRichards Nov 11, 2024
b7d78b0
Make Map members private
GriffinRichards Nov 12, 2024
acaed90
Read map.json constants on project open
GriffinRichards Nov 12, 2024
9d87ece
New map popup/prompt to dialog
GriffinRichards Nov 12, 2024
d6a796e
Start new map dialog redesign
GriffinRichards Nov 12, 2024
9e1ef2c
Import collapsible section
GriffinRichards Nov 12, 2024
205bb48
Header tab and new map dialog share UI setup
GriffinRichards Nov 12, 2024
4f82243
Use collapsible section for header data in new map dialog
GriffinRichards Nov 12, 2024
7d7db38
Clean up new map dialog redesign
GriffinRichards Nov 12, 2024
8bb0100
Separate layout/header features of new map dialog
GriffinRichards Nov 12, 2024
724f420
Automatically add new map groups
GriffinRichards Nov 14, 2024
bd39bcf
Begin new layout dialog redesign
GriffinRichards Nov 19, 2024
e7df829
Group AdvanceMap parsing together, fix its tileset defaults
GriffinRichards Nov 21, 2024
d0101d8
Finish new layout dialog redesign
GriffinRichards Nov 21, 2024
4671321
Add item to duplicate map/layouts from list
GriffinRichards Nov 22, 2024
b230f21
Automatically add new MAPSEC values from New Map dialog
GriffinRichards Nov 24, 2024
ff04a41
Add map list tool tips / copy actions, simplify MapListModel
GriffinRichards Nov 26, 2024
f1a4b78
Fix map duplication
GriffinRichards Nov 26, 2024
6aa8802
Fix map list empty folder regression
GriffinRichards Nov 27, 2024
06a263c
Fix regression to map stitch images from layout split
GriffinRichards Nov 27, 2024
83ef14a
Fix some problems with layout directory creation
GriffinRichards Nov 27, 2024
ba4a43d
Reserve MAP_UNDEFINED
GriffinRichards Dec 3, 2024
b7c34a6
Fix AdvanceMap import memory leaks, revert name change
GriffinRichards Dec 3, 2024
9c40b04
Redesign new tileset dialog
GriffinRichards Dec 4, 2024
435d22c
Fix layouts list sorting by ID rather than name
GriffinRichards Dec 6, 2024
391f7b1
Reserve MAP_DYNAMIC, fix some MAPSEC displays not updating, new error…
GriffinRichards Dec 6, 2024
52a7cd4
Combine minor creation dialogs
GriffinRichards Dec 10, 2024
a6233e9
Ensure automatic new layout names are unique
GriffinRichards Dec 12, 2024
4209c3e
Fix checkerboard pattern for secondary tilesets
GriffinRichards Dec 12, 2024
bdd64a6
Use applicationName() for window titles, clean up some remaining TODO…
GriffinRichards Dec 14, 2024
bf38207
Add new QValidator classes
GriffinRichards Dec 14, 2024
59464aa
Fix possible crash when layout fails to open
GriffinRichards Dec 16, 2024
8f16822
Merge branch 'master' of https://github.com/huderlem/porymap into new…
GriffinRichards Dec 16, 2024
d9be7d5
Fix Qt5 build
GriffinRichards Dec 16, 2024
0d93977
Add QMessageBox convenience classes
GriffinRichards Dec 20, 2024
40adede
Fix editor's map/layout clearing if a map/layout fails to load
GriffinRichards Dec 23, 2024
8bd71a3
Merge branch 'master' of https://github.com/huderlem/porymap into new…
GriffinRichards Dec 23, 2024
72f37d8
Merge branch 'master' into new-map-dialog
GriffinRichards Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docsrc/manual/project-files.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ The filepath that Porymap expects for each file can be overridden on the ``Files
src/data/region_map/region_map_sections.json, yes, yes, ``json_region_map_entries``,
src/data/region_map/porymap_config.json, yes, yes, ``json_region_porymap_cfg``,
include/constants/global.h, yes, no, ``constants_global``, reads ``define_obj_event_count``
include/constants/map_groups.h, no, yes, ``constants_map_groups``,
include/constants/items.h, yes, no, ``constants_items``, for Hidden Item events
include/constants/flags.h, yes, no, ``constants_flags``, for Object and Hidden Item events
include/constants/vars.h, yes, no, ``constants_vars``, for Trigger events
Expand Down Expand Up @@ -93,6 +92,7 @@ In addition to these files, there are some specific symbol and macro names that
``symbol_spawn_npcs``, ``u8 sWhiteoutRespawnHealerNpcIds``, the type and table name for Heal Location ``Respawn NPC`` values
``symbol_attribute_table``, ``sMetatileAttrMasks``, optionally read to get settings on ``Tilesets`` tab
``symbol_tilesets_prefix``, ``gTileset_``, for new tileset names and to extract base tileset names
``symbol_dynamic_map_name``, ``Dynamic``, reserved map name to display for ``define_map_dynamic``
``define_obj_event_count``, ``OBJECT_EVENT_TEMPLATES_COUNT``, to limit total Object Events
``define_min_level``, ``MIN_LEVEL``, minimum wild encounters level
``define_max_level``, ``MAX_LEVEL``, maximum wild encounters level
Expand Down
223 changes: 17 additions & 206 deletions forms/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_16">
<widget class="QLabel" name="label_Layout">
<property name="text">
<string>Layout</string>
</property>
Expand Down Expand Up @@ -1740,7 +1740,7 @@
<x>0</x>
<y>0</y>
<width>100</width>
<height>16</height>
<height>30</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -1834,7 +1834,7 @@
<x>0</x>
<y>0</y>
<width>100</width>
<height>16</height>
<height>30</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -1928,7 +1928,7 @@
<x>0</x>
<y>0</y>
<width>100</width>
<height>16</height>
<height>30</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -2028,7 +2028,7 @@
<x>0</x>
<y>0</y>
<width>100</width>
<height>16</height>
<height>30</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -2122,7 +2122,7 @@
<x>0</x>
<y>0</y>
<width>100</width>
<height>16</height>
<height>30</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -2220,7 +2220,7 @@
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame_3">
<widget class="QFrame" name="frame_HeaderData">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -2236,206 +2236,10 @@
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::FieldGrowthPolicy::FieldsStayAtSizeHint</enum>
</property>
<property name="verticalSpacing">
<number>12</number>
</property>
<layout class="QVBoxLayout" name="layout_HeaderData">
<property name="bottomMargin">
<number>9</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Song</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="NoScrollComboBox" name="comboBox_Song">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default background music for this map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Location</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="NoScrollComboBox" name="comboBox_Location">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The section of the region map which the map is grouped under. This also determines the name of the map that is display when the player enters it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Requires Flash</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox_Visibility">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the map is dark and requires Flash to illuminate.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Weather</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="NoScrollComboBox" name="comboBox_Weather">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default weather for this map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="NoScrollComboBox" name="comboBox_Type">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Battle scene</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="NoScrollComboBox" name="comboBox_BattleScene">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Determines the type of battle scene graphics to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Show Location Name</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="checkBox_ShowLocation">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not to display the location name when the player enters the map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_AllowRunning">
<property name="text">
<string>Allow Running</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="checkBox_AllowRunning">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows the player to use Running Shoes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_AllowBiking">
<property name="text">
<string>Allow Biking</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="checkBox_AllowBiking">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows the player to use a Bike&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_AllowEscaping">
<property name="text">
<string>Allow Dig &amp; Escape Rope</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="checkBox_AllowEscaping">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows the player to use Dig or Escape Rope&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_FloorNumber">
<property name="text">
<string>Floor Number</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QSpinBox" name="spinBox_FloorNumber">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Floor number to be used for maps with elevators.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>-128</number>
</property>
<property name="maximum">
<number>127</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -2896,8 +2700,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>204</width>
<height>16</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="layout_ConnectionsList">
Expand Down Expand Up @@ -3126,7 +2930,9 @@
<addaction name="actionMap_Shift"/>
<addaction name="separator"/>
<addaction name="action_NewMap"/>
<addaction name="action_NewLayout"/>
<addaction name="actionNew_Tileset"/>
<addaction name="separator"/>
<addaction name="actionTileset_Editor"/>
<addaction name="actionRegion_Map_Editor"/>
<addaction name="separator"/>
Expand Down Expand Up @@ -3482,6 +3288,11 @@
<string>Grid Settings...</string>
</property>
</action>
<action name="action_NewLayout">
<property name="text">
<string>New Layout...</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
Expand Down
Loading
Loading