Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复一些小的拼写错误

Browse Source 
trayTyep()函数更正为trayType()函数，Utils::ModuleSettingsPtr函数修正了部分注释

Log: 修复AbstractTrayWidget类和Utils::ModuleSettingsPtr函数的拼写错误
Influence: 对功能无影响
This commit is contained in:
Wang Yixue 2022-07-28 16:44:15 +08:00 committed by deepin-bot[bot]
parent 5a4fe62d19
commit 2f12ecc228
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/util/utils.h
View File

@ -56,7 +56,7 @@ inline QGSettings *SettingsPtr(const QString &schema_id, const QByteArray &path
* @brief SettingsPtr 根据给定信息返回一个QGSettings指针
* @param module 传入QGSettings构造函数时，会添加"com.deepin.dde.dock.module."前缀
* @param path If non-empty, specifies the path for a relocatable schema
* @param parent 创建指针的付对象
* @param parent 创建指针的父对象
* @return
*/
inline const QGSettings *ModuleSettingsPtr(const QString &module, const QByteArray &path = QByteArray(), QObject *parent = nullptr)

2
plugins/tray/abstracttraywidget.cpp
View File

@ -77,7 +77,7 @@ void AbstractTrayWidget::handleMouseRelease()
Q_ASSERT(sender() == m_handleMouseReleaseTimer);
// do not dealwith all mouse event of SystemTray, class SystemTrayItem will handle it
if (trayTyep() == SystemTray)
if (trayType() == SystemTray)
return;
const QPoint point(m_lastMouseReleaseData.first - rect().center());

2
plugins/tray/abstracttraywidget.h
View File

@ -41,7 +41,7 @@ public:
virtual QString itemKeyForConfig() = 0;
virtual void updateIcon() = 0;
virtual void sendClick(uint8_t mouseButton, int x, int y) = 0;
virtual inline TrayType trayTyep() const { return TrayType::ApplicationTray; } // default is ApplicationTray
virtual inline TrayType trayType() const { return TrayType::ApplicationTray; } // default is ApplicationTray
virtual bool isValid() {return true;}
uint getOwnerPID();

16
plugins/tray/fashiontray/containers/normalcontainer.cpp
View File

@ -192,7 +192,7 @@ int NormalContainer::whereToInsert(FashionTrayWidgetWrapper *wrapper)
int NormalContainer::whereToInsertByDefault(FashionTrayWidgetWrapper *wrapper) const
{
int index = 0;
switch (wrapper->absTrayWidget()->trayTyep()) {
switch (wrapper->absTrayWidget()->trayType()) {
case AbstractTrayWidget::TrayType::ApplicationTray:
index = whereToInsertAppTrayByDefault(wrapper);
break;
@ -208,13 +208,13 @@ int NormalContainer::whereToInsertByDefault(FashionTrayWidgetWrapper *wrapper) c
int NormalContainer::whereToInsertAppTrayByDefault(FashionTrayWidgetWrapper *wrapper) const
{
if (wrapperList().isEmpty() || wrapper->absTrayWidget()->trayTyep() != AbstractTrayWidget::TrayType::ApplicationTray) {
if (wrapperList().isEmpty() || wrapper->absTrayWidget()->trayType() != AbstractTrayWidget::TrayType::ApplicationTray) {
return 0;
}
int lastAppTrayIndex = -1;
for (int i = 0; i < wrapperList().size(); ++i) {
if (wrapperList().at(i)->absTrayWidget()->trayTyep() == AbstractTrayWidget::TrayType::ApplicationTray) {
if (wrapperList().at(i)->absTrayWidget()->trayType() == AbstractTrayWidget::TrayType::ApplicationTray) {
lastAppTrayIndex = i;
continue;
}
@ -225,7 +225,7 @@ int NormalContainer::whereToInsertAppTrayByDefault(FashionTrayWidgetWrapper *wra
return 0;
}
// the inserting tray is not a AppTray
if (wrapper->absTrayWidget()->trayTyep() != AbstractTrayWidget::TrayType::ApplicationTray) {
if (wrapper->absTrayWidget()->trayType() != AbstractTrayWidget::TrayType::ApplicationTray) {
return lastAppTrayIndex + 1;
}
@ -235,7 +235,7 @@ int NormalContainer::whereToInsertAppTrayByDefault(FashionTrayWidgetWrapper *wra
return 0;
}
for (int i = 0; i < wrapperList().size(); ++i) {
if (wrapperList().at(i)->absTrayWidget()->trayTyep() != AbstractTrayWidget::TrayType::ApplicationTray) {
if (wrapperList().at(i)->absTrayWidget()->trayType() != AbstractTrayWidget::TrayType::ApplicationTray) {
insertIndex = i;
break;
}
@ -260,7 +260,7 @@ int NormalContainer::whereToInsertSystemTrayByDefault(FashionTrayWidgetWrapper *
int firstSystemTrayIndex = -1;
for (int i = 0; i < wrapperList().size(); ++i) {
if (wrapperList().at(i)->absTrayWidget()->trayTyep() == AbstractTrayWidget::TrayType::SystemTray) {
if (wrapperList().at(i)->absTrayWidget()->trayType() == AbstractTrayWidget::TrayType::SystemTray) {
firstSystemTrayIndex = i;
break;
}
@ -270,7 +270,7 @@ int NormalContainer::whereToInsertSystemTrayByDefault(FashionTrayWidgetWrapper *
return wrapperList().size();
}
// the inserting tray is not a SystemTray
if (wrapper->absTrayWidget()->trayTyep() != AbstractTrayWidget::TrayType::SystemTray) {
if (wrapper->absTrayWidget()->trayType() != AbstractTrayWidget::TrayType::SystemTray) {
return firstSystemTrayIndex;
}
@ -280,7 +280,7 @@ int NormalContainer::whereToInsertSystemTrayByDefault(FashionTrayWidgetWrapper *
return firstSystemTrayIndex;
}
for (int i = 0; i < wrapperList().size(); ++i) {
if (wrapperList().at(i)->absTrayWidget()->trayTyep() != AbstractTrayWidget::TrayType::SystemTray) {
if (wrapperList().at(i)->absTrayWidget()->trayType() != AbstractTrayWidget::TrayType::SystemTray) {
continue;
}
if (insertIndex > trayPlugin()->itemSortKey(wrapperList().at(i)->itemKey())) {

2
plugins/tray/snitraywidget.cpp
View File

@ -609,7 +609,7 @@ void SNITrayWidget::handleMouseRelease()
Q_ASSERT(sender() == m_handleMouseReleaseTimer);
// do not dealwith all mouse event of SystemTray, class SystemTrayItem will handle it
if (trayTyep() == SystemTray)
if (trayType() == SystemTray)
return;
const QPoint point(m_lastMouseReleaseData.first - rect().center());

2
plugins/tray/system-trays/systemtrayitem.h
View File

@ -44,7 +44,7 @@ public:
QString itemKeyForConfig() override;
void updateIcon() override;
void sendClick(uint8_t mouseButton, int x, int y) override;
inline TrayType trayTyep() const override { return TrayType::SystemTray; }
inline TrayType trayType() const override { return TrayType::SystemTray; }
QWidget *trayTipsWidget();
QWidget *trayPopupApplet();

4
plugins/tray/trayplugin.cpp
View File

@ -278,7 +278,7 @@ bool TrayPlugin::isSystemTrayItem(const QString &itemKey)
{
AbstractTrayWidget *const trayWidget = m_trayMap.value(itemKey, nullptr);
if (trayWidget && trayWidget->trayTyep() == AbstractTrayWidget::TrayType::SystemTray) {
if (trayWidget && trayWidget->trayType() == AbstractTrayWidget::TrayType::SystemTray) {
return true;
}
@ -551,7 +551,7 @@ void TrayPlugin::trayRemoved(const QString &itemKey, const bool deleteObject)
// only delete tray object when it is a tray of applications
// set the parent of the tray object to avoid be deconstructed by parent(DockItem/PluginsItem/TrayPluginsItem)
if (widget->trayTyep() == AbstractTrayWidget::TrayType::SystemTray) {
if (widget->trayType() == AbstractTrayWidget::TrayType::SystemTray) {
widget->setParent(nullptr);
} else if (deleteObject) {
widget->deleteLater();