daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename X/28 dock widgets to "enhancements" widget.

Browse Source
This commit is contained in:
G.K.MacGregor
2020-09-08 12:12:24 +01:00
parent ff613679a8
commit ac2e86f5e5
5 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mainwindow.cpp
View File

@@ -33,10 +33,10 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "pageenhancementsdockwidget.h"
#include "pageoptionsdockwidget.h" #include "pageoptionsdockwidget.h"
#include "palettedockwidget.h" #include "palettedockwidget.h"
#include "x26dockwidget.h" #include "x26dockwidget.h"
#include "x28dockwidget.h"
MainWindow::MainWindow() MainWindow::MainWindow()
{ {
@@ -132,14 +132,14 @@ void MainWindow::init()
m_textWidget = new TeletextWidget; m_textWidget = new TeletextWidget;
m_paletteDock = new PaletteDockWidget(m_textWidget); m_pageOptionsDockWidget = new PageOptionsDockWidget(m_textWidget);
addDockWidget(Qt::RightDockWidgetArea, m_paletteDock); addDockWidget(Qt::RightDockWidgetArea, m_pageOptionsDockWidget);
m_x26Dock = new X26DockWidget(m_textWidget); m_pageEnhancementsDockWidget = new PageEnhancementsDockWidget(m_textWidget);
addDockWidget(Qt::RightDockWidgetArea, m_x26Dock); addDockWidget(Qt::RightDockWidgetArea, m_pageEnhancementsDockWidget);
m_x28Dock = new X28DockWidget(m_textWidget); m_x26DockWidget = new X26DockWidget(m_textWidget);
addDockWidget(Qt::RightDockWidgetArea, m_x28Dock); addDockWidget(Qt::RightDockWidgetArea, m_x26DockWidget);
m_pageOptionsDock = new PageOptionsDockWidget(m_textWidget); m_paletteDockWidget = new PaletteDockWidget(m_textWidget);
addDockWidget(Qt::RightDockWidgetArea, m_pageOptionsDock); addDockWidget(Qt::RightDockWidgetArea, m_paletteDockWidget);
createActions(); createActions();
createStatusBar(); createStatusBar();
@@ -181,7 +181,7 @@ void MainWindow::init()
connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition); 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()->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->document(), &TeletextDocument::subPageSelected, this, &MainWindow::updatePageWidgets);
connect(m_textWidget, &TeletextWidget::sizeChanged, this, &MainWindow::setSceneDimensions); connect(m_textWidget, &TeletextWidget::sizeChanged, this, &MainWindow::setSceneDimensions);
connect(m_textWidget->pageRender(), &TeletextPageRender::fullScreenColourChanged, this, &MainWindow::updateFullScreenRectItems); connect(m_textWidget->pageRender(), &TeletextPageRender::fullScreenColourChanged, this, &MainWindow::updateFullScreenRectItems);
@@ -485,10 +485,10 @@ void MainWindow::createActions()
QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools")); QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools"));
toolsMenu->addAction(m_pageOptionsDock->toggleViewAction()); toolsMenu->addAction(m_pageOptionsDockWidget->toggleViewAction());
toolsMenu->addAction(m_x26Dock->toggleViewAction()); toolsMenu->addAction(m_x26DockWidget->toggleViewAction());
toolsMenu->addAction(m_x28Dock->toggleViewAction()); toolsMenu->addAction(m_pageEnhancementsDockWidget->toggleViewAction());
toolsMenu->addAction(m_paletteDock->toggleViewAction()); toolsMenu->addAction(m_paletteDockWidget->toggleViewAction());
//FIXME is this main menubar separator to put help menu towards the right? //FIXME is this main menubar separator to put help menu towards the right?
menuBar()->addSeparator(); menuBar()->addSeparator();
@@ -631,14 +631,14 @@ void MainWindow::readSettings()
} else } else
restoreGeometry(geometry); restoreGeometry(geometry);
if (windowState.isEmpty()) { if (windowState.isEmpty()) {
m_x26Dock->hide(); m_pageOptionsDockWidget->hide();
m_x26Dock->setFloating(true); m_pageOptionsDockWidget->setFloating(true);
m_x28Dock->hide(); m_pageEnhancementsDockWidget->hide();
m_x26Dock->setFloating(true); m_pageEnhancementsDockWidget->setFloating(true);
m_pageOptionsDock->hide(); m_x26DockWidget->hide();
m_pageOptionsDock->setFloating(true); m_x26DockWidget->setFloating(true);
m_paletteDock->hide(); m_paletteDockWidget->hide();
m_paletteDock->setFloating(true); m_paletteDockWidget->setFloating(true);
} else } else
restoreState(windowState); restoreState(windowState);
} }
@@ -827,8 +827,8 @@ void MainWindow::updateCursorPosition()
void MainWindow::updatePageWidgets() void MainWindow::updatePageWidgets()
{ {
updateCursorPosition(); updateCursorPosition();
m_paletteDock->updateAllColourButtons(); m_pageOptionsDockWidget->updateWidgets();
m_x26Dock->loadX26List(); m_pageEnhancementsDockWidget->updateWidgets();
m_x28Dock->updateWidgets(); m_x26DockWidget->loadX26List();
m_pageOptionsDock->updateWidgets(); m_paletteDockWidget->updateAllColourButtons();
} }

10
mainwindow.h
View File

@@ -29,10 +29,10 @@
#include <QLabel> #include <QLabel>
#include "mainwidget.h" #include "mainwidget.h"
#include "pageenhancementsdockwidget.h"
#include "pageoptionsdockwidget.h" #include "pageoptionsdockwidget.h"
#include "palettedockwidget.h" #include "palettedockwidget.h"
#include "x26dockwidget.h" #include "x26dockwidget.h"
#include "x28dockwidget.h"
class QAction; class QAction;
class QMenu; class QMenu;
@@ -102,10 +102,10 @@ private:
QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25]; QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25];
int m_viewBorder, m_viewAspectRatio, m_viewZoom; int m_viewBorder, m_viewAspectRatio, m_viewZoom;
PaletteDockWidget *m_paletteDock; PageOptionsDockWidget *m_pageOptionsDockWidget;
X26DockWidget *m_x26Dock; PageEnhancementsDockWidget *m_pageEnhancementsDockWidget;
X28DockWidget *m_x28Dock; X26DockWidget *m_x26DockWidget;
PageOptionsDockWidget *m_pageOptionsDock; PaletteDockWidget *m_paletteDockWidget;
QAction *m_recentFileActs[m_MaxRecentFiles]; QAction *m_recentFileActs[m_MaxRecentFiles];
QAction *m_recentFileSeparator; QAction *m_recentFileSeparator;

48
x28dockwidget.cpp → pageenhancementsdockwidget.cpp
View File

@@ -23,19 +23,19 @@
#include <QLabel> #include <QLabel>
#include <QSpinBox> #include <QSpinBox>
#include "x28dockwidget.h" #include "pageenhancementsdockwidget.h"
X28DockWidget::X28DockWidget(TeletextWidget *parent): QDockWidget(parent) PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent): QDockWidget(parent)
{ {
QGridLayout *x28Layout = new QGridLayout; QGridLayout *pageEnhancementsLayout = new QGridLayout;
QWidget *x28Widget = new QWidget; QWidget *pageEnhancementsWidget = new QWidget;
m_parentMainWidget = parent; m_parentMainWidget = parent;
this->setObjectName("X28DockWidget"); this->setObjectName("PageEnhancementsDockWidget");
this->setWindowTitle("X/28 enhancements"); this->setWindowTitle("Page enhancements");
x28Layout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1); pageEnhancementsLayout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1);
x28Layout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1); pageEnhancementsLayout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1);
m_defaultScreenColourCombo = new QComboBox; m_defaultScreenColourCombo = new QComboBox;
m_defaultRowColourCombo = new QComboBox; m_defaultRowColourCombo = new QComboBox;
for (int r=0; r<=3; r++) 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_defaultScreenColourCombo->addItem(tr("CLUT %1:%2").arg(r).arg(c));
m_defaultRowColourCombo->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<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultScreenColour(index); }); connect(m_defaultScreenColourCombo, QOverload<int>::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<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultRowColour(index); }); connect(m_defaultRowColourCombo, QOverload<int>::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 = new QComboBox;
m_colourTableCombo->addItem("Fore 0 Back 0"); m_colourTableCombo->addItem("Fore 0 Back 0");
m_colourTableCombo->addItem("Fore 0 Back 1"); 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 1");
m_colourTableCombo->addItem("Fore 2 Back 2"); m_colourTableCombo->addItem("Fore 2 Back 2");
m_colourTableCombo->addItem("Fore 2 Back 3"); 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<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setColourTableRemap(index); }); connect(m_colourTableCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setColourTableRemap(index); });
m_blackBackgroundSubstAct = new QCheckBox("Black background colour substitution"); 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); 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 = new QSpinBox(this);
m_leftSidePanelSpinBox->setMaximum(16); 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<int>::of(&QSpinBox::valueChanged), [=](int index){ setLeftSidePanelWidth(index); }); connect(m_leftSidePanelSpinBox, QOverload<int>::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 = new QSpinBox(this);
m_rightSidePanelSpinBox->setMaximum(16); 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<int>::of(&QSpinBox::valueChanged), [=](int index){ setRightSidePanelWidth(index); }); connect(m_rightSidePanelSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), [=](int index){ setRightSidePanelWidth(index); });
m_sidePanelStatusAct = new QCheckBox("Side panels at level 3.5 only"); 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); connect(m_sidePanelStatusAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setSidePanelAtL35Only);
x28Layout->setRowStretch(6, 1); pageEnhancementsLayout->setRowStretch(6, 1);
x28Widget->setLayout(x28Layout); pageEnhancementsWidget->setLayout(pageEnhancementsLayout);
this->setWidget(x28Widget); this->setWidget(pageEnhancementsWidget);
} }
void X28DockWidget::setLeftSidePanelWidth(int newLeftPanelSize) void PageEnhancementsDockWidget::setLeftSidePanelWidth(int newLeftPanelSize)
{ {
if (newLeftPanelSize && m_rightSidePanelSpinBox->value()) { if (newLeftPanelSize && m_rightSidePanelSpinBox->value()) {
int newRightPanelSize = 16-newLeftPanelSize; int newRightPanelSize = 16-newLeftPanelSize;
@@ -95,7 +95,7 @@ void X28DockWidget::setLeftSidePanelWidth(int newLeftPanelSize)
m_parentMainWidget->setSidePanelWidths(newLeftPanelSize, m_rightSidePanelSpinBox->value()); m_parentMainWidget->setSidePanelWidths(newLeftPanelSize, m_rightSidePanelSpinBox->value());
} }
void X28DockWidget::setRightSidePanelWidth(int newRightPanelSize) void PageEnhancementsDockWidget::setRightSidePanelWidth(int newRightPanelSize)
{ {
if (newRightPanelSize && m_leftSidePanelSpinBox->value()) { if (newRightPanelSize && m_leftSidePanelSpinBox->value()) {
int newLeftPanelSize = 16-newRightPanelSize; int newLeftPanelSize = 16-newRightPanelSize;
@@ -106,7 +106,7 @@ void X28DockWidget::setRightSidePanelWidth(int newRightPanelSize)
m_parentMainWidget->setSidePanelWidths(m_leftSidePanelSpinBox->value(), newRightPanelSize); m_parentMainWidget->setSidePanelWidths(m_leftSidePanelSpinBox->value(), newRightPanelSize);
} }
void X28DockWidget::updateWidgets() void PageEnhancementsDockWidget::updateWidgets()
{ {
int leftSidePanelColumnsResult = 0; int leftSidePanelColumnsResult = 0;
int rightSidePanelColumnsResult = 0; int rightSidePanelColumnsResult = 0;

8
x28dockwidget.h → pageenhancementsdockwidget.h
View File

@@ -17,8 +17,8 @@
* along with QTeletextMaker. If not, see <https://www.gnu.org/licenses/>. * along with QTeletextMaker. If not, see <https://www.gnu.org/licenses/>.
*/ */
#ifndef X28DOCKWIDGET_H #ifndef PAGEENHANCEMENTSDOCKWIDGET_H
#define X28DOCKWIDGET_H #define PAGEENHANCEMENTSDOCKWIDGET_H
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
@@ -27,12 +27,12 @@
#include "mainwidget.h" #include "mainwidget.h"
class X28DockWidget : public QDockWidget class PageEnhancementsDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
X28DockWidget(TeletextWidget *parent); PageEnhancementsDockWidget(TeletextWidget *parent);
void updateWidgets(); void updateWidgets();
private: private:

8
qteletextmaker.pro
View File

@@ -5,25 +5,25 @@ HEADERS = document.h \
mainwidget.h \ mainwidget.h \
mainwindow.h \ mainwindow.h \
page.h \ page.h \
pageenhancementsdockwidget.h \
pageoptionsdockwidget.h \ pageoptionsdockwidget.h \
palettedockwidget.h \ palettedockwidget.h \
render.h \ render.h \
x26dockwidget.h \ x26dockwidget.h \
x26model.h \ x26model.h \
x26triplets.h \ x26triplets.h
x28dockwidget.h
SOURCES = document.cpp \ SOURCES = document.cpp \
main.cpp \ main.cpp \
mainwidget.cpp \ mainwidget.cpp \
mainwindow.cpp \ mainwindow.cpp \
pageenhancementsdockwidget.cpp \
pageoptionsdockwidget.cpp \ pageoptionsdockwidget.cpp \
palettedockwidget.cpp \ palettedockwidget.cpp \
page.cpp \ page.cpp \
render.cpp \ render.cpp \
x26dockwidget.cpp \ x26dockwidget.cpp \
x26model.cpp \ x26model.cpp \
x26triplets.cpp \ x26triplets.cpp
x28dockwidget.cpp
RESOURCES = qteletextmaker.qrc RESOURCES = qteletextmaker.qrc
# install # install