Merge branch 'dev' of https://github.com/huderlem/porymap into local-id

include/core/utility.h

@@ -9,6 +9,7 @@ namespace Util {
     int roundUp(int numToRound, int multiple);
     QString toDefineCase(QString input);
     QString toHexString(uint32_t value, int minLength = 0);
+    Qt::Orientations getOrientation(bool xflip, bool yflip);
 }
 
 #endif // UTILITY_H

include/mainwindow.h

@@ -248,8 +248,6 @@ private slots:
     void on_comboBox_PrimaryTileset_currentTextChanged(const QString &arg1);
     void on_comboBox_SecondaryTileset_currentTextChanged(const QString &arg1);
     void on_pushButton_ChangeDimensions_clicked();
-    void on_checkBox_smartPaths_stateChanged(int selected);
-    void on_checkBox_ToggleBorder_stateChanged(int selected);
 
     void resetMapViewScale();
 
@@ -260,7 +258,6 @@ private slots:
 
     void eventTabChanged(int index);
 
-    void on_checkBox_MirrorConnections_stateChanged(int selected);
     void on_actionDive_Emerge_Map_triggered();
     void on_actionShow_Events_In_Map_View_triggered();
     void on_groupBox_DiveMapOpacity_toggled(bool on);
@@ -437,6 +434,10 @@ private:
 
     void checkForUpdates(bool requestedByUser);
     void setDivingMapsVisible(bool visible);
+
+    void setSmartPathsEnabled(bool enabled);
+    void setBorderVisibility(bool visible);
+    void setMirrorConnectionsEnabled(bool enabled);
 };
 
 // These are namespaced in a struct to avoid colliding with e.g. class Map.

include/ui/mapheaderform.h

@@ -73,11 +73,11 @@ private:
     void onWeatherChanged(const QString &weather);
     void onTypeChanged(const QString &type);
     void onBattleSceneChanged(const QString &battleScene);
-    void onRequiresFlashChanged(int selected);
-    void onShowLocationNameChanged(int selected);
-    void onAllowRunningChanged(int selected);
-    void onAllowBikingChanged(int selected);
-    void onAllowEscapingChanged(int selected);
+    void onRequiresFlashChanged(bool enabled);
+    void onShowLocationNameChanged(bool enabled);
+    void onAllowRunningChanged(bool enabled);
+    void onAllowBikingChanged(bool enabled);
+    void onAllowEscapingChanged(bool enabled);
     void onFloorNumberChanged(int offset);
 };
 

include/ui/mapimageexporter.h

@@ -91,30 +91,27 @@ protected:
     virtual void showEvent(QShowEvent *) override;
     virtual void resizeEvent(QResizeEvent *) override;
 
-private slots:
-    void on_checkBox_Objects_stateChanged(int state);
-    void on_checkBox_Warps_stateChanged(int state);
-    void on_checkBox_BGs_stateChanged(int state);
-    void on_checkBox_Triggers_stateChanged(int state);
-    void on_checkBox_HealLocations_stateChanged(int state);
-    void on_checkBox_AllEvents_stateChanged(int state);
-
-    void on_checkBox_ConnectionUp_stateChanged(int state);
-    void on_checkBox_ConnectionDown_stateChanged(int state);
-    void on_checkBox_ConnectionLeft_stateChanged(int state);
-    void on_checkBox_ConnectionRight_stateChanged(int state);
-    void on_checkBox_AllConnections_stateChanged(int state);
-
-    void on_checkBox_Collision_stateChanged(int state);
-    void on_checkBox_Grid_stateChanged(int state);
-    void on_checkBox_Border_stateChanged(int state);
+private:
+    void setShowGrid(bool checked);
+    void setShowBorder(bool checked);
+    void setShowObjects(bool checked);
+    void setShowWarps(bool checked);
+    void setShowBgs(bool checked);
+    void setShowTriggers(bool checked);
+    void setShowHealLocations(bool checked);
+    void setShowAllEvents(bool checked);
+    void setShowConnectionUp(bool checked);
+    void setShowConnectionDown(bool checked);
+    void setShowConnectionLeft(bool checked);
+    void setShowConnectionRight(bool checked);
+    void setShowAllConnections(bool checked);
+    void setShowCollision(bool checked);
+    void setDisablePreviewScaling(bool checked);
+    void setDisablePreviewUpdates(bool checked);
 
     void on_pushButton_Reset_pressed();
     void on_spinBox_TimelapseDelay_editingFinished();
     void on_spinBox_FrameSkip_editingFinished();
-
-    void on_checkBox_DisablePreviewScaling_stateChanged(int state);
-    void on_checkBox_DisablePreviewUpdates_stateChanged(int state);
 };
 
 #endif // MAPIMAGEEXPORTER_H

include/ui/regionmapeditor.h

@@ -121,6 +121,9 @@ private:
     void restoreWindowState();
     void closeEvent(QCloseEvent* event);
 
+    void setTileHFlip(bool enabled);
+    void setTileVFlip(bool enabled);
+
 private slots:
     void on_action_RegionMap_Save_triggered();
     void on_actionSave_All_triggered();
@@ -145,8 +148,6 @@ private slots:
     void on_spinBox_RM_LayoutWidth_valueChanged(int);
     void on_spinBox_RM_LayoutHeight_valueChanged(int);
     void on_spinBox_tilePalette_valueChanged(int);
-    void on_checkBox_tileHFlip_stateChanged(int);
-    void on_checkBox_tileVFlip_stateChanged(int);
     void on_verticalSlider_Zoom_Map_Image_valueChanged(int);
     void on_verticalSlider_Zoom_Image_Tiles_valueChanged(int);
     void onHoveredRegionMapTileChanged(int x, int y);

include/ui/shortcut.h

@@ -49,9 +49,6 @@ public:
     void setAutoRepeat(bool on);
     bool autoRepeat() const;
 
-    int id() const;
-    QList<int> ids() const;
-
     inline QWidget *parentWidget() const
     { return static_cast<QWidget *>(QObject::parent()); }
 

include/ui/tileseteditor.h

@@ -71,10 +71,6 @@ private slots:
 
     void on_spinBox_paletteSelector_valueChanged(int arg1);
 
-    void on_checkBox_xFlip_stateChanged(int arg1);
-
-    void on_checkBox_yFlip_stateChanged(int arg1);
-
     void on_actionSave_Tileset_triggered();
 
     void on_actionImport_Primary_Tiles_triggered();
@@ -149,6 +145,8 @@ private:
     void commitTerrainType();
     void commitLayerType();
     void setRawAttributesVisible(bool visible);
+    void setXFlip(bool enabled);
+    void setYFlip(bool enabled);
 
     Ui::TilesetEditor *ui;
     History<MetatileHistoryItem*> metatileHistory;