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

Import dialog cleanup #152

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Import dialog cleanup #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0827a1
Clean up include directives in import dialog files
StephenCWills Sep 15, 2024
8c914a3
Remove unnecessary code copied from export dialog
StephenCWills Sep 15, 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
4 changes: 0 additions & 4 deletions source/dialogs/importdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

#include <QColorDialog>
#include <QFileDialog>
#include <QFontDatabase>
#include <QImageWriter>
#include <QMessageBox>
#include <QPainter>
#include <algorithm>

#include "mainwindow.h"
#include "ui_importdialog.h"
Expand Down
13 changes: 0 additions & 13 deletions source/dialogs/importdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
#pragma once

#include <QDialog>
#include <QProgressDialog>

#include "d1formats/d1amp.h"
#include "d1formats/d1gfx.h"
#include "d1formats/d1min.h"
#include "d1formats/d1sol.h"
#include "d1formats/d1til.h"

namespace Ui {
class ImportDialog;
}

// subtiles per line if the output is groupped, an odd number to ensure it is not recognized as a flat tile
#define EXPORT_SUBTILES_PER_LINE 15

// frames per line if the output of a tileset-frames is groupped, an odd number to ensure it is not recognized as a flat tile or as subtiles
#define EXPORT_LVLFRAMES_PER_LINE 31

class ImportDialog : public QDialog {
Q_OBJECT

Expand Down
Loading