From c4badd213717e74d03d1bd2f9aec03414dde7943 Mon Sep 17 00:00:00 2001 From: mlong Date: Sun, 21 Feb 2021 13:05:55 -0600 Subject: [PATCH] Added new docking support and viewer widgets for DiskExplorer --- .gitmodules | 3 + AppleSAWS.pro | 2 + ads | 1 + ads.pri | 68 +++++++++ src/qdarkstyle/style.qss | 5 +- src/ui/central/centralappwindow.cpp | 129 +++++++++++++----- src/ui/central/centralappwindow.h | 16 +++ src/ui/diskexplorer/DiskExplorer.cpp | 9 +- src/ui/diskexplorer/DiskExplorer.h | 1 + src/ui/diskexplorer/DiskExplorerMapWidget.cpp | 15 +- src/ui/diskexplorer/DiskExplorerMapWidget.h | 10 +- src/ui/diskexplorer/viewwidgetstack.cpp | 32 +++++ src/ui/diskexplorer/viewwidgetstack.h | 5 + src/ui/diskexplorer/vtocview.cpp | 10 +- src/ui/diskexplorer/vtocview.h | 2 - src/ui/diskexplorer/vtocview.ui | 38 +++++- src/ui/viewers/hexdumpviewer.h | 3 +- src/ui/viewers/hexdumpviewer.ui | 3 + 18 files changed, 298 insertions(+), 54 deletions(-) create mode 100644 .gitmodules create mode 160000 ads create mode 100644 ads.pri diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d12aedf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ads"] + path = ads + url = https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git diff --git a/AppleSAWS.pro b/AppleSAWS.pro index 7e434da..e56ce80 100644 --- a/AppleSAWS.pro +++ b/AppleSAWS.pro @@ -6,6 +6,7 @@ MOC_DIR = ./.build UI_DIR = ./.build OBJECTS_DIR = ./.build + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = AppleSAWS @@ -32,6 +33,7 @@ INCLUDEPATH += src/sequence INCLUDEPATH += src/ui/central +include(./ads.pri) DEFINES += WS_VIDEO diff --git a/ads b/ads new file mode 160000 index 0000000..1385357 --- /dev/null +++ b/ads @@ -0,0 +1 @@ +Subproject commit 13853573ea51f9f0e682f7d005ca4443398512ae diff --git a/ads.pri b/ads.pri new file mode 100644 index 0000000..8663803 --- /dev/null +++ b/ads.pri @@ -0,0 +1,68 @@ +DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += ADS_STATIC + +INCLUDEPATH += ads/src/ + +windows { + # MinGW + *-g++* { + QMAKE_CXXFLAGS += -Wall -Wextra -pedantic + } + # MSVC + *-msvc* { + QMAKE_CXXFLAGS += /utf-8 + } +} + +RESOURCES += ads/src/ads.qrc + +HEADERS += \ + ads/src/ads_globals.h \ + ads/src/DockAreaWidget.h \ + ads/src/DockAreaTabBar.h \ + ads/src/DockContainerWidget.h \ + ads/src/DockManager.h \ + ads/src/DockWidget.h \ + ads/src/DockWidgetTab.h \ + ads/src/DockingStateReader.h \ + ads/src/FloatingDockContainer.h \ + ads/src/FloatingDragPreview.h \ + ads/src/DockOverlay.h \ + ads/src/DockSplitter.h \ + ads/src/DockAreaTitleBar_p.h \ + ads/src/DockAreaTitleBar.h \ + ads/src/ElidingLabel.h \ + ads/src/IconProvider.h \ + ads/src/DockComponentsFactory.h \ + ads/src/DockFocusController.h + + +SOURCES += \ + ads/src/ads_globals.cpp \ + ads/src/DockAreaWidget.cpp \ + ads/src/DockAreaTabBar.cpp \ + ads/src/DockContainerWidget.cpp \ + ads/src/DockManager.cpp \ + ads/src/DockWidget.cpp \ + ads/src/DockingStateReader.cpp \ + ads/src/DockWidgetTab.cpp \ + ads/src/FloatingDockContainer.cpp \ + ads/src/FloatingDragPreview.cpp \ + ads/src/DockOverlay.cpp \ + ads/src/DockSplitter.cpp \ + ads/src/DockAreaTitleBar.cpp \ + ads/src/ElidingLabel.cpp \ + ads/src/IconProvider.cpp \ + ads/src/DockComponentsFactory.cpp \ + ads/src/DockFocusController.cpp + + +unix:!macx { +HEADERS += ads/src/linux/FloatingWidgetTitleBar.h +SOURCES += ads/src/linux/FloatingWidgetTitleBar.cpp +QT += x11extras +LIBS += -lxcb +} + + + diff --git a/src/qdarkstyle/style.qss b/src/qdarkstyle/style.qss index da84ee8..0fd4e13 100644 --- a/src/qdarkstyle/style.qss +++ b/src/qdarkstyle/style.qss @@ -1560,7 +1560,6 @@ QTabBar::tab:top { padding-right: 4px; padding-top: 2px; padding-bottom: 2px; - min-width: 5px; border-bottom: 3px solid #32414B; border-top-left-radius: 3px; border-top-right-radius: 3px; @@ -2189,3 +2188,7 @@ DEButton { outline: none; min-width: 10px; } + +ads--CElidingLabel { +min-width: 80px; +} diff --git a/src/ui/central/centralappwindow.cpp b/src/ui/central/centralappwindow.cpp index a99f9f1..4f53fff 100644 --- a/src/ui/central/centralappwindow.cpp +++ b/src/ui/central/centralappwindow.cpp @@ -36,10 +36,10 @@ #include #include #include - - #include +using namespace ads; + CentralAppWindow::CentralAppWindow(QWidget *parent) : QMainWindow(parent) { QFile f(":qdarkstyle/style.qss"); @@ -50,25 +50,63 @@ CentralAppWindow::CentralAppWindow(QWidget *parent) : QMainWindow(parent) else { f.open(QFile::ReadOnly | QFile::Text); QTextStream ts(&f); - this->setStyleSheet(ts.readAll()); + // this->setStyleSheet(ts.readAll()); + this->setStyleSheet("font-family: \"Pr Number 3\"; font-size: 16px"); } + initCentralWidget(); createActions(); initMenuBar(); initToolBars(); initDockWidgets(); initStatusBar(); - initCentralWidget(); } void CentralAppWindow::createActions() { - m_quitAction = new QAction(QIcon(":/images/redblob.png"),tr("E&xit")); + m_quitAction = new QAction(QIcon(":/images/redblob.png"),tr("&Quit")); connect(m_quitAction, &QAction::triggered, qApp, &QApplication::quit); + + m_reference_action = new QAction(QIcon(":/images/redblob.png"),tr("&References")); + m_reference_action->setCheckable(true); +// connect(m_reference_action, &QAction::triggered, +// qApp, &QApplication::xxxxxx); + + m_utils_action = new QAction(QIcon(":/images/redblob.png"),tr("&Utils")); + m_utils_action->setCheckable(true); +// connect(m_reference_action, &QAction::triggered, +// qApp, &QApplication::xxxxxx); + + m_image_lib_action = new QAction(QIcon(":/images/redblob.png"),tr("&Disk Image\nLibrary")); + m_image_lib_action->setCheckable(true); +// connect(m_reference_action, &QAction::triggered, +// qApp, &QApplication::xxxxxx); + + m_disk_explorer_action= new QAction(QIcon(":/images/redblob.png"),tr("Disk Image\n&Explorer")); + m_disk_explorer_action->setCheckable(true); +// connect(m_reference_action, &QAction::triggered, +// qApp, &QApplication::xxxxxx); + + m_projects_action = new QAction(QIcon(":/images/redblob.png"),tr("&Projects")); + m_projects_action->setCheckable(true); +// connect(m_reference_action, &QAction::triggered, +// qApp, &QApplication::xxxxxx); + + m_tool_action_group = new QActionGroup(this); + m_tool_action_group->addAction(m_reference_action); + m_tool_action_group->addAction(m_utils_action); + m_tool_action_group->addAction(m_image_lib_action); + m_tool_action_group->addAction(m_disk_explorer_action); + m_tool_action_group->addAction(m_projects_action); + m_tool_action_group->setExclusive(true); + m_disk_explorer_action->toggle(); + + } + void CentralAppWindow::initMenuBar() { auto filemenu = menuBar()->addMenu(tr("&File")); @@ -87,34 +125,27 @@ void CentralAppWindow::initToolBars() m_mainToolBar = new MainAppToolbar(this); m_mainToolBar->setIconSize(QSize(64,64)); m_mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - m_mainToolBar->addAction(m_quitAction); m_mainToolBar->setFont(QFont("Ariel",14)); +// m_mainToolBar->addAction(m_quitAction); + + m_mainToolBar->addAction(m_reference_action); + m_mainToolBar->addAction(m_utils_action); + m_mainToolBar->addAction(m_image_lib_action); + m_mainToolBar->addAction(m_disk_explorer_action); + m_mainToolBar->addAction(m_projects_action); + addToolBar(Qt::LeftToolBarArea, m_mainToolBar); } void CentralAppWindow::initDockWidgets() { - QDockWidget *container = new QDockWidget(this); - container->setMinimumWidth(200); - container->setFeatures(QDockWidget::DockWidgetMovable); - m_project_area = new QWidget(container); - m_project_area->setMinimumSize(300,200); - m_directory_area = new Dos33DiskTreeView(container); + m_directory_area = new Dos33DiskTreeView(); m_directory_area->setFont(QFont("Pr Number 3", 12)); m_directory_area->setMinimumSize(300,200); - QSplitter *split = new QSplitter(container); - container->setWidget(split); - split->setOrientation(Qt::Vertical); - split->addWidget(m_directory_area); - split->addWidget(m_project_area); - split->setStretchFactor(0,1); - split->setStretchFactor(1,1); - split->setSizes(QList({4000, 4000})); - Dos33DiskImage *img = new Dos33DiskImage("c:/develop/git/AppleSAWS/disk-images/ApplesoftToolkit.dsk"); @@ -128,37 +159,73 @@ void CentralAppWindow::initDockWidgets() model->addDiskImage(img); m_directory_area->setModel(model); - addDockWidget(Qt::LeftDockWidgetArea,container); + + auto DiskImageDockWidget = new CDockWidget("Disk Images"); + DiskImageDockWidget->setWidget(m_directory_area); + DiskImageDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); + DiskImageDockWidget->resize(250, 150); + DiskImageDockWidget->setMinimumSize(200,150); + auto DiskImageWidgetArea = DockManager->addDockWidget(DockWidgetArea::LeftDockWidgetArea, DiskImageDockWidget); + //DockManager->addDockWidget(DockWidgetArea::BottomDockWidgetArea, TableDockWidget, TableArea); +// ui->menuView->addAction(TableDockWidget->toggleViewAction()); + + - QDockWidget *stb = new QDockWidget(this); - stb->setMinimumWidth(200); - stb->setFeatures(QDockWidget::DockWidgetMovable); - // stb->setLayout(new QGridLayout()); m_toolbox = new SequenceToolBox(this); + auto SequenceDockWidget = new CDockWidget("Sequences"); + SequenceDockWidget->setWidget(m_toolbox); + SequenceDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); + SequenceDockWidget->resize(250, 150); + SequenceDockWidget->setMinimumSize(200,150); + auto SequenceWidgetArea = DockManager->addDockWidget(DockWidgetArea::RightDockWidgetArea, SequenceDockWidget); - addDockWidget(Qt::RightDockWidgetArea,stb); } void CentralAppWindow::initCentralWidget() { + CDockManager::setConfigFlag(CDockManager::OpaqueSplitterResize, true); + CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false); + CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true); + CDockManager::setConfigFlag(CDockManager::TabCloseButtonIsToolButton, true); + + DockManager = new CDockManager(this); + DockManager->setStyleSheet(""); + m_central_stack = new QStackedWidget(this); QScrollArea *sa = new QScrollArea(m_central_stack); sa->setWidgetResizable(true); m_central_stack->addWidget(sa); - setCentralWidget(m_central_stack); + CentralDockWidget = new CDockWidget("CentralWidget"); + CentralDockWidget->setWidget(m_central_stack); + // CentralDockWidget->setFeature(CDockWidget::NoTab,true); + m_central_dock_area = DockManager->setCentralWidget(CentralDockWidget); - Dos33DiskImage *img = new Dos33DiskImage("c:/develop/git/AppleSAWS/disk-images/ApplesoftToolkit.dsk"); + Dos33DiskImage *img = new Dos33DiskImage("c:/develop/git/AppleSAWS/disk-images/ApplesoftToolkit.dsk"); auto dew = new DiskExplorerMapWidget(img->tracks(),img->sectorsPerTrack()); dew->setDisk(img); sa->setWidget(dew); - // m_central_stack->addWidget(dew); -//new SequenceViewer() + + auto VWSDockWidget = new CDockWidget("Sector Contents"); + VWSDockWidget->setWidget(dew->generateViewWidgetStack()); + auto VWSWidgetArea = DockManager->addDockWidget(DockWidgetArea::BottomDockWidgetArea, VWSDockWidget); + + auto KeyDockWidget = new CDockWidget("Key"); + auto keywidget = dew->makeKeyWidget(); + keywidget->setMaximumWidth(240); + KeyDockWidget->setWidget(keywidget); + KeyDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); + // KeyDockWidget->resize(250, 150); + // KeyDockWidget->setMinimumSize(200,150); + auto DiskImageWidgetArea = + DockManager->addDockWidget(DockWidgetArea::LeftDockWidgetArea, KeyDockWidget, m_central_dock_area); + + } diff --git a/src/ui/central/centralappwindow.h b/src/ui/central/centralappwindow.h index 5669a93..1fd545e 100644 --- a/src/ui/central/centralappwindow.h +++ b/src/ui/central/centralappwindow.h @@ -30,6 +30,12 @@ class QStatusBar; class SequenceToolBox; class QStackedWidget; +#include "DockAreaWidget.h" +#include "DockWidget.h" +#include "DockManager.h" +#include + + class CentralAppWindow : public QMainWindow { Q_OBJECT @@ -47,6 +53,12 @@ private: private: QAction *m_quitAction; + QAction *m_reference_action; + QAction *m_utils_action; + QAction *m_image_lib_action; + QAction *m_disk_explorer_action; + QAction *m_projects_action; + QActionGroup *m_tool_action_group; MainAppToolbar *m_mainToolBar; QTreeView *m_directory_area; @@ -55,6 +67,10 @@ private: SequenceToolBox *m_toolbox; + ads::CDockManager *DockManager; + ads::CDockWidget *CentralDockWidget; + ads::CDockAreaWidget *m_central_dock_area; + QStackedWidget *m_central_stack; }; diff --git a/src/ui/diskexplorer/DiskExplorer.cpp b/src/ui/diskexplorer/DiskExplorer.cpp index b4ba2d4..db45f86 100644 --- a/src/ui/diskexplorer/DiskExplorer.cpp +++ b/src/ui/diskexplorer/DiskExplorer.cpp @@ -134,7 +134,7 @@ void DiskExplorer::initUi() // m_hdv = new HexDumpViewer(this, 10); // frameLayout->addWidget(m_hdv); - m_vws = new ViewWidgetStack(this); + m_vws = m_demw->generateViewWidgetStack(); // new ViewWidgetStack(this); frameLayout->addWidget(m_vws); m_gridLayout->setColumnStretch(0,4); @@ -155,8 +155,8 @@ void DiskExplorer::initUi() connect(m_cw, &CatalogWidget::openWithDefaultViewer, this, &DiskExplorer::handleDiskItemSelectedDefaultOpen); - connect(m_demw, &DiskExplorerMapWidget::showSectorData, - this, &DiskExplorer::handleShowSectorData); +// connect(m_demw, &DiskExplorerMapWidget::showSectorData, +// this, &DiskExplorer::handleShowSectorData); QStatusBar *statusBar = new QStatusBar(this); setStatusBar(statusBar); @@ -179,6 +179,8 @@ void DiskExplorer::unloadDiskFile() } } + + void DiskExplorer::loadDiskFile(QString filename) { if (m_disk) { @@ -202,6 +204,7 @@ void DiskExplorer::loadDiskFile(QString filename) void DiskExplorer::handleShowSectorData(QByteArray /*data*/, int track, int sector, QVariant metadata) { + return; ViewWidgetStack::PreferredViewer viewer = ViewWidgetStack::PreferredViewer::DontCare; diff --git a/src/ui/diskexplorer/DiskExplorer.h b/src/ui/diskexplorer/DiskExplorer.h index a9685bf..b0529d1 100644 --- a/src/ui/diskexplorer/DiskExplorer.h +++ b/src/ui/diskexplorer/DiskExplorer.h @@ -65,6 +65,7 @@ private slots: void setDiskToolsVisible(bool visible); void handleViewerClosing(ViewerBase *viewer); + protected: void initUi(); diff --git a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp index ad599c2..70458be 100644 --- a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp +++ b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp @@ -157,6 +157,8 @@ void DiskExplorerMapWidget::handleButtonCheck(int track, int sector, bool checke Sector sec = m_disk->getSector(track,sector); QByteArray *data = sec.rawData(); emit showSectorData(*data,track,sector,QVariant((int) m_roles[TSPair(track,sector)])); + emit showSector(&sec,track,sector,m_roles[TSPair(track,sector)]); + m_trackSectorLabel->setText( QString("Track: %1 Sector: %2 (%3)") .arg(track) @@ -165,6 +167,8 @@ void DiskExplorerMapWidget::handleButtonCheck(int track, int sector, bool checke } else{ emit showSectorData(QByteArray(),-1,-1,QVariant(-1)); + emit showSector(nullptr, -1, -1, DiskSectorRole::Unknown); + m_trackSectorLabel->setText("No Track/Sector selected"); } @@ -249,7 +253,7 @@ QGroupBox *DiskExplorerMapWidget::makeKeyWidget() { int idx = 0; QGroupBox *groupbox= new QGroupBox(); - groupbox->setTitle("Key"); + //groupbox->setTitle("Key"); QGridLayout *layout = new QGridLayout(); layout->setVerticalSpacing(0); layout->setHorizontalSpacing(0); @@ -273,6 +277,15 @@ QGroupBox *DiskExplorerMapWidget::makeKeyWidget() return groupbox; } +ViewWidgetStack *DiskExplorerMapWidget::generateViewWidgetStack() +{ + ViewWidgetStack *vws = new ViewWidgetStack(); + vws->setSector(nullptr); + connect(this, &DiskExplorerMapWidget::showSector, + vws, &ViewWidgetStack::handleShowSectorData); + return vws; +} + DEButton *DiskExplorerMapWidget::buttonAt(int track, int sector) { //qDebug() << "Button At:" << track << "," << sector; diff --git a/src/ui/diskexplorer/DiskExplorerMapWidget.h b/src/ui/diskexplorer/DiskExplorerMapWidget.h index 8774ec2..999dc22 100644 --- a/src/ui/diskexplorer/DiskExplorerMapWidget.h +++ b/src/ui/diskexplorer/DiskExplorerMapWidget.h @@ -20,6 +20,7 @@ *****************************************************************************/ #include "dos33diskimage.h" +#include "viewwidgetstack.h" #include #include @@ -30,6 +31,7 @@ #include #include + class DEButton : public QToolButton { Q_OBJECT @@ -112,7 +114,8 @@ private: "} " " " "DEButton:checked { " - " font: bold italic 11px; " + // " font: bold italic 11px; " + " font: bold 11px; " "}" ).arg(m_fgColor) .arg(m_backgroundColor); @@ -168,9 +171,12 @@ public: QGroupBox *makeKeyWidget(); QWidget *getStatusWidget() const { return m_statusWidget; } + ViewWidgetStack *generateViewWidgetStack(); + signals: void showSectorData(QByteArray data, int track, int sector, QVariant metadata); + void showSector(Sector *sec, int track, int sector, DiskSectorRole role); public slots: void handleButtonCheck(int track, int sector, bool checked); @@ -206,6 +212,8 @@ protected: int &buttonNumber, int &tslCount); DiskSectorRole getFileTypeFromID(QString id); void checkForUsedButUnknown(TSPair vtoc = TSPair(17,0)); + + private: QMap > m_buttons; diff --git a/src/ui/diskexplorer/viewwidgetstack.cpp b/src/ui/diskexplorer/viewwidgetstack.cpp index b3798e1..7c7175a 100644 --- a/src/ui/diskexplorer/viewwidgetstack.cpp +++ b/src/ui/diskexplorer/viewwidgetstack.cpp @@ -21,6 +21,7 @@ #include "vtocview.h" #include "catalogsectorview.h" #include "tslistview.h" +#include "DiskExplorerMapWidget.h" ViewWidgetStack::ViewWidgetStack(QWidget *parent) : QTabWidget(parent) { @@ -77,3 +78,34 @@ void ViewWidgetStack::makeWidgets() setCurrentWidget(m_hdv); } + +void ViewWidgetStack::handleShowSectorData(Sector *data, int track, + int sector, DiskSectorRole role) +{ + + ViewWidgetStack::PreferredViewer viewer = + ViewWidgetStack::PreferredViewer::DontCare; + + bool USE_SPECIFIC_VIEWER = true; // Hook for later allowing the disuse of + if (USE_SPECIFIC_VIEWER) // default viewer switching + { + if (role == DiskSectorRole::VTOC) + { + viewer = ViewWidgetStack::PreferredViewer::VTOC; + } + else if (role == DiskSectorRole::CatalogSector) + { + viewer = ViewWidgetStack::PreferredViewer::CatalogSector; + } + else if (role == DiskSectorRole::TSList) + { + viewer = ViewWidgetStack::PreferredViewer::TSList; + } + else + { + viewer = ViewWidgetStack::PreferredViewer::HexDump; + } + } + + setSector(data, viewer); +} diff --git a/src/ui/diskexplorer/viewwidgetstack.h b/src/ui/diskexplorer/viewwidgetstack.h index d33e40c..573b1f1 100644 --- a/src/ui/diskexplorer/viewwidgetstack.h +++ b/src/ui/diskexplorer/viewwidgetstack.h @@ -28,6 +28,7 @@ class HexDumpViewer; class VTOCView; class CatalogSectorView; class TSListView; +enum class DiskSectorRole; class ViewWidgetStack : public QTabWidget { @@ -48,6 +49,10 @@ public: public slots: void setSector(Sector *sec, PreferredViewer viewer = PreferredViewer::DontCare); + void handleShowSectorData(Sector *data, int track, int sector, DiskSectorRole role); + + + private: void makeWidgets(); diff --git a/src/ui/diskexplorer/vtocview.cpp b/src/ui/diskexplorer/vtocview.cpp index 6975a57..5a5b37c 100644 --- a/src/ui/diskexplorer/vtocview.cpp +++ b/src/ui/diskexplorer/vtocview.cpp @@ -52,7 +52,8 @@ void VTOCView::setSector(Sector *sec) ui->m_lastAllocTrackLabel->setText(QString("%1").arg(v.lastTrackAllocated())); - ui->m_allocDirLabel->setText(QString("%1").arg(v.directionOfAllocation())); + ui->m_allocDirLabel->setText(QString("%1 %2").arg(v.directionOfAllocation()) + .arg((v.directionOfAllocation()>0)?"==>":"<==")); ui->m_tracksPerDiskLabel->setText(QString("%1").arg(v.tracksPerDisk())); @@ -90,7 +91,7 @@ void VTOCView::setSector(Sector *sec) ui->m_usageTextBrowser->setText(""); ui->m_usageTextBrowser->setWordWrapMode(QTextOption::NoWrap); auto format = ui->m_usageTextBrowser->currentCharFormat(); - format.setFont(QFont("courier new",6)); + // format.setFont(QFont("courier new"/*,6*/)); ui->m_usageTextBrowser->setCurrentCharFormat(format); ui->m_usageTextBrowser->insertPlainText(usage); @@ -115,8 +116,3 @@ void VTOCView::setSector(Sector *sec) } - -QString VTOCView::makeUsage() -{ -return QString(); -} diff --git a/src/ui/diskexplorer/vtocview.h b/src/ui/diskexplorer/vtocview.h index 0af655e..7a8d6e6 100644 --- a/src/ui/diskexplorer/vtocview.h +++ b/src/ui/diskexplorer/vtocview.h @@ -39,8 +39,6 @@ public: void setSector(Sector *sec); -protected: - QString makeUsage(); private: Ui::VTOCView *ui; diff --git a/src/ui/diskexplorer/vtocview.ui b/src/ui/diskexplorer/vtocview.ui index 78b24a5..3d7073b 100644 --- a/src/ui/diskexplorer/vtocview.ui +++ b/src/ui/diskexplorer/vtocview.ui @@ -19,7 +19,7 @@ Qt::Horizontal - + @@ -105,28 +105,28 @@ - + Sectors/Track - + -- - + Bytes/Sector - + -- @@ -160,9 +160,35 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - + diff --git a/src/ui/viewers/hexdumpviewer.h b/src/ui/viewers/hexdumpviewer.h index 6ceb885..1aae825 100644 --- a/src/ui/viewers/hexdumpviewer.h +++ b/src/ui/viewers/hexdumpviewer.h @@ -19,8 +19,6 @@ * along with this program. If not, see . * *****************************************************************************/ - - #include "genericfile.h" #include "fileviewerinterface.h" @@ -57,6 +55,7 @@ public slots: protected: void setTextFont(const QFont &font, int forcedFontSize = -1); + private: void setText(QString text); void setData(QByteArray data); diff --git a/src/ui/viewers/hexdumpviewer.ui b/src/ui/viewers/hexdumpviewer.ui index 0b628f9..c58aac2 100644 --- a/src/ui/viewers/hexdumpviewer.ui +++ b/src/ui/viewers/hexdumpviewer.ui @@ -30,6 +30,9 @@ 10 + + QTextEdit::NoWrap +