From 1899f67536840afc65aed2a62f7bf26b399553a6 Mon Sep 17 00:00:00 2001 From: mlong Date: Sat, 13 Mar 2021 13:05:32 -0600 Subject: [PATCH] Work in progress --- cpress/cpress.pro | 9 ++++--- cpress/diskimg/diskimg.pro | 24 ++++++++++--------- cpress/libhfs/libhfs.pro | 8 ++++--- cpress/nufxlib/nufxlib.pro | 22 +++++++++-------- cpress/zlib/zlib.pro | 8 ++++--- src/diskfiles/diskstore/asdiskimporter.cpp | 2 +- src/diskfiles/dos33/dos33diskimage.h | 2 -- src/main.cpp | 3 ++- src/src.pro | 11 ++++----- src/ui/diskexplorer/DiskExplorerMapWidget.cpp | 8 +++---- 10 files changed, 53 insertions(+), 44 deletions(-) diff --git a/cpress/cpress.pro b/cpress/cpress.pro index 7744564..f6c8333 100644 --- a/cpress/cpress.pro +++ b/cpress/cpress.pro @@ -1,11 +1,14 @@ +warning (In cpress.pro) + TEMPLATE = subdirs -SUBDIRS = zlib nufxlib diskimg libhfs +SUBDIRS = zlib libhfs nufxlib diskimg DEFINES += _CRT_NONSTDC_NO_WARNINGS DEFINES += _CRT_SECURE_NO_WARNINGS libhfs.depends = zlib -nufxlib.depends = zlib -diskimg.depends = nufxlib libhfs +nufxlib.depends = zlib libhfs + +diskimg.depends = nufxlib libhfs zlib diff --git a/cpress/diskimg/diskimg.pro b/cpress/diskimg/diskimg.pro index e74fec7..f9b4590 100644 --- a/cpress/diskimg/diskimg.pro +++ b/cpress/diskimg/diskimg.pro @@ -1,7 +1,9 @@ +warning (In diskimg.pro) + CONFIG += c++14 -#CONFIG += debug_and_release -#TARGET = $$qtLibraryTarget(diskimg) -TARGET = diskimg +CONFIG += debug_and_release +TARGET = $$qtLibraryTarget(diskimg) +#TARGET = diskimg TEMPLATE = lib @@ -25,7 +27,7 @@ INCLUDEPATH += $$PWD/../ciderpress/nufxlib/libhfs #DEFINES += EXCISE_GPL_CODE win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../nufxlib/release/ -lnufxlib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../nufxlib/debug/ -lnufxlib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../nufxlib/debug/ -lnufxlibd else:unix: LIBS += -L$$OUT_PWD/../nufxlib/ -lnufxlib INCLUDEPATH += $$PWD/../ciderpress/nufxlib @@ -33,21 +35,21 @@ DEPENDPATH += $$PWD/../nufxlib win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../zlib/release/ -lzlib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../zlib/debug/ -lzlib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../zlib/debug/ -lzlibd else:unix: LIBS += -L$$OUT_PWD/../zlib/ -lzlib INCLUDEPATH += $$PWD/../zlib DEPENDPATH += $$PWD/../zlib win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libhfs/release/ -llibhfs -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libhfs/debug/ -llibhfs +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libhfs/debug/ -llibhfsd else:unix: LIBS += -L$$OUT_PWD/../libhfs/ -llibhfs INCLUDEPATH += $$PWD/../libhfs DEPENDPATH += $$PWD/../libhfs -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/release/liblibhfs.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/debug/liblibhfs.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/release/libhfs.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/debug/libhfs.lib -else:unix: PRE_TARGETDEPS += $$OUT_PWD/../libhfs/liblibhfs.a +#win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/release/liblibhfs.a +#else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/debug/liblibhfs.a +#else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/release/libhfs.lib +#else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../libhfs/debug/libhfs.lib +#else:unix: PRE_TARGETDEPS += $$OUT_PWD/../libhfs/liblibhfs.a diff --git a/cpress/libhfs/libhfs.pro b/cpress/libhfs/libhfs.pro index 218f9da..71c93ad 100644 --- a/cpress/libhfs/libhfs.pro +++ b/cpress/libhfs/libhfs.pro @@ -1,7 +1,9 @@ +warning (In libhfs.pro) + CONFIG += c++14 -#CONFIG += debug_and_release -#TARGET = $$qtLibraryTarget(zlib) -TARGET = libhfs +CONFIG += debug_and_release +TARGET = $$qtLibraryTarget(libhfs) +#TARGET = libhfs TEMPLATE = lib DEFINES += QT_NO_DEPRECATED_WARNINGS DEFINES += _CRT_NONSTDC_NO_WARNINGS diff --git a/cpress/nufxlib/nufxlib.pro b/cpress/nufxlib/nufxlib.pro index 5e6faab..546324c 100644 --- a/cpress/nufxlib/nufxlib.pro +++ b/cpress/nufxlib/nufxlib.pro @@ -1,7 +1,9 @@ +warning (In nufxlib.pro) + CONFIG += c++14 -#CONFIG += debug_and_release -#TARGET = $$qtLibraryTarget(nufxlib) -TARGET = nufxlib +CONFIG += debug_and_release +TARGET = $$qtLibraryTarget(nufxlib) +#TARGET = nufxlib DEFINES += QT_NO_DEPRECATED_WARNINGS DEFINES += _CRT_NONSTDC_NO_WARNINGS @@ -19,18 +21,18 @@ HEADERS += $$files($$PWD/../ciderpress/nufxlib/*.h) INCLUDEPATH += $$PWD/../ciderpress/nufxlib/ INCLUDEPATH += $$PWD/../ciderpress/zlib/ -LIBS += vcruntime.lib libcmt.lib libvcruntime.lib libucrt.lib +#LIBS += vcruntime.lib libcmt.lib libvcruntime.lib libucrt.lib userenv.lib win32:CONFIG(release, debug|release): warning(nufxlib looking in $$OUT_PWD/../zlib/release ) else:win32:CONFIG(debug, debug|release): warning(nufxlib looking in $$OUT_PWD/../zlib/debug ) -#win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../zlib/release/ -lzlib -#else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../zlib/debug/ -lzlibd -#else:unix: LIBS += -L$$OUT_PWD/../zlib/ -lzlib +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../zlib/release/ -lzlib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../zlib/debug/ -lzlibd +else:unix: LIBS += -L$$OUT_PWD/../zlib/ -lzlib -win32:CONFIG(release, debug|release): LIBS += $$OUT_PWD/../zlib/release/zlib.dll -else:win32:CONFIG(debug, debug|release): LIBS += $$OUT_PWD/../zlib/debug/zlib.dll -else:unix: LIBS += -L$$OUT_PWD/../zlib/ -lzlib.dll +#win32:CONFIG(release, debug|release): LIBS += $$OUT_PWD/../zlib/release/zlib.dll +#else:win32:CONFIG(debug, debug|release): LIBS += $$OUT_PWD/../zlib/debug/zlib.dll +#else:unix: LIBS += -L$$OUT_PWD/../zlib/ -lzlib.dll INCLUDEPATH += $$PWD/../zlib DEPENDPATH += $$PWD/../zlib diff --git a/cpress/zlib/zlib.pro b/cpress/zlib/zlib.pro index 83f4fef..8cfb53b 100644 --- a/cpress/zlib/zlib.pro +++ b/cpress/zlib/zlib.pro @@ -1,7 +1,9 @@ +warning (In zlib.pro) + CONFIG += c++14 -#CONFIG += debug_and_release -#TARGET = $$qtLibraryTarget(zlib) -TARGET = zlib +CONFIG += debug_and_release +TARGET = $$qtLibraryTarget(zlib) +#TARGET = zlib TEMPLATE = lib DEFINES += QT_NO_DEPRECATED_WARNINGS diff --git a/src/diskfiles/diskstore/asdiskimporter.cpp b/src/diskfiles/diskstore/asdiskimporter.cpp index 0a15a58..5ea6c6e 100644 --- a/src/diskfiles/diskstore/asdiskimporter.cpp +++ b/src/diskfiles/diskstore/asdiskimporter.cpp @@ -104,8 +104,8 @@ bool ASDiskImporter::importImage(QString filename, ASDiskData &into) retval = true; } - image.RemoveDiskFS(fs); } + image.RemoveDiskFS(fs); } image.CloseImage(); } diff --git a/src/diskfiles/dos33/dos33diskimage.h b/src/diskfiles/dos33/dos33diskimage.h index 6d218d4..c1cff11 100644 --- a/src/diskfiles/dos33/dos33diskimage.h +++ b/src/diskfiles/dos33/dos33diskimage.h @@ -32,8 +32,6 @@ #include "vtoc.h" #include "tracksectorlist.h" -#include "chunkbytelist.h" - #include "asdiskimporter.h" #include "asdiskdata.h" diff --git a/src/main.cpp b/src/main.cpp index 71c13ff..96688b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,12 +46,13 @@ int main(int argc, char** argv) //qDebug () << "T at 2: " << s.at(2); // return 0; - QApplication a(argc, argv); QCoreApplication::setOrganizationName("LydianScaleSoftware"); QCoreApplication::setOrganizationDomain("lydianscale.com"); QCoreApplication::setApplicationName("AppleSAWS"); + QApplication a(argc, argv); + auto x = QFontDatabase::addApplicationFont(":/fonts/Print_Char_21.ttf"); auto y = QFontDatabase::addApplicationFont(":/fonts/PR_Number_3.ttf"); diff --git a/src/src.pro b/src/src.pro index 9a1d5ca..d28b43f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,7 @@ QT += core gui printsupport CONFIG += c++11 +CONFIG += debug_and_release MOC_DIR = ./.build UI_DIR = ./.build @@ -111,7 +112,6 @@ SOURCES += \ ./applesoftfile/ApplesoftRetokenizer.cpp \ ./internals/JumpLineManager.cpp \ ./ui/widgets/FlowLineTextBrowser.cpp \ - ./util/chunkbytelist.cpp \ ./util/opcodes.cpp \ diskfiles/cpressdiskfs.cpp \ diskfiles/cpressdiskimage.cpp \ @@ -156,7 +156,6 @@ HEADERS += \ ./ui/startupdialog.h \ ./ui/viewers/intbasicfileviewer.h \ ./ui/widgets/notesdialog.h \ - ./util/chunkbytelist.h \ ./util/opcodes.h \ ./util/util.h \ ./util/applestring.h \ @@ -233,7 +232,7 @@ RESOURCES += \ ./resource/resources.qrc \ ./qdarkstyle/style.qrc -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../ads/lib/ -lqtadvanceddockingd +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../ads/lib/ -lqtadvanceddocking else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../ads/lib/ -lqtadvanceddockingd else:unix: LIBS += -L$$OUT_PWD/../ads/src/ -lqtadvanceddockingd @@ -241,21 +240,21 @@ INCLUDEPATH += $$PWD/../ads/src DEPENDPATH += $$PWD/../ads/src win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../cpress/zlib/release/ -lzlib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/zlib/debug/ -lzlib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/zlib/debug/ -lzlibd else:unix: LIBS += -L$$OUT_PWD/../cpress/zlib/ -lzlib INCLUDEPATH += $$PWD/../cpress/zlib DEPENDPATH += $$PWD/../cpress/zlib win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../cpress/nufxlib/release/ -lnufxlib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/nufxlib/debug/ -lnufxlib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/nufxlib/debug/ -lnufxlibd else:unix: LIBS += -L$$OUT_PWD/../cpress/nufxlib/ -lnufxlib INCLUDEPATH += $$PWD/../cpress/nufxlib DEPENDPATH += $$PWD/../cpress/nufxlib win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../cpress/diskimg/release/ -ldiskimg -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/diskimg/debug/ -ldiskimg +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../cpress/diskimg/debug/ -ldiskimgd else:unix: LIBS += -L$$OUT_PWD/../cpress/diskimg/ -ldiskimg INCLUDEPATH += $$PWD/../cpress/diskimg diff --git a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp index d2e3612..a80e703 100644 --- a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp +++ b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp @@ -48,6 +48,7 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid gridlayout->setVerticalSpacing(1); initColors(); + makeStatusWidget(); m_bgroup = new QButtonGroup(this); @@ -88,7 +89,7 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid } } - gridlayout->addWidget(new QLabel(""),18,0,1,5); // Stretchy Row + gridlayout->addWidget(getStatusWidget(),18,0,1,35); // Stretchy Row // gridlayout->setRowStretch(18,900); for (auto rownum = 0; rownum < gridlayout->rowCount(); rownum++) @@ -102,7 +103,6 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid gridlayout->setColumnStretch(colnum,1); } - makeStatusWidget(); } void DiskExplorerMapWidget::makeStatusWidget() @@ -126,7 +126,7 @@ void DiskExplorerMapWidget::makeStatusWidget() QString DiskExplorerMapWidget::getSectorDescription(int track, int sector) { - if (track == 0) { + if (track == 0 && sector == 0) { return "Boot Sector"; } else if (track <= 2) @@ -347,7 +347,7 @@ void DiskExplorerMapWidget::defineRoles(TSPair vtoc) for (auto sec = 0; sec < m_numsectors; sec++) { TSPair ts(track,sec); - if (track == 0) + if (track == 0 && sec == 0) { if (setButtonRole(ts,DiskSectorRole::BootSector)) {