Skip to content

Small things #17

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

Open
Nekaida wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Small things #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83c119b
Change window title of settings and tileset editor
Nekaida Apr 1, 2017
a153578
Fix small copy and paste error
Nekaida Apr 4, 2017
4d09fb8
Fix function doc description
Nekaida Apr 16, 2017
1b4eaf4
Fix show grid buttons
Nekaida May 16, 2017
a02431b
Implement ROM reload
Nekaida Jun 14, 2017
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
1 change: 1 addition & 0 deletions include/AME/Forms/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ namespace ame
void setScriptEditorButtonsEnabled(bool enabled);

void on_action_Open_ROM_triggered();
void on_action_Reload_ROM_triggered();
void on_sldWildGrassChance_valueChanged(int value);
void on_sldWildWaterChance_valueChanged(int value);
void on_sldWildFishingChance_valueChanged(int value);
Expand Down
2 changes: 1 addition & 1 deletion include/AME/Widgets/Rendering/AMEMapView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace ame
bool movementMode() const;

///////////////////////////////////////////////////////////
/// \brief Retrieves the primary blockset size.
/// \brief Retrieves the main map position.
///
///////////////////////////////////////////////////////////
QPoint mainPos();
Expand Down
2 changes: 1 addition & 1 deletion resources/UI/SettingsDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="1,0" columnminimumwidth="300,0">
<property name="sizeConstraint">
Expand Down
2 changes: 1 addition & 1 deletion resources/UI/TilesetDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Tileset Editor</string>
</property>
<property name="modal">
<bool>false</bool>
Expand Down
19 changes: 17 additions & 2 deletions src/Forms/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,19 @@ namespace ame
loadMapData();
}

///////////////////////////////////////////////////////////
// Function type: Slot
// Contributors: Nekaida
// Last edit by: Nekaida
// Date of edit: 6/14/2017
//
///////////////////////////////////////////////////////////
void MainWindow::on_action_Reload_ROM_triggered()
{
if(loadROM(m_Rom.info().path()))
loadMapData();
}

///////////////////////////////////////////////////////////
// Function type: Slot
// Contributors: Pokedude
Expand Down Expand Up @@ -1020,7 +1033,7 @@ namespace ame
MapHeader header;
header.read(m_Rom, offset);
if (header.primary()->image()->raw().isEmpty() ||
header.primary()->image()->raw().isEmpty())
header.secondary()->image()->raw().isEmpty())
{
// Tilesets invalid, abort
Messages::showMessage(this, "Layout says: \"I don't want to load tilesets!\"");
Expand Down Expand Up @@ -2048,11 +2061,13 @@ namespace ame
// Function type: Helper
// Contributors: Diegoisawesome, Nekaida
// Last edit by: Nekaida
// Date of edit: 3/26/2017
// Date of edit: 5/16/2017
//
///////////////////////////////////////////////////////////
void MainWindow::toggle_grid(bool checked)
{
ui->btnMapGrid->setChecked(checked);
ui->btnEntitiesGrid->setChecked(checked);
ui->glMapEditor->setGridVisible(checked);
ui->glBlockEditor->setGridVisible(checked);
ui->glEntityEditor->setGridVisible(checked);
Expand Down