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

feat: 修改拼写错误

Browse Source 
拼写错误,已纠正

Log:
Change-Id: Ieb8c831196be5d3bb1ca87eb10ec13497525248c
This commit is contained in:
范朋程 2021-03-06 18:40:13 +08:00
parent 529b780edb
commit 147fed9107
8 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/controller/dockitemmanager.cpp
View File

@ -109,7 +109,7 @@ void DockItemManager::startLoadPlugins() const
void DockItemManager::refershItemsIcon() void DockItemManager::refershItemsIcon()
{ {
for (auto item : m_itemList) { for (auto item : m_itemList) {
item->refershIcon(); item->refreshIcon();
item->update(); item->update();
} }
} }

14
frame/item/appitem.cpp
View File

@ -110,15 +110,15 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
connect(m_itemEntryInter, &DockEntryInter::IsActiveChanged, this, &AppItem::activeChanged); connect(m_itemEntryInter, &DockEntryInter::IsActiveChanged, this, &AppItem::activeChanged);
connect(m_itemEntryInter, &DockEntryInter::IsActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update)); connect(m_itemEntryInter, &DockEntryInter::IsActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update));
connect(m_itemEntryInter, &DockEntryInter::WindowInfosChanged, this, &AppItem::updateWindowInfos, Qt::QueuedConnection); connect(m_itemEntryInter, &DockEntryInter::WindowInfosChanged, this, &AppItem::updateWindowInfos, Qt::QueuedConnection);
connect(m_itemEntryInter, &DockEntryInter::IconChanged, this, &AppItem::refershIcon); connect(m_itemEntryInter, &DockEntryInter::IconChanged, this, &AppItem::refreshIcon);
connect(m_updateIconGeometryTimer, &QTimer::timeout, this, &AppItem::updateWindowIconGeometries, Qt::QueuedConnection); connect(m_updateIconGeometryTimer, &QTimer::timeout, this, &AppItem::updateWindowIconGeometries, Qt::QueuedConnection);
connect(m_retryObtainIconTimer, &QTimer::timeout, this, &AppItem::refershIcon, Qt::QueuedConnection); connect(m_retryObtainIconTimer, &QTimer::timeout, this, &AppItem::refreshIcon, Qt::QueuedConnection);
connect(this, &AppItem::requestUpdateEntryGeometries, this, &AppItem::updateWindowIconGeometries); connect(this, &AppItem::requestUpdateEntryGeometries, this, &AppItem::updateWindowIconGeometries);
updateWindowInfos(m_itemEntryInter->windowInfos()); updateWindowInfos(m_itemEntryInter->windowInfos());
refershIcon(); refreshIcon();
connect(GSettingsByApp(), &QGSettings::changed, this, &AppItem::onGSettingsChanged); connect(GSettingsByApp(), &QGSettings::changed, this, &AppItem::onGSettingsChanged);
connect(GSettingsByDockApp(), &QGSettings::changed, this, &AppItem::onGSettingsChanged); connect(GSettingsByDockApp(), &QGSettings::changed, this, &AppItem::onGSettingsChanged);
@ -130,7 +130,7 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
m_curDate = QDate::currentDate(); m_curDate = QDate::currentDate();
if (m_curDate.day() != m_lastShowDay) { if (m_curDate.day() != m_lastShowDay) {
m_lastShowDay = m_curDate.day(); m_lastShowDay = m_curDate.day();
refershIcon(); refreshIcon();
} }
}); });
} }
@ -395,7 +395,7 @@ void AppItem::resizeEvent(QResizeEvent *e)
{ {
DockItem::resizeEvent(e); DockItem::resizeEvent(e);
refershIcon(); refreshIcon();
} }
void AppItem::dragEnterEvent(QDragEnterEvent *e) void AppItem::dragEnterEvent(QDragEnterEvent *e)
@ -463,7 +463,7 @@ void AppItem::showEvent(QShowEvent *e)
onGSettingsChanged("enable"); onGSettingsChanged("enable");
}); });
refershIcon(); refreshIcon();
} }
void AppItem::showHoverTips() void AppItem::showHoverTips()
@ -597,7 +597,7 @@ void AppItem::updateWindowInfos(const WindowInfoMap &info)
update(); update();
} }
void AppItem::refershIcon() void AppItem::refreshIcon()
{ {
if (!isVisible()) if (!isVisible())
return; return;

2
frame/item/appitem.h
View File

@ -91,7 +91,7 @@ private:
private slots: private slots:
void updateWindowInfos(const WindowInfoMap &info); void updateWindowInfos(const WindowInfoMap &info);
void refershIcon() override; void refreshIcon() override;
void activeChanged(); void activeChanged();
void showPreview(); void showPreview();
void playSwingEffect(); void playSwingEffect();

2
frame/item/dockitem.h
View File

@ -62,7 +62,7 @@ public:
virtual QString accessibleName(); virtual QString accessibleName();
public slots: public slots:
virtual void refershIcon() {} virtual void refreshIcon() {}
void showPopupApplet(QWidget *const applet); void showPopupApplet(QWidget *const applet);
void hidePopup(); void hidePopup();

10
frame/item/launcheritem.cpp
View File

@ -53,7 +53,13 @@ LauncherItem::LauncherItem(QGSettingsInterface *interface, QWidget *parent)
} }
} }
void LauncherItem::refershIcon() LauncherItem::~LauncherItem()
{
delete m_gsettings;
m_gsettings = nullptr;
}
void LauncherItem::refreshIcon()
{ {
const int iconSize = qMin(width(), height()); const int iconSize = qMin(width(), height());
if (DockDisplayMode == Efficient) if (DockDisplayMode == Efficient)
@ -94,7 +100,7 @@ void LauncherItem::resizeEvent(QResizeEvent *e)
{ {
DockItem::resizeEvent(e); DockItem::resizeEvent(e);
refershIcon(); refreshIcon();
} }
void LauncherItem::mousePressEvent(QMouseEvent *e) void LauncherItem::mousePressEvent(QMouseEvent *e)

3
frame/item/launcheritem.h
View File

@ -37,10 +37,11 @@ class LauncherItem : public DockItem
public: public:
explicit LauncherItem(QGSettingsInterface *interface, QWidget *parent = nullptr); explicit LauncherItem(QGSettingsInterface *interface, QWidget *parent = nullptr);
~ LauncherItem() override;
inline ItemType itemType() const override {return Launcher;} inline ItemType itemType() const override {return Launcher;}
void refershIcon() override; void refreshIcon() override;
protected: protected:
void showEvent(QShowEvent* event) override; void showEvent(QShowEvent* event) override;

2
frame/item/pluginsitem.cpp
View File

@ -125,7 +125,7 @@ QSize PluginsItem::sizeHint() const
return m_centralWidget->sizeHint(); return m_centralWidget->sizeHint();
} }
void PluginsItem::refershIcon() void PluginsItem::refreshIcon()
{ {
m_pluginInter->refreshIcon(m_itemKey); m_pluginInter->refreshIcon(m_itemKey);
} }

2
frame/item/pluginsitem.h
View File

@ -54,7 +54,7 @@ public:
virtual void setDraging(bool bDrag) override; virtual void setDraging(bool bDrag) override;
public slots: public slots:
void refershIcon() override; void refreshIcon() override;
void onGSettingsChanged(const QString &key); void onGSettingsChanged(const QString &key);
protected: protected: