diff --git a/frame/item/components/containerwidget.cpp b/frame/item/components/containerwidget.cpp index f3fb11ba4..b2f4f401d 100644 --- a/frame/item/components/containerwidget.cpp +++ b/frame/item/components/containerwidget.cpp @@ -11,13 +11,13 @@ ContainerWidget::ContainerWidget(QWidget *parent) : QWidget(parent), - m_centeralLayout(new QHBoxLayout) + m_centralLayout(new QHBoxLayout) { - m_centeralLayout->addStretch(); - m_centeralLayout->setSpacing(0); - m_centeralLayout->setMargin(0); + m_centralLayout->addStretch(); + m_centralLayout->setSpacing(0); + m_centralLayout->setMargin(0); - setLayout(m_centeralLayout); + setLayout(m_centralLayout); setFixedHeight(ITEM_HEIGHT); setFixedWidth(ITEM_WIDTH); setAcceptDrops(true); @@ -27,7 +27,7 @@ void ContainerWidget::addWidget(QWidget * const w) { w->setParent(this); w->setFixedSize(ITEM_WIDTH, ITEM_HEIGHT); - m_centeralLayout->addWidget(w); + m_centralLayout->addWidget(w); m_itemList.append(w); setFixedWidth(ITEM_WIDTH * std::max(1, m_itemList.size())); @@ -35,7 +35,7 @@ void ContainerWidget::addWidget(QWidget * const w) void ContainerWidget::removeWidget(QWidget * const w) { - m_centeralLayout->removeWidget(w); + m_centralLayout->removeWidget(w); m_itemList.removeOne(w); setFixedWidth(ITEM_WIDTH * std::max(1, m_itemList.size())); diff --git a/frame/item/components/containerwidget.h b/frame/item/components/containerwidget.h index a35a34b67..e21698f6b 100644 --- a/frame/item/components/containerwidget.h +++ b/frame/item/components/containerwidget.h @@ -22,7 +22,7 @@ protected: void dragEnterEvent(QDragEnterEvent *e); private: - QHBoxLayout *m_centeralLayout; + QHBoxLayout *m_centralLayout; QList m_itemList; }; diff --git a/frame/item/pluginsitem.cpp b/frame/item/pluginsitem.cpp index a407b773a..b3a3b27b0 100644 --- a/frame/item/pluginsitem.cpp +++ b/frame/item/pluginsitem.cpp @@ -17,19 +17,19 @@ QPoint PluginsItem::MousePressPoint = QPoint(); PluginsItem::PluginsItem(PluginsItemInterface* const pluginInter, const QString &itemKey, QWidget *parent) : DockItem(parent), m_pluginInter(pluginInter), - m_centeralWidget(m_pluginInter->itemWidget(itemKey)), + m_centralWidget(m_pluginInter->itemWidget(itemKey)), m_itemKey(itemKey), m_draging(false) { - Q_ASSERT(m_centeralWidget); + Q_ASSERT(m_centralWidget); QBoxLayout *hLayout = new QHBoxLayout; - hLayout->addWidget(m_centeralWidget); + hLayout->addWidget(m_centralWidget); hLayout->setSpacing(0); hLayout->setMargin(0); - m_centeralWidget->installEventFilter(this); - m_centeralWidget->setVisible(true); + m_centralWidget->installEventFilter(this); + m_centralWidget->setVisible(true); setLayout(hLayout); setAccessibleName(pluginInter->pluginName() + "-" + m_itemKey); @@ -131,7 +131,7 @@ void PluginsItem::paintEvent(QPaintEvent *e) bool PluginsItem::eventFilter(QObject *o, QEvent *e) { if (m_draging) - if (o == m_centeralWidget && e->type() == QEvent::Paint) + if (o == m_centralWidget && e->type() == QEvent::Paint) return true; return DockItem::eventFilter(o, e); diff --git a/frame/item/pluginsitem.h b/frame/item/pluginsitem.h index e73dea5a1..766572ff8 100644 --- a/frame/item/pluginsitem.h +++ b/frame/item/pluginsitem.h @@ -44,7 +44,7 @@ private: private: PluginsItemInterface * const m_pluginInter; - QWidget *m_centeralWidget; + QWidget *m_centralWidget; const QString m_itemKey; bool m_draging; diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index bf0b0884b..86316e22c 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -16,16 +16,16 @@ DatetimePlugin::DatetimePlugin(QObject *parent) m_refershTimer->setInterval(1000); m_refershTimer->start(); - m_centeralWidget = new DatetimeWidget; + m_centralWidget = new DatetimeWidget; - connect(m_centeralWidget, &DatetimeWidget::requestContextMenu, [this] {m_proxyInter->requestContextMenu(this, QString());}); + connect(m_centralWidget, &DatetimeWidget::requestContextMenu, [this] {m_proxyInter->requestContextMenu(this, QString());}); connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString); } DatetimePlugin::~DatetimePlugin() { - delete m_centeralWidget; + delete m_centralWidget; delete m_dateTipsLabel; } @@ -51,7 +51,7 @@ QWidget *DatetimePlugin::itemWidget(const QString &itemKey) { Q_UNUSED(itemKey); - return m_centeralWidget; + return m_centralWidget; } QWidget *DatetimePlugin::itemTipsWidget(const QString &itemKey) @@ -110,5 +110,5 @@ void DatetimePlugin::updateCurrentTimeString() return; m_currentTimeString = currentString; - m_centeralWidget->update(); + m_centralWidget->update(); } diff --git a/plugins/datetime/datetimeplugin.h b/plugins/datetime/datetimeplugin.h index f9b804cb7..d18aa51e4 100644 --- a/plugins/datetime/datetimeplugin.h +++ b/plugins/datetime/datetimeplugin.h @@ -34,7 +34,7 @@ private slots: void updateCurrentTimeString(); private: - DatetimeWidget *m_centeralWidget; + DatetimeWidget *m_centralWidget; QLabel *m_dateTipsLabel; QTimer *m_refershTimer; diff --git a/plugins/disk-mount/diskcontrolitem.cpp b/plugins/disk-mount/diskcontrolitem.cpp index ddd9b9462..e4ab1b9bf 100644 --- a/plugins/disk-mount/diskcontrolitem.cpp +++ b/plugins/disk-mount/diskcontrolitem.cpp @@ -58,13 +58,13 @@ DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent) progressLayout->setSpacing(0); progressLayout->setContentsMargins(10, 0, 0, 5); - QHBoxLayout *centeralLayout = new QHBoxLayout; - centeralLayout->addWidget(m_diskIcon); - centeralLayout->addLayout(progressLayout); - centeralLayout->setSpacing(0); - centeralLayout->setContentsMargins(0, 0, 5, 0); + QHBoxLayout *centralLayout = new QHBoxLayout; + centralLayout->addWidget(m_diskIcon); + centralLayout->addLayout(progressLayout); + centralLayout->setSpacing(0); + centralLayout->setContentsMargins(0, 0, 5, 0); - setLayout(centeralLayout); + setLayout(centralLayout); setObjectName("DiskItem"); setStyleSheet("QFrame #DiskItem:hover {" "background-color:rgba(255, 255, 255, .1);" diff --git a/plugins/disk-mount/diskcontrolwidget.cpp b/plugins/disk-mount/diskcontrolwidget.cpp index 926baed2b..c589aea36 100644 --- a/plugins/disk-mount/diskcontrolwidget.cpp +++ b/plugins/disk-mount/diskcontrolwidget.cpp @@ -6,15 +6,15 @@ DiskControlWidget::DiskControlWidget(QWidget *parent) : QScrollArea(parent), - m_centeralLayout(new QVBoxLayout), - m_centeralWidget(new QWidget), + m_centralLayout(new QVBoxLayout), + m_centralWidget(new QWidget), m_diskInter(new DBusDiskMount(this)) { - m_centeralWidget->setLayout(m_centeralLayout); - m_centeralWidget->setFixedWidth(WIDTH); + m_centralWidget->setLayout(m_centralLayout); + m_centralWidget->setFixedWidth(WIDTH); - setWidget(m_centeralWidget); + setWidget(m_centralWidget); setFixedWidth(WIDTH); setFrameStyle(QFrame::NoFrame); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -37,7 +37,7 @@ void DiskControlWidget::diskListChanged() { DiskInfoList diskList = m_diskInter->diskList(); - while (QLayoutItem *item = m_centeralLayout->takeAt(0)) + while (QLayoutItem *item = m_centralLayout->takeAt(0)) { delete item->widget(); delete item; @@ -55,7 +55,7 @@ void DiskControlWidget::diskListChanged() connect(item, &DiskControlItem::requestUnmount, this, &DiskControlWidget::unmountDisk); - m_centeralLayout->addWidget(item); + m_centralLayout->addWidget(item); m_diskInfoList.append(info); } @@ -64,7 +64,7 @@ void DiskControlWidget::diskListChanged() const int contentHeight = mountedCount * 70; const int maxHeight = std::min(contentHeight, 70 * 6); - m_centeralWidget->setFixedHeight(contentHeight); + m_centralWidget->setFixedHeight(contentHeight); setFixedHeight(maxHeight); } diff --git a/plugins/disk-mount/diskcontrolwidget.h b/plugins/disk-mount/diskcontrolwidget.h index 5775b58dd..9de7b0b10 100644 --- a/plugins/disk-mount/diskcontrolwidget.h +++ b/plugins/disk-mount/diskcontrolwidget.h @@ -24,8 +24,8 @@ private slots: void unmountFinished(const QString &uuid, const QString &info); private: - QVBoxLayout *m_centeralLayout; - QWidget *m_centeralWidget; + QVBoxLayout *m_centralLayout; + QWidget *m_centralWidget; DBusDiskMount *m_diskInter; DiskInfoList m_diskInfoList; diff --git a/plugins/network/item/applet/accesspointwidget.cpp b/plugins/network/item/applet/accesspointwidget.cpp index b9fee966f..01a652ce3 100644 --- a/plugins/network/item/applet/accesspointwidget.cpp +++ b/plugins/network/item/applet/accesspointwidget.cpp @@ -54,13 +54,13 @@ AccessPointWidget::AccessPointWidget(const AccessPoint &ap) infoLayout->setSpacing(0); infoLayout->setContentsMargins(15, 0, 0, 0); - QVBoxLayout *centeralLayout = new QVBoxLayout; - centeralLayout->addLayout(infoLayout); - centeralLayout->setSpacing(0); - centeralLayout->setMargin(0); + QVBoxLayout *centralLayout = new QVBoxLayout; + centralLayout->addLayout(infoLayout); + centralLayout->setSpacing(0); + centralLayout->setMargin(0); setStrengthIcon(ap.strength()); - setLayout(centeralLayout); + setLayout(centralLayout); setStyleSheet("AccessPointWidget #Ssid {" "color:white;" "background-color:transparent;" diff --git a/plugins/network/item/applet/devicecontrolwidget.cpp b/plugins/network/item/applet/devicecontrolwidget.cpp index 4c7748a29..ad80725c3 100644 --- a/plugins/network/item/applet/devicecontrolwidget.cpp +++ b/plugins/network/item/applet/devicecontrolwidget.cpp @@ -25,15 +25,15 @@ DeviceControlWidget::DeviceControlWidget(QWidget *parent) // m_seperator->setFixedHeight(1); // m_seperator->setColor(Qt::black); - QVBoxLayout *centeralLayout = new QVBoxLayout; - centeralLayout->addStretch(); - centeralLayout->addLayout(infoLayout); - centeralLayout->addStretch(); -// centeralLayout->addWidget(m_seperator); - centeralLayout->setMargin(0); - centeralLayout->setSpacing(0); + QVBoxLayout *centralLayout = new QVBoxLayout; + centralLayout->addStretch(); + centralLayout->addLayout(infoLayout); + centralLayout->addStretch(); +// centralLayout->addWidget(m_seperator); + centralLayout->setMargin(0); + centralLayout->setSpacing(0); - setLayout(centeralLayout); + setLayout(centralLayout); setFixedHeight(30); connect(m_switchBtn, &DSwitchButton::checkedChanged, this, &DeviceControlWidget::deviceEnableChanged); diff --git a/plugins/network/item/applet/wirelessapplet.cpp b/plugins/network/item/applet/wirelessapplet.cpp index 0193c989e..b8b3b55df 100644 --- a/plugins/network/item/applet/wirelessapplet.cpp +++ b/plugins/network/item/applet/wirelessapplet.cpp @@ -25,8 +25,8 @@ WirelessList::WirelessList(const QSet::const_iterator &deviceIter m_pwdDialog(new DInputDialog(nullptr)), m_autoConnBox(new DCheckBox), - m_centeralLayout(new QVBoxLayout), - m_centeralWidget(new QWidget), + m_centralLayout(new QVBoxLayout), + m_centralWidget(new QWidget), m_controlPanel(new DeviceControlWidget), m_networkInter(new DBusNetwork(this)) { @@ -45,14 +45,14 @@ WirelessList::WirelessList(const QSet::const_iterator &deviceIter m_updateAPTimer->setSingleShot(true); m_updateAPTimer->setInterval(100); - m_centeralWidget->setFixedWidth(WIDTH); - m_centeralWidget->setLayout(m_centeralLayout); + m_centralWidget->setFixedWidth(WIDTH); + m_centralWidget->setLayout(m_centralLayout); -// m_centeralLayout->addWidget(m_controlPanel); - m_centeralLayout->setSpacing(0); - m_centeralLayout->setMargin(0); +// m_centralLayout->addWidget(m_controlPanel); + m_centralLayout->setSpacing(0); + m_centralLayout->setMargin(0); - setWidget(m_centeralWidget); + setWidget(m_centralWidget); setFrameStyle(QFrame::NoFrame); setFixedWidth(300); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -204,7 +204,7 @@ void WirelessList::updateAPList() Q_ASSERT(sender() == m_updateAPTimer); // remove old items - while (QLayoutItem *item = m_centeralLayout->takeAt(0)) + while (QLayoutItem *item = m_centralLayout->takeAt(0)) { delete item->widget(); delete item; @@ -229,9 +229,9 @@ void WirelessList::updateAPList() connect(apw, &AccessPointWidget::requestDeactiveAP, this, &WirelessList::deactiveAP); if(apw->active()) { - m_centeralLayout->insertWidget(0, apw); + m_centralLayout->insertWidget(0, apw); } else { - m_centeralLayout->addWidget(apw); + m_centralLayout->addWidget(apw); } ++avaliableAPCount; @@ -240,7 +240,7 @@ void WirelessList::updateAPList() // m_controlPanel->setSeperatorVisible(avaliableAPCount); const int contentHeight = avaliableAPCount * ITEM_HEIGHT; - m_centeralWidget->setFixedHeight(contentHeight); + m_centralWidget->setFixedHeight(contentHeight); setFixedHeight(std::min(contentHeight, MAX_HEIGHT)); } diff --git a/plugins/network/item/applet/wirelessapplet.h b/plugins/network/item/applet/wirelessapplet.h index 839c7384c..a395189f2 100644 --- a/plugins/network/item/applet/wirelessapplet.h +++ b/plugins/network/item/applet/wirelessapplet.h @@ -63,8 +63,8 @@ private: QString m_lastConnPath; QString m_lastConnSecurity; - QVBoxLayout *m_centeralLayout; - QWidget *m_centeralWidget; + QVBoxLayout *m_centralLayout; + QWidget *m_centralWidget; DeviceControlWidget *m_controlPanel; DBusNetwork *m_networkInter; }; diff --git a/plugins/sound/sinkinputwidget.cpp b/plugins/sound/sinkinputwidget.cpp index 75908a6d7..a653c73b6 100644 --- a/plugins/sound/sinkinputwidget.cpp +++ b/plugins/sound/sinkinputwidget.cpp @@ -19,18 +19,18 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent) m_volumeSlider->setAccessibleName("app-" + iconName + "-slider"); m_volumeSlider->setValue(m_inputInter->volume() * 1000); - QHBoxLayout *centeralLayout = new QHBoxLayout; - centeralLayout->addWidget(m_volumeIcon); - centeralLayout->addSpacing(10); - centeralLayout->addWidget(m_volumeSlider); - centeralLayout->setSpacing(2); - centeralLayout->setMargin(0); + QHBoxLayout *centralLayout = new QHBoxLayout; + centralLayout->addWidget(m_volumeIcon); + centralLayout->addSpacing(10); + centralLayout->addWidget(m_volumeSlider); + centralLayout->setSpacing(2); + centralLayout->setMargin(0); connect(m_volumeSlider, &VolumeSlider::valueChanged, this, &SinkInputWidget::setVolume); connect(m_volumeIcon, &DImageButton::clicked, this, &SinkInputWidget::setMute); connect(m_inputInter, &DBusSinkInput::MuteChanged, this, &SinkInputWidget::setMuteIcon); - setLayout(centeralLayout); + setLayout(centralLayout); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setFixedHeight(30); diff --git a/plugins/sound/soundapplet.cpp b/plugins/sound/soundapplet.cpp index deb7bcbb7..3c533fe59 100644 --- a/plugins/sound/soundapplet.cpp +++ b/plugins/sound/soundapplet.cpp @@ -14,7 +14,7 @@ DWIDGET_USE_NAMESPACE SoundApplet::SoundApplet(QWidget *parent) : QScrollArea(parent), - m_centeralWidget(new QWidget), + m_centralWidget(new QWidget), m_applicationTitle(new QWidget), m_volumeBtn(new DImageButton), m_volumeSlider(new VolumeSlider), @@ -69,18 +69,18 @@ SoundApplet::SoundApplet(QWidget *parent) m_volumeSlider->setMinimum(0); m_volumeSlider->setMaximum(1000); - m_centeralLayout = new QVBoxLayout; - m_centeralLayout->addLayout(deviceLineLayout); - m_centeralLayout->addSpacing(8); - m_centeralLayout->addLayout(volumeCtrlLayout); - m_centeralLayout->addWidget(m_applicationTitle); + m_centralLayout = new QVBoxLayout; + m_centralLayout->addLayout(deviceLineLayout); + m_centralLayout->addSpacing(8); + m_centralLayout->addLayout(volumeCtrlLayout); + m_centralLayout->addWidget(m_applicationTitle); - m_centeralWidget->setLayout(m_centeralLayout); - m_centeralWidget->setFixedWidth(WIDTH); - m_centeralWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + m_centralWidget->setLayout(m_centralLayout); + m_centralWidget->setFixedWidth(WIDTH); + m_centralWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); setFixedWidth(WIDTH); - setWidget(m_centeralWidget); + setWidget(m_centralWidget); setFrameStyle(QFrame::NoFrame); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -148,8 +148,8 @@ void SoundApplet::volumeSliderValueChanged() void SoundApplet::sinkInputsChanged() { - m_centeralWidget->setVisible(false); - QVBoxLayout *appLayout = m_centeralLayout; + m_centralWidget->setVisible(false); + QVBoxLayout *appLayout = m_centralLayout; while (QLayoutItem *item = appLayout->takeAt(4)) { delete item->widget(); @@ -164,9 +164,9 @@ void SoundApplet::sinkInputsChanged() appLayout->addWidget(si); } - const int contentHeight = m_centeralWidget->sizeHint().height(); - m_centeralWidget->setFixedHeight(contentHeight); - m_centeralWidget->setVisible(true); + const int contentHeight = m_centralWidget->sizeHint().height(); + m_centralWidget->setFixedHeight(contentHeight); + m_centralWidget->setVisible(true); setFixedHeight(std::min(contentHeight, MAX_HEIGHT)); } diff --git a/plugins/sound/soundapplet.h b/plugins/sound/soundapplet.h index e600b782b..1a37820e2 100644 --- a/plugins/sound/soundapplet.h +++ b/plugins/sound/soundapplet.h @@ -34,11 +34,11 @@ private slots: void toggleMute(); private: - QWidget *m_centeralWidget; + QWidget *m_centralWidget; QWidget *m_applicationTitle; Dtk::Widget::DImageButton *m_volumeBtn; VolumeSlider *m_volumeSlider; - QVBoxLayout *m_centeralLayout; + QVBoxLayout *m_centralLayout; DBusAudio *m_audioInter; DBusSink *m_defSinkInter;