Browse Source

implement up/forward/back/top buttons

master
Alison Watson 1 year ago
parent
commit
d904117b79
13 changed files with 510 additions and 92 deletions
  1. +6
    -3
      CMakeLists.txt
  2. +2
    -3
      source/common.h
  3. +106
    -13
      source/quam/archive.cc
  4. +35
    -10
      source/quam/archive.h
  5. +7
    -6
      source/quam/main.cc
  6. +40
    -2
      source/quam/main_window.cc
  7. +5
    -0
      source/quam/main_window.h
  8. +91
    -10
      source/quam/main_window.ui
  9. +13
    -12
      source/quam/pack.cc
  10. +71
    -13
      source/quam/project.cc
  11. +18
    -11
      source/quam/project.h
  12. +111
    -4
      source/quam/project.ui
  13. +5
    -5
      source/quam/wad2.cc

+ 6
- 3
CMakeLists.txt View File

@@ -27,9 +27,12 @@ macro(make_qt_project TARGET_NAME)
target_compile_definitions(
${TARGET_NAME}
PUBLIC
-DQT_DEPRECATED_WARNINGS
-DQT_STRICT_ITERATORS
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-DQT_DISABLE_DEPRECATED_BEFORE=0x051300
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
-DQT_NO_URL_CAST_FROM_STRING
-DQT_STRICT_ITERATORS)
endmacro()

find_package(


+ 2
- 3
source/common.h View File

@@ -11,6 +11,7 @@
#include <array>
#include <filesystem>
#include <fstream>
#include <functional>
#include <ios>
#include <istream>
#include <iterator>
@@ -28,8 +29,6 @@ using Option = std::optional<T>;
template<typename... Ts>
using Variant = std::variant<Ts...>;

using Path = std::filesystem::path;

template<typename T>
using UniquePtr = std::unique_ptr<T>;

@@ -104,7 +103,7 @@ static inline std::array<char, N> readBytes(std::istream &st) {
return std::move(b);
}

static inline std::ifstream openReadBin(Path path) {
static inline std::ifstream openReadBin(std::filesystem::path path) {
return std::ifstream{path, std::ios_base::in | std::ios_base::binary};
}



+ 106
- 13
source/quam/archive.cc View File

@@ -18,42 +18,120 @@ namespace Arc {
return None;
}

Node::Node(std::string _name, Dir *_parent) :
Node::Node(std::string _name) :
name(_name),
parent(_parent)
parent(nullptr)
{
}

Node::~Node() {
}

Dir::Dir(std::string _name, Dir *_parent) :
Node(_name, _parent),
baseType()
Dir *Node::getRoot() {
if(!parent) {
return getDir();
} else {
Dir *rover = parent;
while(rover->parent) {
rover = rover->parent;
}
return rover;
}
}

Node *Node::findPath(std::string path) {
if(path.empty()) {
return nullptr;
}

Dir *rover;

// get the initial dir, which will either be:
// - the root if the path starts with /
// - the node itself
// - the node's current Dir (when it's not a Dir)
if(path.front() == '/') {
path.erase(path.begin());
rover = getRoot();
} else {
rover = getDir();
if(!rover) {
rover = parent;
}
}

if(path.empty()) {
// no file, so just the directory itself
return rover;
} else if(auto slash = path.find('/'); slash != std::string::npos) {
std::string prev;
prev = path.substr(0, slash);
path = path.substr(slash + 1);

if(prev == "..") {
// parent dir on ".."
rover = rover->parent ? rover->parent : rover;
} else if(prev != ".") {
if(auto node = rover->findNode(prev)) {
// we want a subdirectory since this path continues
rover = node->getDir();
} else {
// took a wrong turn
rover = nullptr;
}
}

// recurse
return rover ? rover->findPath(path) : nullptr;
} else {
// must be a node inside a directory
return rover->findNode(path);
}
}

std::string Node::getPath(bool fromChild) const {
if(parent) {
return parent->getPath(true) + '/' + name;
} else if(fromChild) {
return std::string{};
} else {
return "/";
}
}

Dir::Dir(std::string _name) :
Node(_name),
m_data()
{
}

Dir::~Dir() {
}

UniquePtr<Node> const &Dir::emplaceBack(Node *node) {
node->parent = this;
return m_data.emplace_back(node);
}

Dir Dir::readArchive(std::istream &st, ArcType type) {
switch(type) {
case ArcType::Pack: return readPack(st);
case ArcType::Wad2: return readWad2(st);
}
Q_UNREACHABLE();
}

Node *Dir::findNode(std::string const &name) {
auto it = std::find_if(begin(), end(),
auto it = std::find_if(m_data.begin(), m_data.end(),
[&name](auto const &node) {
return node->name == name;
});
return it != end() ? &**it : nullptr;
return it != m_data.end() ? &**it : nullptr;
}

File::File(std::string _name, Dir *_parent) :
Node(_name, _parent),
baseType()
File::File(std::string _name, QByteArray &&_data) :
Node(_name),
m_data(std::move(_data))
{
}

@@ -110,7 +188,7 @@ namespace Arc {
case Qt::DecorationRole:
if(col == Column::Name) {
auto icon = node->getDir() ? "folder" : "text-x-generic";
return QVariant{QIcon::fromTheme(icon)};
return QVariant{QIcon::fromTheme(QString::fromUtf8(icon))};
}
break;
case Qt::DisplayRole:
@@ -167,7 +245,7 @@ namespace Arc {
if(!m_dir || !hasIndex(row, col, parent) || row > m_dir->size()) {
return QModelIndex{};
} else {
return createIndex(row, col, &*m_dir->at(row));
return createIndex(row, col, m_dir->at(row));
}
}

@@ -187,6 +265,10 @@ namespace Arc {
return m_dir;
}

Node *Model::findPath(std::string path) {
return m_dir->findPath(path);
}

void Model::setDir(Dir *to) {
auto from = m_dir;
if(to != from) {
@@ -209,7 +291,7 @@ namespace Arc {
}
}

bool Model::dirUp() {
bool Model::goUp() {
if(m_dir && m_dir->parent) {
setDir(m_dir->parent);
return true;
@@ -217,6 +299,17 @@ namespace Arc {
return false;
}
}

bool Model::goPath(std::string path) {
Node *node;
Dir *dir;
if(m_dir && (node = m_dir->findPath(path)) && (dir = node->getDir())) {
setDir(dir);
return true;
} else {
return false;
}
}
}

// EOF

+ 35
- 10
source/quam/archive.h View File

@@ -50,18 +50,23 @@ namespace Arc {
virtual File const *getFile() const = 0;
virtual File *getFile() = 0;

Dir *getRoot();
Node *findPath(std::string path);

std::string getPath(bool fromChild = false) const;

Dir *parent{nullptr};
std::string name;

protected:
Node(std::string name, Dir *parent);
Node(std::string name);
};

class Dir : public Node, public std::vector<UniquePtr<Node>> {
class Dir : public Node {
public:
using baseType = std::vector<UniquePtr<Node>>;
using DataType = std::vector<UniquePtr<Node>>;

Dir(std::string name, Dir *parent = nullptr);
Dir(std::string name);
Dir(Dir const &) = delete;
Dir(Dir &&) = default;
virtual ~Dir();
@@ -71,16 +76,25 @@ namespace Arc {
File const *getFile() const override {return nullptr;}
File *getFile() override {return nullptr;}

DataType const &data() const {return m_data;}
Node *at(std::size_t i) const {return &*m_data.at(i);}

std::size_t size() const {return m_data.size();}

UniquePtr<Node> const &emplaceBack(Node *node);
Node *findNode(std::string const &name);

static Dir readArchive(std::istream &st, ArcType type);

private:
DataType m_data;
};

class File : public Node, public QByteArray {
class File : public Node {
public:
using baseType = QByteArray;
using DataType = QByteArray;

File(std::string name, Dir *parent = nullptr);
File(std::string name, QByteArray &&data);
File(File const &) = delete;
File(File &&) = default;
virtual ~File();
@@ -90,7 +104,14 @@ namespace Arc {
File const *getFile() const override {return this;}
File *getFile() override {return this;}

DataType const &data() const {return m_data;}

std::size_t size() const {return m_data.size();}

FileType type{FileType::Normal};

private:
DataType m_data;
};

class Model : public QAbstractItemModel {
@@ -115,10 +136,14 @@ namespace Arc {

Dir *dir() const;

Node *findPath(std::string path);

public slots:
void setDir(Dir *dir);
void setDirToIndex(QModelIndex const &ind);
bool dirUp();

bool goUp();
bool goPath(std::string path);

signals:
void dirChanged(Dir *from, Dir *to);
@@ -152,12 +177,12 @@ namespace Arc {
}

static inline QDebug operator<<(QDebug debug, Arc::Dir const &t) {
debug << static_cast<Arc::Dir::baseType const &>(t);
debug << t.data();
return debug;
}

static inline QDebug operator<<(QDebug debug, Arc::File const &t) {
debug << static_cast<Arc::File::baseType const &>(t);
debug << t.data();
return debug;
}



+ 7
- 6
source/quam/main.cc View File

@@ -6,10 +6,10 @@
#include <QCoreApplication>

static void setupAppl(QCoreApplication &appl) {
appl.setApplicationName("QuAM!");
appl.setApplicationVersion("1.0");
appl.setOrganizationDomain("greyserv.net");
appl.setOrganizationName("Project Golan");
appl.setApplicationName(QString::fromUtf8("QuAM!"));
appl.setApplicationVersion(QString::fromUtf8("1.0"));
appl.setOrganizationDomain(QString::fromUtf8("greyserv.net"));
appl.setOrganizationName(QString::fromUtf8("Project Golan"));
}

static int modeGui(int argc, char *argv[]) {
@@ -26,14 +26,15 @@ static int modeText(int argc, char *argv[]) {

QCommandLineParser par;

par.setApplicationDescription("Quake Archive Manager");
par.setApplicationDescription(QString::fromUtf8("Quake Archive Manager"));
par.setSingleDashWordOptionMode(
QCommandLineParser::ParseAsCompactedShortOptions);

par.addHelpOption();
par.addVersionOption();

QCommandLineOption fileNameOpt{QStringList{"f", "file"},
QCommandLineOption fileNameOpt{QStringList{QString::fromUtf8("f"),
QString::fromUtf8("file")},
trMain("Open the archive <file>."),
trMain("file")};
par.addOption(fileNameOpt);


+ 40
- 2
source/quam/main_window.cc View File

@@ -5,6 +5,16 @@

#include <QErrorMessage>
#include <QFileDialog>
#include <QMdiSubWindow>

static bool applyActiveWin(QMdiArea *area, std::function<bool(Project *)> fn) {
if(auto subWin = area->activeSubWindow()) {
if(auto win = qobject_cast<Project *>(subWin->widget())) {
return fn(win);
}
}
return false;
}

MainWindow::MainWindow(QWidget *parent) :
QMainWindow{parent},
@@ -16,6 +26,11 @@ MainWindow::MainWindow(QWidget *parent) :
actionClose->setShortcut(QKeySequence{QKeySequence::Close});
actionOpen->setShortcut(QKeySequence{QKeySequence::Open});
actionQuit->setShortcut(QKeySequence{QKeySequence::Quit});

actionUp->setShortcut(Qt::ALT + Qt::Key_Up);
actionTop->setShortcut(Qt::ALT + Qt::Key_Home);
actionBack->setShortcut(QKeySequence{QKeySequence::Back});
actionForward->setShortcut(QKeySequence{QKeySequence::Forward});
}

MainWindow::~MainWindow() {
@@ -34,8 +49,15 @@ void MainWindow::fileOpen() {

if(!fileName.isEmpty()) {
try {
auto st = openReadBin(fileName.toStdString());
new Project{st, m_errors, mdiArea};
auto path = std::filesystem::path(fileName.toStdString());
auto st = openReadBin(path);
auto win = new QMdiSubWindow;
auto proj = new Project{st, m_errors, win};
win->setWidget(proj);
win->setAttribute(Qt::WA_DeleteOnClose);
win->setWindowTitle(QString::fromStdString(path.filename()));
mdiArea->addSubWindow(win);
win->showMaximized();
} catch(std::exception const &exc) {
m_errors->showMessage(tr(exc.what()));
}
@@ -48,4 +70,20 @@ void MainWindow::fileClose() {
}
}

bool MainWindow::goBack() {
return applyActiveWin(mdiArea, [](auto win) {return win->goBack();});
}

bool MainWindow::goForward() {
return applyActiveWin(mdiArea, [](auto win) {return win->goForward();});
}

bool MainWindow::goTop() {
return applyActiveWin(mdiArea, [](auto win) {return win->goTop();});
}

bool MainWindow::goUp() {
return applyActiveWin(mdiArea, [](auto win) {return win->goUp();});
}

// EOF

+ 5
- 0
source/quam/main_window.h View File

@@ -20,6 +20,11 @@ public slots:
void fileOpen();
void fileClose();

bool goBack();
bool goForward();
bool goTop();
bool goUp();

private:
QErrorMessage *m_errors;
};


+ 91
- 10
source/quam/main_window.ui View File

@@ -17,6 +17,15 @@
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QMdiArea" name="mdiArea">
<property name="background">
<brush brushstyle="Dense7Pattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</property>
<property name="viewMode">
<enum>QMdiArea::TabbedView</enum>
</property>
@@ -39,7 +48,7 @@
<x>0</x>
<y>0</y>
<width>640</width>
<height>29</height>
<height>24</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -53,7 +62,7 @@
</widget>
<widget class="QMenu" name="menuGo">
<property name="title">
<string>Go</string>
<string>&amp;Go</string>
</property>
<addaction name="actionUp"/>
<addaction name="actionBack"/>
@@ -93,34 +102,38 @@
</action>
<action name="actionUp">
<property name="icon">
<iconset theme="go-up"/>
<iconset theme="go-up">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Up</string>
<string>&amp;Up</string>
</property>
</action>
<action name="actionBack">
<property name="icon">
<iconset theme="go-previous"/>
<iconset theme="go-previous">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Back</string>
<string>&amp;Back</string>
</property>
</action>
<action name="actionForward">
<property name="icon">
<iconset theme="go-next"/>
<iconset theme="go-next">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Forward</string>
<string>&amp;Forward</string>
</property>
</action>
<action name="actionTop">
<property name="icon">
<iconset theme="go-top"/>
<iconset theme="go-top">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Top</string>
<string>&amp;Top</string>
</property>
</action>
</widget>
@@ -174,10 +187,78 @@
</hint>
</hints>
</connection>
<connection>
<sender>actionUp</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>goUp()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionTop</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>goTop()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionBack</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>goBack()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionForward</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>goForward()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>fileOpen()</slot>
<slot>selectCell(int,int)</slot>
<slot>fileClose()</slot>
<slot>goUp()</slot>
<slot>goForward()</slot>
<slot>goBack()</slot>
<slot>goTop()</slot>
</slots>
</ui>

+ 13
- 12
source/quam/pack.cc View File

@@ -24,21 +24,20 @@ static Arc::File readPackEntry(std::istream &st) {
auto entOffset = readLE<quint32>(st);
auto entSize = readLE<quint32>(st);

if(entName.front() == '/') {
throw FileFormatError("empty root directory name");
}

auto pos = st.tellg();

st.seekg(entOffset);

Arc::File file{ntbsToString(entName)};

file.resize(entSize);
st.read(file.data(), entSize);
QByteArray data;
data.resize(entSize);
st.read(data.data(), entSize);
st.seekg(pos);

if(file.name.front() == '/') {
throw FileFormatError("empty root directory name");
}

return file;
return Arc::File{ntbsToString(entName), std::move(data)};
}

static void insertFile(Arc::Dir &dir, Arc::File &file, std::string name) {
@@ -55,12 +54,14 @@ static void insertFile(Arc::Dir &dir, Arc::File &file, std::string name) {
if(existing) {
ref = existing;
} else {
ref = &*dir.emplace_back(new Arc::Dir(name, &dir));
ref = new Arc::Dir(name);
dir.emplaceBack(ref);
}
insertFile(*ref->getDir(), file, *next);
} else if(!existing) {
file.name = name;
dir.emplace_back(new Arc::File(std::move(file)));
file.name = name;
file.parent = &dir;
dir.emplaceBack(new Arc::File(std::move(file)));
} else {
throw FileFormatError("duplicate file");
}


+ 71
- 13
source/quam/project.cc View File

@@ -1,24 +1,20 @@
#include "quam/project.h"

#include <QAbstractItemModel>
#include <QErrorMessage>
#include <QMdiArea>
#include <QSortFilterProxyModel>

Project::Project(std::istream &st, QErrorMessage *errors, QMdiArea *parent) :
QMdiSubWindow{parent},
Project::Project(std::istream &st, QErrorMessage *errors, QWidget *parent) :
QWidget{parent},
Ui::Project{},
m_seekingDir{false},
m_histPos{0},
m_hist(),
m_arc{new Arc::Arc{st, this}},
m_root{&m_arc->root},
m_errors{errors},
m_model{new Arc::Model{this}},
m_sorter{new QSortFilterProxyModel{this}}
{
auto widget = new QWidget{this};
setupUi(widget);
setWidget(widget);
setAttribute(Qt::WA_DeleteOnClose);
showMaximized();
setupUi(this);

connect(m_model, &Arc::Model::dirChanged,
this, &Project::dirChanged);
@@ -28,18 +24,80 @@ Project::Project(std::istream &st, QErrorMessage *errors, QMdiArea *parent) :
dirName->setValidator(m_arc->validator);
m_sorter->setSourceModel(m_model);
tableView->setModel(m_sorter);
m_model->setDir(m_root);
seekTop();
}

Project::~Project() {
}

void Project::dirChanged(Arc::Dir *from, Arc::Dir *to) {
if(!m_seekingDir) {
if(std::ptrdiff_t(m_histPos) < std::ptrdiff_t(m_hist.size()) - 1) {
auto beg = m_hist.begin();
std::advance(beg, m_histPos + 1);
m_hist.erase(beg, m_hist.end());
}

m_hist.push_back(to->getPath());
m_histPos = m_hist.size() - 1;
} else {
m_seekingDir = false;
}

tableView->sortByColumn(int(Arc::Column::Type), Qt::AscendingOrder);
tableView->resizeColumnsToContents();
}

bool Project::dirUp() {
return m_model->dirUp();
void Project::seekTop() {
m_model->setDir(&m_arc->root);
}

bool Project::seekHistory(std::ptrdiff_t newPos) {
if(newPos < 0 || newPos >= m_hist.size()) {
return false;
}

m_histPos = newPos;

qDebug() << "hist pos changed:" << m_histPos;

auto newPath = m_hist.at(newPos);
if(auto node = m_model->findPath(newPath)) {
if(auto dir = node->getDir()) {
m_seekingDir = true;
m_model->setDir(dir);
return true;
} else {
m_errors->showMessage(QString::fromStdString("'"s + newPath + "' ") +
tr("is not a directory"));
return false;
}
} else {
m_errors->showMessage(tr("could not find directory") +
QString::fromStdString(" '"s + newPath + "'"));
return false;
}
}

bool Project::goBack() {
return seekHistory(std::ptrdiff_t(m_histPos) - 1);
}

bool Project::goForward() {
return seekHistory(std::ptrdiff_t(m_histPos) + 1);
}

bool Project::goTop() {
seekTop();
return true;
}

bool Project::goUp() {
return m_model->goUp();
}

bool Project::goPath(std::string path) {
return m_model->goPath(path);
}

// EOF

+ 18
- 11
source/quam/project.h View File

@@ -5,33 +5,40 @@
#include "quam/archive.h"
#include "quam/ui_project.h"

#include <QMainWindow>
#include <QMdiSubWindow>
#include <QWidget>

class QAbstractItemModel;
class QErrorMessage;
class QSortFilterProxyModel;

class Project : public QMdiSubWindow, private Ui::Project {
class Project : public QWidget, private Ui::Project {
Q_OBJECT

public:
explicit Project(std::istream &st, QErrorMessage *errors, QMdiArea *parent);
explicit Project(std::istream &st, QErrorMessage *errors, QWidget *parent);
virtual ~Project();

bool seekHistory(std::ptrdiff_t newPos);
void seekTop();

public slots:
bool dirUp();
bool goBack();
bool goForward();
bool goTop();
bool goUp();

bool goPath(std::string path);

private slots:
void dirChanged(Arc::Dir *from, Arc::Dir *to);

private:
Arc::Arc *m_arc;
Arc::Dir *m_root;
QErrorMessage *m_errors;
Arc::Model *m_model;
QSortFilterProxyModel *m_sorter;
bool m_seekingDir;
std::size_t m_histPos;
std::vector<std::string> m_hist;
Arc::Arc *m_arc;
QErrorMessage *m_errors;
Arc::Model *m_model;
QSortFilterProxyModel *m_sorter;
};

// EOF

+ 111
- 4
source/quam/project.ui View File

@@ -13,16 +13,68 @@
<property name="windowTitle">
<string>Project View</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLineEdit" name="dirName"/>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="buttonBack">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="icon">
<iconset theme="go-previous"/>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonForward">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="icon">
<iconset theme="go-next"/>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonUp">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="icon">
<iconset theme="go-up"/>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="dirName"/>
</item>
</layout>
</item>
<item>
<widget class="QTableView" name="tableView">
@@ -72,5 +124,60 @@
</layout>
</widget>
<resources/>
<connections/>
<connections>
<connection>
<sender>buttonBack</sender>
<signal>clicked()</signal>
<receiver>Project</receiver>
<slot>goBack()</slot>
<hints>
<hint type="sourcelabel">
<x>18</x>
<y>17</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonForward</sender>
<signal>clicked()</signal>
<receiver>Project</receiver>
<slot>goForward()</slot>
<hints>
<hint type="sourcelabel">
<x>47</x>
<y>17</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonUp</sender>
<signal>clicked()</signal>
<receiver>Project</receiver>
<slot>goUp()</slot>
<hints>
<hint type="sourcelabel">
<x>76</x>
<y>17</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>goUp()</slot>
<slot>goForward()</slot>
<slot>goBack()</slot>
<slot>goTop()</slot>
</slots>
</ui>

+ 5
- 5
source/quam/wad2.cc View File

@@ -49,14 +49,14 @@ static Arc::File readWad2Entry(std::istream &st) {

st.seekg(entOffset);

Arc::File file{ntbsToString(entName)};
QByteArray data;

file.resize(entSize);
st.read(file.data(), entSize);
data.resize(entSize);
st.read(data.data(), entSize);
st.seekg(pos);

Arc::File file{ntbsToString(entName), std::move(data)};
file.type = getFileType(entType);

return file;
}

@@ -67,7 +67,7 @@ Arc::Dir readWad2(std::istream &st) {
Arc::Dir root{std::string{}};

for(quint32 i = 0; i < hdr.second; i++) {
root.emplace_back(new Arc::File(readWad2Entry(st)));
root.emplaceBack(new Arc::File(readWad2Entry(st)));
}

return root;


Loading…
Cancel
Save