From ac2e86f5e549b60776ced2c511d6641e3b942cc5 Mon Sep 17 00:00:00 2001 From: "G.K.MacGregor" Date: Tue, 8 Sep 2020 12:12:24 +0100 Subject: [PATCH] Rename X/28 dock widgets to "enhancements" widget. --- mainwindow.cpp | 52 +++++++++---------- mainwindow.h | 10 ++-- ...dget.cpp => pageenhancementsdockwidget.cpp | 48 ++++++++--------- ...ckwidget.h => pageenhancementsdockwidget.h | 8 +-- qteletextmaker.pro | 8 +-- 5 files changed, 63 insertions(+), 63 deletions(-) rename x28dockwidget.cpp => pageenhancementsdockwidget.cpp (75%) rename x28dockwidget.h => pageenhancementsdockwidget.h (87%) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2f71789..888204e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -33,10 +33,10 @@ #include "mainwindow.h" #include "mainwidget.h" +#include "pageenhancementsdockwidget.h" #include "pageoptionsdockwidget.h" #include "palettedockwidget.h" #include "x26dockwidget.h" -#include "x28dockwidget.h" MainWindow::MainWindow() { @@ -132,14 +132,14 @@ void MainWindow::init() m_textWidget = new TeletextWidget; - m_paletteDock = new PaletteDockWidget(m_textWidget); - addDockWidget(Qt::RightDockWidgetArea, m_paletteDock); - m_x26Dock = new X26DockWidget(m_textWidget); - addDockWidget(Qt::RightDockWidgetArea, m_x26Dock); - m_x28Dock = new X28DockWidget(m_textWidget); - addDockWidget(Qt::RightDockWidgetArea, m_x28Dock); - m_pageOptionsDock = new PageOptionsDockWidget(m_textWidget); - addDockWidget(Qt::RightDockWidgetArea, m_pageOptionsDock); + m_pageOptionsDockWidget = new PageOptionsDockWidget(m_textWidget); + addDockWidget(Qt::RightDockWidgetArea, m_pageOptionsDockWidget); + m_pageEnhancementsDockWidget = new PageEnhancementsDockWidget(m_textWidget); + addDockWidget(Qt::RightDockWidgetArea, m_pageEnhancementsDockWidget); + m_x26DockWidget = new X26DockWidget(m_textWidget); + addDockWidget(Qt::RightDockWidgetArea, m_x26DockWidget); + m_paletteDockWidget = new PaletteDockWidget(m_textWidget); + addDockWidget(Qt::RightDockWidgetArea, m_paletteDockWidget); createActions(); createStatusBar(); @@ -181,7 +181,7 @@ void MainWindow::init() connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition); connect(m_textWidget->document()->undoStack(), &QUndoStack::cleanChanged, this, [=]() { setWindowModified(!m_textWidget->document()->undoStack()->isClean()); } ); - connect(m_textWidget->document(), &TeletextDocument::aboutToChangeSubPage, m_x26Dock, &X26DockWidget::unloadX26List); + connect(m_textWidget->document(), &TeletextDocument::aboutToChangeSubPage, m_x26DockWidget, &X26DockWidget::unloadX26List); connect(m_textWidget->document(), &TeletextDocument::subPageSelected, this, &MainWindow::updatePageWidgets); connect(m_textWidget, &TeletextWidget::sizeChanged, this, &MainWindow::setSceneDimensions); connect(m_textWidget->pageRender(), &TeletextPageRender::fullScreenColourChanged, this, &MainWindow::updateFullScreenRectItems); @@ -485,10 +485,10 @@ void MainWindow::createActions() QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools")); - toolsMenu->addAction(m_pageOptionsDock->toggleViewAction()); - toolsMenu->addAction(m_x26Dock->toggleViewAction()); - toolsMenu->addAction(m_x28Dock->toggleViewAction()); - toolsMenu->addAction(m_paletteDock->toggleViewAction()); + toolsMenu->addAction(m_pageOptionsDockWidget->toggleViewAction()); + toolsMenu->addAction(m_x26DockWidget->toggleViewAction()); + toolsMenu->addAction(m_pageEnhancementsDockWidget->toggleViewAction()); + toolsMenu->addAction(m_paletteDockWidget->toggleViewAction()); //FIXME is this main menubar separator to put help menu towards the right? menuBar()->addSeparator(); @@ -631,14 +631,14 @@ void MainWindow::readSettings() } else restoreGeometry(geometry); if (windowState.isEmpty()) { - m_x26Dock->hide(); - m_x26Dock->setFloating(true); - m_x28Dock->hide(); - m_x26Dock->setFloating(true); - m_pageOptionsDock->hide(); - m_pageOptionsDock->setFloating(true); - m_paletteDock->hide(); - m_paletteDock->setFloating(true); + m_pageOptionsDockWidget->hide(); + m_pageOptionsDockWidget->setFloating(true); + m_pageEnhancementsDockWidget->hide(); + m_pageEnhancementsDockWidget->setFloating(true); + m_x26DockWidget->hide(); + m_x26DockWidget->setFloating(true); + m_paletteDockWidget->hide(); + m_paletteDockWidget->setFloating(true); } else restoreState(windowState); } @@ -827,8 +827,8 @@ void MainWindow::updateCursorPosition() void MainWindow::updatePageWidgets() { updateCursorPosition(); - m_paletteDock->updateAllColourButtons(); - m_x26Dock->loadX26List(); - m_x28Dock->updateWidgets(); - m_pageOptionsDock->updateWidgets(); + m_pageOptionsDockWidget->updateWidgets(); + m_pageEnhancementsDockWidget->updateWidgets(); + m_x26DockWidget->loadX26List(); + m_paletteDockWidget->updateAllColourButtons(); } diff --git a/mainwindow.h b/mainwindow.h index 8170435..0f4adc1 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -29,10 +29,10 @@ #include #include "mainwidget.h" +#include "pageenhancementsdockwidget.h" #include "pageoptionsdockwidget.h" #include "palettedockwidget.h" #include "x26dockwidget.h" -#include "x28dockwidget.h" class QAction; class QMenu; @@ -102,10 +102,10 @@ private: QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25]; int m_viewBorder, m_viewAspectRatio, m_viewZoom; - PaletteDockWidget *m_paletteDock; - X26DockWidget *m_x26Dock; - X28DockWidget *m_x28Dock; - PageOptionsDockWidget *m_pageOptionsDock; + PageOptionsDockWidget *m_pageOptionsDockWidget; + PageEnhancementsDockWidget *m_pageEnhancementsDockWidget; + X26DockWidget *m_x26DockWidget; + PaletteDockWidget *m_paletteDockWidget; QAction *m_recentFileActs[m_MaxRecentFiles]; QAction *m_recentFileSeparator; diff --git a/x28dockwidget.cpp b/pageenhancementsdockwidget.cpp similarity index 75% rename from x28dockwidget.cpp rename to pageenhancementsdockwidget.cpp index acf3bcb..36b9b0d 100644 --- a/x28dockwidget.cpp +++ b/pageenhancementsdockwidget.cpp @@ -23,19 +23,19 @@ #include #include -#include "x28dockwidget.h" +#include "pageenhancementsdockwidget.h" -X28DockWidget::X28DockWidget(TeletextWidget *parent): QDockWidget(parent) +PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent): QDockWidget(parent) { - QGridLayout *x28Layout = new QGridLayout; - QWidget *x28Widget = new QWidget; + QGridLayout *pageEnhancementsLayout = new QGridLayout; + QWidget *pageEnhancementsWidget = new QWidget; m_parentMainWidget = parent; - this->setObjectName("X28DockWidget"); - this->setWindowTitle("X/28 enhancements"); - x28Layout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1); - x28Layout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1); + this->setObjectName("PageEnhancementsDockWidget"); + this->setWindowTitle("Page enhancements"); + pageEnhancementsLayout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1); + pageEnhancementsLayout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1); m_defaultScreenColourCombo = new QComboBox; m_defaultRowColourCombo = new QComboBox; for (int r=0; r<=3; r++) @@ -43,11 +43,11 @@ X28DockWidget::X28DockWidget(TeletextWidget *parent): QDockWidget(parent) m_defaultScreenColourCombo->addItem(tr("CLUT %1:%2").arg(r).arg(c)); m_defaultRowColourCombo->addItem(tr("CLUT %1:%2").arg(r).arg(c)); } - x28Layout->addWidget(m_defaultScreenColourCombo, 0, 1, 1, 1, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_defaultScreenColourCombo, 0, 1, 1, 1, Qt::AlignTop); connect(m_defaultScreenColourCombo, QOverload::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultScreenColour(index); }); - x28Layout->addWidget(m_defaultRowColourCombo, 1, 1, 1, 1, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_defaultRowColourCombo, 1, 1, 1, 1, Qt::AlignTop); connect(m_defaultRowColourCombo, QOverload::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultRowColour(index); }); - x28Layout->addWidget(new QLabel(tr("Colour remapping")), 2, 0, 1, 1); + pageEnhancementsLayout->addWidget(new QLabel(tr("Colour remapping")), 2, 0, 1, 1); m_colourTableCombo = new QComboBox; m_colourTableCombo->addItem("Fore 0 Back 0"); m_colourTableCombo->addItem("Fore 0 Back 1"); @@ -57,34 +57,34 @@ X28DockWidget::X28DockWidget(TeletextWidget *parent): QDockWidget(parent) m_colourTableCombo->addItem("Fore 2 Back 1"); m_colourTableCombo->addItem("Fore 2 Back 2"); m_colourTableCombo->addItem("Fore 2 Back 3"); - x28Layout->addWidget(m_colourTableCombo, 2, 1, 1, 1, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_colourTableCombo, 2, 1, 1, 1, Qt::AlignTop); connect(m_colourTableCombo, QOverload::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setColourTableRemap(index); }); m_blackBackgroundSubstAct = new QCheckBox("Black background colour substitution"); - x28Layout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop); connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setBlackBackgroundSubst); - x28Layout->addWidget(new QLabel(tr("Left side panel columns")), 4, 0, 1, 1); + pageEnhancementsLayout->addWidget(new QLabel(tr("Left side panel columns")), 4, 0, 1, 1); m_leftSidePanelSpinBox = new QSpinBox(this); m_leftSidePanelSpinBox->setMaximum(16); - x28Layout->addWidget(m_leftSidePanelSpinBox, 4, 1, 1, 1, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_leftSidePanelSpinBox, 4, 1, 1, 1, Qt::AlignTop); connect(m_leftSidePanelSpinBox, QOverload::of(&QSpinBox::valueChanged), [=](int index){ setLeftSidePanelWidth(index); }); - x28Layout->addWidget(new QLabel(tr("Right side panel columns")), 5, 0, 1, 1); + pageEnhancementsLayout->addWidget(new QLabel(tr("Right side panel columns")), 5, 0, 1, 1); m_rightSidePanelSpinBox = new QSpinBox(this); m_rightSidePanelSpinBox->setMaximum(16); - x28Layout->addWidget(m_rightSidePanelSpinBox, 5, 1, 1, 1, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_rightSidePanelSpinBox, 5, 1, 1, 1, Qt::AlignTop); connect(m_rightSidePanelSpinBox, QOverload::of(&QSpinBox::valueChanged), [=](int index){ setRightSidePanelWidth(index); }); m_sidePanelStatusAct = new QCheckBox("Side panels at level 3.5 only"); - x28Layout->addWidget(m_sidePanelStatusAct, 6, 0, 1, 2, Qt::AlignTop); + pageEnhancementsLayout->addWidget(m_sidePanelStatusAct, 6, 0, 1, 2, Qt::AlignTop); connect(m_sidePanelStatusAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setSidePanelAtL35Only); - x28Layout->setRowStretch(6, 1); - x28Widget->setLayout(x28Layout); - this->setWidget(x28Widget); + pageEnhancementsLayout->setRowStretch(6, 1); + pageEnhancementsWidget->setLayout(pageEnhancementsLayout); + this->setWidget(pageEnhancementsWidget); } -void X28DockWidget::setLeftSidePanelWidth(int newLeftPanelSize) +void PageEnhancementsDockWidget::setLeftSidePanelWidth(int newLeftPanelSize) { if (newLeftPanelSize && m_rightSidePanelSpinBox->value()) { int newRightPanelSize = 16-newLeftPanelSize; @@ -95,7 +95,7 @@ void X28DockWidget::setLeftSidePanelWidth(int newLeftPanelSize) m_parentMainWidget->setSidePanelWidths(newLeftPanelSize, m_rightSidePanelSpinBox->value()); } -void X28DockWidget::setRightSidePanelWidth(int newRightPanelSize) +void PageEnhancementsDockWidget::setRightSidePanelWidth(int newRightPanelSize) { if (newRightPanelSize && m_leftSidePanelSpinBox->value()) { int newLeftPanelSize = 16-newRightPanelSize; @@ -106,7 +106,7 @@ void X28DockWidget::setRightSidePanelWidth(int newRightPanelSize) m_parentMainWidget->setSidePanelWidths(m_leftSidePanelSpinBox->value(), newRightPanelSize); } -void X28DockWidget::updateWidgets() +void PageEnhancementsDockWidget::updateWidgets() { int leftSidePanelColumnsResult = 0; int rightSidePanelColumnsResult = 0; diff --git a/x28dockwidget.h b/pageenhancementsdockwidget.h similarity index 87% rename from x28dockwidget.h rename to pageenhancementsdockwidget.h index f67ff64..7ee9781 100644 --- a/x28dockwidget.h +++ b/pageenhancementsdockwidget.h @@ -17,8 +17,8 @@ * along with QTeletextMaker. If not, see . */ -#ifndef X28DOCKWIDGET_H -#define X28DOCKWIDGET_H +#ifndef PAGEENHANCEMENTSDOCKWIDGET_H +#define PAGEENHANCEMENTSDOCKWIDGET_H #include #include @@ -27,12 +27,12 @@ #include "mainwidget.h" -class X28DockWidget : public QDockWidget +class PageEnhancementsDockWidget : public QDockWidget { Q_OBJECT public: - X28DockWidget(TeletextWidget *parent); + PageEnhancementsDockWidget(TeletextWidget *parent); void updateWidgets(); private: diff --git a/qteletextmaker.pro b/qteletextmaker.pro index a984eff..553c85c 100644 --- a/qteletextmaker.pro +++ b/qteletextmaker.pro @@ -5,25 +5,25 @@ HEADERS = document.h \ mainwidget.h \ mainwindow.h \ page.h \ + pageenhancementsdockwidget.h \ pageoptionsdockwidget.h \ palettedockwidget.h \ render.h \ x26dockwidget.h \ x26model.h \ - x26triplets.h \ - x28dockwidget.h + x26triplets.h SOURCES = document.cpp \ main.cpp \ mainwidget.cpp \ mainwindow.cpp \ + pageenhancementsdockwidget.cpp \ pageoptionsdockwidget.cpp \ palettedockwidget.cpp \ page.cpp \ render.cpp \ x26dockwidget.cpp \ x26model.cpp \ - x26triplets.cpp \ - x28dockwidget.cpp + x26triplets.cpp RESOURCES = qteletextmaker.qrc # install