Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history 
Also temp remove gen 5 stuff to not bloat this release
  • Loading branch information
@Admiral-Fish
Admiral-Fish committed Mar 9, 2020
1 parent 598df7b commit 12187d1
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 167 deletions.
15 changes: 8 additions & 7 deletions Forms/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <Forms/Gen4/Tools/ChainedSID.hpp>
#include <Forms/Gen4/Tools/SeedtoTime4.hpp>
#include <Forms/Gen4/Wild4.hpp>
#include <Forms/Gen5/Stationary5.hpp>
//#include <Forms/Gen5/Stationary5.hpp>
#include <Forms/Util/EncounterLookup.hpp>
#include <Forms/Util/IVCalculator.hpp>
#include <Forms/Util/IVtoPID.hpp>
Expand Down Expand Up @@ -78,6 +78,7 @@ MainWindow::~MainWindow()
delete wild4;
delete egg4;
delete ids4;
// delete stationary5;
}

void MainWindow::setupModels()
Expand Down Expand Up @@ -144,7 +145,7 @@ void MainWindow::setupModels()
connect(ui->actionIVtoPID4, &QAction::triggered, this, &MainWindow::openIVtoPID);
connect(ui->actionSeedtoTime4, &QAction::triggered, this, &MainWindow::openSeedtoTime4);
connect(ui->actionSIDfromChainedShiny, &QAction::triggered, this, &MainWindow::openSIDFromChainedShiny);
connect(ui->pushButtonStationary5, &QPushButton::clicked, this, &MainWindow::openStationary5);
// connect(ui->pushButtonStationary5, &QPushButton::clicked, this, &MainWindow::openStationary5);
connect(ui->actionEncounterLookup, &QAction::triggered, this, &MainWindow::openEncounterLookup);
connect(ui->actionIVCalculator, &QAction::triggered, this, &MainWindow::openIVCalculator);
connect(ui->actionResearcher, &QAction::triggered, this, &MainWindow::openResearcher);
Expand Down Expand Up @@ -201,7 +202,7 @@ void MainWindow::checkUpdates()
QDate today = QDate::currentDate();
QDate lastOpened = setting.value("settings/lastOpened", today).toDate();

if (lastOpened.daysTo(today) >= 0)
if (lastOpened.daysTo(today) > 0)
{
QNetworkAccessManager manager;
QNetworkRequest request(QUrl("https://api.github.com/repos/Admiral-Fish/PokeFinder/releases/latest"));
Expand Down Expand Up @@ -265,13 +266,13 @@ void MainWindow::updateProfiles(int num)
egg4->updateProfiles();
}
}
else if (num == 5)
/*else if (num == 5)
{
if (stationary5)
{
stationary5->updateProfiles();
}
}
}*/
}

void MainWindow::openStationary3()
Expand Down Expand Up @@ -441,7 +442,7 @@ void MainWindow::openSIDFromChainedShiny()
chainedSID->raise();
}

void MainWindow::openStationary5()
/*void MainWindow::openStationary5()
{
if (!stationary5)
{
Expand All @@ -450,7 +451,7 @@ void MainWindow::openStationary5()
}
stationary5->show();
stationary5->raise();
}
}*/

void MainWindow::openEncounterLookup()
{
Expand Down
6 changes: 3 additions & 3 deletions Forms/MainWindow.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Stationary4;
class Wild4;
class Eggs4;
class IDs4;
class Stationary5;
// class Stationary5;

class MainWindow : public QMainWindow
{
Expand All @@ -62,7 +62,7 @@ class MainWindow : public QMainWindow
Wild4 *wild4 = nullptr;
Eggs4 *egg4 = nullptr;
IDs4 *ids4 = nullptr;
Stationary5 *stationary5 = nullptr;
// Stationary5 *stationary5 = nullptr;

void setupModels();

Expand Down Expand Up @@ -90,7 +90,7 @@ private slots:
void openIDs4();
void openSeedtoTime4();
void openSIDFromChainedShiny();
void openStationary5();
// void openStationary5();
void openEncounterLookup();
void openIVCalculator();
void openResearcher();
Expand Down
106 changes: 14 additions & 92 deletions Forms/MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>680</width>
<width>460</width>
<height>390</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>680</width>
<width>460</width>
<height>390</height>
</size>
</property>
Expand All @@ -22,50 +22,6 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxGen3">
<property name="title">
<string>Gen 3</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QPushButton" name="pushButtonStationary3">
<property name="text">
<string>Stationary</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButtonWild3">
<property name="text">
<string>Wild</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButtonGameCube">
<property name="text">
<string>GameCube</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="pushButtonEgg3">
<property name="text">
<string>Egg</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="pushButtonIDs3">
<property name="text">
<string>TID/SID</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBoxGen4">
<property name="title">
Expand Down Expand Up @@ -103,64 +59,42 @@
</layout>
</widget>
</item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupBoxGen5">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxGen3">
<property name="title">
<string>Gen 5</string>
<string>Gen 3</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QPushButton" name="pushButtonStationary5">
<widget class="QPushButton" name="pushButtonStationary3">
<property name="text">
<string>Stationary</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButtonWild5">
<property name="enabled">
<bool>false</bool>
</property>
<widget class="QPushButton" name="pushButtonWild3">
<property name="text">
<string>Wild</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButtonEvent5">
<property name="enabled">
<bool>false</bool>
</property>
<widget class="QPushButton" name="pushButtonGameCube">
<property name="text">
<string>Event</string>
<string>GameCube</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="pushButtonDreamRadar">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Dream Radar</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="pushButtonEgg5">
<property name="enabled">
<bool>false</bool>
</property>
<widget class="QPushButton" name="pushButtonEgg3">
<property name="text">
<string>Egg</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="pushButtonIDs5">
<property name="enabled">
<bool>false</bool>
</property>
<item row="4" column="0">
<widget class="QPushButton" name="pushButtonIDs3">
<property name="text">
<string>TID/SID</string>
</property>
Expand All @@ -176,7 +110,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>680</width>
<width>460</width>
<height>20</height>
</rect>
</property>
Expand Down Expand Up @@ -239,23 +173,11 @@
<addaction name="actionDark"/>
<addaction name="actionLight"/>
</widget>
<widget class="QMenu" name="menuThreads">
<property name="title">
<string>Threads</string>
</property>
</widget>
<addaction name="menuLanguage"/>
<addaction name="menuStyle"/>
<addaction name="menuThreads"/>
</widget>
<widget class="QMenu" name="menuGen5Tools">
<property name="title">
<string>Gen 5 Tools</string>
</property>
</widget>
<addaction name="menuGen3Tools"/>
<addaction name="menuGen4Tools"/>
<addaction name="menuGen5Tools"/>
<addaction name="menuSettings"/>
<addaction name="menuTools"/>
</widget>
Expand Down
5 changes: 0 additions & 5 deletions Forms/Util/IVCalculator.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@
<string>Gen 4</string>
</property>
</item>
<item>
<property name="text">
<string>Gen 5</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
Expand Down
34 changes: 1 addition & 33 deletions PokeFinder.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONFIG += c++1z lrelease embed_translations

TARGET = PokeFinder
TEMPLATE = app
VERSION = 2.4.2
VERSION = 2.5.0
#GIT_VERSION = $$system(git rev-parse HEAD)
#GIT_BRANCH = $$system(git rev-parse --abbrev-ref HEAD)
QMAKE_TARGET_DESCRIPTION = PokeFinder
Expand Down Expand Up @@ -63,18 +63,13 @@ FORMS += \
Forms/Gen4/Tools/SearchCoinFlips.ui \
Forms/Gen4/Tools/SeedtoTime4.ui \
Forms/Gen4/Wild4.ui \
Forms/Gen5/Profile/ProfileCalibrator5.ui \
Forms/Gen5/Profile/ProfileEditor5.ui \
Forms/Gen5/Profile/ProfileManager5.ui \
Forms/Gen5/Stationary5.ui \
Forms/MainWindow.ui \
Forms/Util/EncounterLookup.ui \
Forms/Util/IVCalculator.ui \
Forms/Util/IVtoPID.ui \
Forms/Util/Researcher.ui

HEADERS += \
Core/Enum/DSType.hpp \
Core/Enum/Encounter.hpp \
Core/Enum/Game.hpp \
Core/Enum/Language.hpp \
Expand Down Expand Up @@ -123,14 +118,6 @@ HEADERS += \
Core/Gen4/Searchers/StationarySearcher4.hpp \
Core/Gen4/Searchers/WildSearcher4.hpp \
Core/Gen4/Tools/ChainedSIDCalc.hpp \
Core/Gen5/Frames/Frame5.hpp \
Core/Gen5/Frames/StationaryFrame5.hpp \
Core/Gen5/Generators/StationaryGenerator5.hpp \
Core/Gen5/Keypresses.hpp \
Core/Gen5/Nazos.hpp \
Core/Gen5/Profile5.hpp \
Core/Gen5/ProfileLoader5.hpp \
Core/Gen5/Searchers/StationarySearcher5.hpp \
Core/Parents/EncounterArea.hpp \
Core/Parents/Filters/FrameFilter.hpp \
Core/Parents/Filters/IDFilter.hpp \
Expand All @@ -157,9 +144,7 @@ HEADERS += \
Core/RNG/MTRNG.hpp \
Core/RNG/RNGCache.hpp \
Core/RNG/RNGEuclidean.hpp \
Core/RNG/RNGList.hpp \
Core/RNG/SFMT.hpp \
Core/RNG/SHA1.hpp \
Core/RNG/TinyMT.hpp \
Core/Util/DateTime.hpp \
Core/Util/EncounterSlot.hpp \
Expand Down Expand Up @@ -202,10 +187,6 @@ HEADERS += \
Forms/Gen4/Tools/SearchCoinFlips.hpp \
Forms/Gen4/Tools/SeedtoTime4.hpp \
Forms/Gen4/Wild4.hpp \
Forms/Gen5/Profile/ProfileCalibrator5.hpp \
Forms/Gen5/Profile/ProfileEditor5.hpp \
Forms/Gen5/Profile/ProfileManager5.hpp \
Forms/Gen5/Stationary5.hpp \
Forms/MainWindow.hpp \
Forms/Util/EncounterLookup.hpp \
Forms/Util/IVCalculator.hpp \
Expand All @@ -227,7 +208,6 @@ HEADERS += \
Models/Gen4/SeedtoTimeModel4.hpp \
Models/Gen4/StationaryModel4.hpp \
Models/Gen4/WildModel4.hpp \
Models/Gen5/ProfileModel5.hpp \
Models/TableModel.hpp \
Models/Util/ResearcherModel.hpp

Expand Down Expand Up @@ -274,12 +254,6 @@ SOURCES += \
Core/Gen4/Searchers/StationarySearcher4.cpp \
Core/Gen4/Searchers/WildSearcher4.cpp \
Core/Gen4/Tools/ChainedSIDCalc.cpp \
Core/Gen5/Generators/StationaryGenerator5.cpp \
Core/Gen5/Keypresses.cpp \
Core/Gen5/Nazos.cpp \
Core/Gen5/Profile5.cpp \
Core/Gen5/ProfileLoader5.cpp \
Core/Gen5/Searchers/StationarySearcher5.cpp \
Core/Parents/EncounterArea.cpp \
Core/Parents/Filters/FrameFilter.cpp \
Core/Parents/Filters/IDFilter.cpp \
Expand All @@ -304,7 +278,6 @@ SOURCES += \
Core/RNG/RNGCache.cpp \
Core/RNG/RNGEuclidean.cpp \
Core/RNG/SFMT.cpp \
Core/RNG/SHA1.cpp \
Core/RNG/TinyMT.cpp \
Core/Util/DateTime.cpp \
Core/Util/EncounterSlot.cpp \
Expand Down Expand Up @@ -346,10 +319,6 @@ SOURCES += \
Forms/Gen4/Tools/SearchCoinFlips.cpp \
Forms/Gen4/Tools/SeedtoTime4.cpp \
Forms/Gen4/Wild4.cpp \
Forms/Gen5/Profile/ProfileCalibrator5.cpp \
Forms/Gen5/Profile/ProfileEditor5.cpp \
Forms/Gen5/Profile/ProfileManager5.cpp \
Forms/Gen5/Stationary5.cpp \
Forms/MainWindow.cpp \
Forms/Util/EncounterLookup.cpp \
Forms/Util/IVCalculator.cpp \
Expand All @@ -371,7 +340,6 @@ SOURCES += \
Models/Gen4/SeedtoTimeModel4.cpp \
Models/Gen4/StationaryModel4.cpp \
Models/Gen4/WildModel4.cpp \
Models/Gen5/ProfileModel5.cpp \
Models/Util/ResearcherModel.cpp \
main.cpp

Loading

0 comments on commit 12187d1

Please sign in to comment.