atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master2'

Browse source
This commit is contained in:
Diegoisawesome 2018-09-19 12:36:25 -05:00
commit cf89d07192
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mainwindow.cpp
View file

@ -30,6 +30,7 @@ MainWindow::MainWindow(QWidget *parent) :
{ {
QCoreApplication::setOrganizationName("pret"); QCoreApplication::setOrganizationName("pret");
QCoreApplication::setApplicationName("porymap"); QCoreApplication::setApplicationName("porymap");
QApplication::setApplicationDisplayName("porymap");
QApplication::setWindowIcon(QIcon(":/icons/porymap-icon-1.ico")); QApplication::setWindowIcon(QIcon(":/icons/porymap-icon-1.ico"));
ui->setupUi(this); ui->setupUi(this);
@ -88,12 +89,12 @@ void MainWindow::openProject(QString dir) {
if (!already_open) { if (!already_open) {
editor->project = new Project; editor->project = new Project;
editor->project->root = dir; editor->project->root = dir;
setWindowTitle(editor->project->getProjectTitle() + " - porymap"); setWindowTitle(editor->project->getProjectTitle());
loadDataStructures(); loadDataStructures();
populateMapList(); populateMapList();
setMap(getDefaultMap()); setMap(getDefaultMap());
} else { } else {
setWindowTitle(editor->project->getProjectTitle() + " - porymap"); setWindowTitle(editor->project->getProjectTitle());
loadDataStructures(); loadDataStructures();
populateMapList(); populateMapList();
} }
@ -165,7 +166,7 @@ void MainWindow::setMap(QString map_name) {
redrawMapScene(); redrawMapScene();
displayMapProperties(); displayMapProperties();
setWindowTitle(map_name + " - " + editor->project->getProjectTitle() + " - porymap"); setWindowTitle(map_name + " - " + editor->project->getProjectTitle());
connect(editor->map, SIGNAL(mapChanged(Map*)), this, SLOT(onMapChanged(Map *))); connect(editor->map, SIGNAL(mapChanged(Map*)), this, SLOT(onMapChanged(Map *)));
connect(editor->map, SIGNAL(mapNeedsRedrawing()), this, SLOT(onMapNeedsRedrawing())); connect(editor->map, SIGNAL(mapNeedsRedrawing()), this, SLOT(onMapNeedsRedrawing()));