diff --git a/src/WizMainWindow.cpp b/src/WizMainWindow.cpp index 98bb33a98..79d9b1d30 100755 --- a/src/WizMainWindow.cpp +++ b/src/WizMainWindow.cpp @@ -1781,7 +1781,15 @@ void WizMainWindow::initToolBar() { #ifdef Q_OS_MAC m_toolBar->showInWindow(this); - + // + //reset mac toolbar icons + QString skin = userSettings().skin(); + QSize size = QSize(32, 32); + const WizIconOptions ICON_OPTIONS = WizIconOptions(Qt::transparent, "#a6a6a6", Qt::transparent); + m_actions->actionFromName(WIZACTION_GLOBAL_SYNC)->setIcon(::WizLoadSkinIcon(skin, WIZACTION_GLOBAL_SYNC, size, ICON_OPTIONS)); + m_actions->actionFromName(WIZACTION_GLOBAL_GOBACK)->setIcon(::WizLoadSkinIcon(skin, WIZACTION_GLOBAL_GOBACK, size, ICON_OPTIONS)); + m_actions->actionFromName(WIZACTION_GLOBAL_GOFORWARD)->setIcon(::WizLoadSkinIcon(skin, WIZACTION_GLOBAL_GOFORWARD, size, ICON_OPTIONS)); + // m_actions->actionFromName(WIZACTION_GLOBAL_GOBACK)->setEnabled(false); m_actions->actionFromName(WIZACTION_GLOBAL_GOFORWARD)->setEnabled(false); m_toolBar->addAction(m_actions->actionFromName(WIZACTION_GLOBAL_GOBACK)); diff --git a/src/share/WizAnimateAction.cpp b/src/share/WizAnimateAction.cpp index 18e9edc6f..f32c11f49 100755 --- a/src/share/WizAnimateAction.cpp +++ b/src/share/WizAnimateAction.cpp @@ -23,13 +23,11 @@ WizAnimateAction::WizAnimateAction(QObject* parent) void WizAnimateAction::setAction(QAction* action) { m_target = new WizAnimateActionContainer(action, this); - m_iconDefault = m_target->icon(); } void WizAnimateAction::setToolButton(QToolButton* button) { m_target = new WizAnimateButtonContainer(button, this); - m_iconDefault = m_target->icon(); } void WizAnimateAction::setSingleIcons(const QString& strIconBaseName, QSize size) @@ -122,7 +120,7 @@ void WizAnimateAction::stopPlay() m_target->setProperty("animationStatus", 0); - m_target->setIcon(m_iconDefault); + m_target->setIcon(m_target->icon()); m_timer->stop(); } diff --git a/src/share/WizAnimateAction.h b/src/share/WizAnimateAction.h index d8102440f..b1fac1d47 100755 --- a/src/share/WizAnimateAction.h +++ b/src/share/WizAnimateAction.h @@ -65,7 +65,6 @@ class WizAnimateAction : public QObject private: WizAnimateContainerBase* m_target; int m_nIconIndex; - QIcon m_iconDefault; QList m_icons; QTimer* m_timer;