openkylin
/
qt5-ukui-platformtheme
mirror of https://gitee.com/openkylin/qt5-ukui-platformtheme.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

change namespace UIUIQQC2Style , delete debug path

This commit is contained in:
谭静 2024-11-13 09:49:43 +08:00
parent 4abdabf13f
commit 6b52c20cad
44 changed files with 71 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ukui-qml-style-helper/qqc2styleplugin.cpp
View File

@ -46,7 +46,7 @@
#include "styleparameter/ukuislider.h" #include "styleparameter/ukuislider.h"
#include "styleparameter/ukuispinbox.h" #include "styleparameter/ukuispinbox.h"
#include "styleparameter/ukuitabbar.h" #include "styleparameter/ukuitabbar.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
void Qqc2StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) void Qqc2StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
{ {

2
ukui-qml-style-helper/styleparameter/ appparameter.cpp
View File

@ -9,7 +9,7 @@
#include "settings/ukui-style-settings.h" #include "settings/ukui-style-settings.h"
#include "../../qt5-ukui-platformtheme/platform-theme-fontdata.h" #include "../../qt5-ukui-platformtheme/platform-theme-fontdata.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
APPParameter::APPParameter(QQuickItem *parent) : QQuickItem(parent) APPParameter::APPParameter(QQuickItem *parent) : QQuickItem(parent)
{ {
if(!qApp) if(!qApp)

4
ukui-qml-style-helper/styleparameter/appparameter.h
View File

@ -29,7 +29,7 @@
#include <QPalette> #include <QPalette>
#include <QQuickItem> #include <QQuickItem>
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class APPParameter : public QQuickItem class APPParameter : public QQuickItem
{ {
@ -107,6 +107,6 @@ inline void APPParameter::setSpace(int newSpace)
} }
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::APPParameter, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::APPParameter, QML_HAS_ATTACHED_PROPERTIES)
#endif // APPPARAMETER_H #endif // APPPARAMETER_H

2
ukui-qml-style-helper/styleparameter/icon.cpp
View File

@ -9,7 +9,7 @@
#include <QColor> #include <QColor>
#include <qmath.h> #include <qmath.h>
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
Icon::Icon(QObject *parent) : QObject(parent) Icon::Icon(QObject *parent) : QObject(parent)

2
ukui-qml-style-helper/styleparameter/icon.h
View File

@ -30,7 +30,7 @@
#include <QPixmap> #include <QPixmap>
#include <QString> #include <QString>
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class Icon : public QObject class Icon : public QObject
{ {

2
ukui-qml-style-helper/styleparameter/imageprovider.cpp
View File

@ -14,7 +14,7 @@
#include "effects/highlight-effect.h" #include "effects/highlight-effect.h"
#include "icon.h" #include "icon.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
static QSize defaultSize = QSize(16, 16); static QSize defaultSize = QSize(16, 16);

2
ukui-qml-style-helper/styleparameter/imageprovider.h
View File

@ -31,7 +31,7 @@
#include <QString> #include <QString>
#include "icon.h" #include "icon.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class IconHelper class IconHelper
{ {

6
ukui-qml-style-helper/styleparameter/tokenparameter.cpp
View File

@ -6,7 +6,7 @@
#include <QIcon> #include <QIcon>
#include <QColor> #include <QColor>
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
TokenParameter::TokenParameter() TokenParameter::TokenParameter()
{ {
//UKUIGlobalDTConfig::GlobalDTConfig dtConfig; //UKUIGlobalDTConfig::GlobalDTConfig dtConfig;
@ -33,12 +33,12 @@ void TokenParameter::deleteInstance()
} }
} }
//const std::shared_ptr<UIUIQQC2Style::UKUIButton> &TokenParameter::button() const //const std::shared_ptr<UKUIQQC2Style::UKUIButton> &TokenParameter::button() const
//{ //{
// return m_button; // return m_button;
//} //}
//void TokenParameter::setButton(std::shared_ptr<UIUIQQC2Style::UKUIButton> &newButton) //void TokenParameter::setButton(std::shared_ptr<UKUIQQC2Style::UKUIButton> &newButton)
//{ //{
// if (m_button == newButton) // if (m_button == newButton)
// return; // return;

10
ukui-qml-style-helper/styleparameter/tokenparameter.h
View File

@ -28,11 +28,11 @@
#include "../../ukui-styles/dt-tmp-readconfig.h" #include "../../ukui-styles/dt-tmp-readconfig.h"
#include "ukuibutton.h" #include "ukuibutton.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class TokenParameter class TokenParameter
{ {
//Q_PROPERTY(std::shared_ptr<UIUIQQC2Style::UKUIButton> button READ button WRITE setButton NOTIFY buttonChanged) //Q_PROPERTY(std::shared_ptr<UKUIQQC2Style::UKUIButton> button READ button WRITE setButton NOTIFY buttonChanged)
public: public:
explicit TokenParameter(); explicit TokenParameter();
@ -42,8 +42,8 @@ public:
void deleteInstance(); void deleteInstance();
// const std::shared_ptr<UIUIQQC2Style::UKUIButton> &button() const; // const std::shared_ptr<UKUIQQC2Style::UKUIButton> &button() const;
// void setButton(std::shared_ptr<UIUIQQC2Style::UKUIButton> &newButton); // void setButton(std::shared_ptr<UKUIQQC2Style::UKUIButton> &newButton);
public slots: public slots:
@ -55,6 +55,6 @@ private:
// UKUIButton m_button; // UKUIButton m_button;
}; };
} }
Q_DECLARE_METATYPE(UIUIQQC2Style::TokenParameter*) Q_DECLARE_METATYPE(UKUIQQC2Style::TokenParameter*)
#endif // TOKENPARAMETER_H #endif // TOKENPARAMETER_H

2
ukui-qml-style-helper/styleparameter/ukuibutton.cpp
View File

@ -1,7 +1,7 @@
#include <QApplication> #include <QApplication>
#include "ukuibutton.h" #include "ukuibutton.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIButton::UKUIButton(QQuickItem *parent) : QQuickItem(parent) UKUIButton::UKUIButton(QQuickItem *parent) : QQuickItem(parent)
{ {

8
ukui-qml-style-helper/styleparameter/ukuibutton.h
View File

@ -30,7 +30,7 @@
#include "tokenparameter.h" #include "tokenparameter.h"
using namespace UKUIGlobalDTConfig; using namespace UKUIGlobalDTConfig;
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIButton : public QQuickItem class UKUIButton : public QQuickItem
{ {
@ -244,9 +244,9 @@ private:
UKUIGlobalDTConfig::GlobalDTConfig* m_instance ; UKUIGlobalDTConfig::GlobalDTConfig* m_instance ;
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIButton, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIButton, QML_HAS_ATTACHED_PROPERTIES)
//Q_DECLARE_METATYPE(UIUIQQC2Style::UKUIButton); //Q_DECLARE_METATYPE(UKUIQQC2Style::UKUIButton);
//Q_DECLARE_METATYPE(std::shared_ptr<UIUIQQC2Style::UKUIButton>) //Q_DECLARE_METATYPE(std::shared_ptr<UKUIQQC2Style::UKUIButton>)
#endif // UKUIBUTTON_H #endif // UKUIBUTTON_H

2
ukui-qml-style-helper/styleparameter/ukuicheckbox.cpp
View File

@ -1,7 +1,7 @@
#include <QApplication> #include <QApplication>
#include "ukuicheckbox.h" #include "ukuicheckbox.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUICheckBox::UKUICheckBox(QQuickItem *parent) : QQuickItem(parent) UKUICheckBox::UKUICheckBox(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuicheckbox.h
View File

@ -29,7 +29,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUICheckBox : public QQuickItem class UKUICheckBox : public QQuickItem
{ {
@ -289,7 +289,7 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUICheckBox, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUICheckBox, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUICHECKBOX_H #endif // UKUICHECKBOX_H

2
ukui-qml-style-helper/styleparameter/ukuicombobox.cpp
View File

@ -1,7 +1,7 @@
#include <QApplication> #include <QApplication>
#include "ukuicombobox.h" #include "ukuicombobox.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIComboBox::UKUIComboBox(QQuickItem *parent) : QQuickItem(parent) UKUIComboBox::UKUIComboBox(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuicombobox.h
View File

@ -29,7 +29,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIComboBox : public QQuickItem class UKUIComboBox : public QQuickItem
{ {
@ -184,6 +184,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIComboBox, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIComboBox, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUICOMBOBOX_H #endif // UKUICOMBOBOX_H

2
ukui-qml-style-helper/styleparameter/ukuiitemdelegate.cpp
View File

@ -1,7 +1,7 @@
#include "ukuiitemdelegate.h" #include "ukuiitemdelegate.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIItemDelegate::UKUIItemDelegate(QQuickItem *parent) : QQuickItem(parent) UKUIItemDelegate::UKUIItemDelegate(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuiitemdelegate.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIItemDelegate : public QQuickItem class UKUIItemDelegate : public QQuickItem
{ {
@ -142,6 +142,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIItemDelegate, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIItemDelegate, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUIITEMDELEGATE_H #endif // UKUIITEMDELEGATE_H

2
ukui-qml-style-helper/styleparameter/ukuilabel.cpp
View File

@ -1,7 +1,7 @@
#include "ukuilabel.h" #include "ukuilabel.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUILabel::UKUILabel(QQuickItem *parent) : QQuickItem(parent) UKUILabel::UKUILabel(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuilabel.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUILabel : public QQuickItem class UKUILabel : public QQuickItem
{ {
@ -76,6 +76,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUILabel, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUILabel, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUILABEL_H #endif // UKUILABEL_H

2
ukui-qml-style-helper/styleparameter/ukuimenu.cpp
View File

@ -1,7 +1,7 @@
#include "ukuimenu.h" #include "ukuimenu.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIMenu::UKUIMenu(QQuickItem *parent) : QQuickItem(parent) UKUIMenu::UKUIMenu(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuimenu.h
View File

@ -31,7 +31,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIMenu : public QQuickItem class UKUIMenu : public QQuickItem
{ {
@ -108,6 +108,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIMenu, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIMenu, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUIMENU_H #endif // UKUIMENU_H

2
ukui-qml-style-helper/styleparameter/ukuimenuitem.cpp
View File

@ -1,7 +1,7 @@
#include "ukuimenuitem.h" #include "ukuimenuitem.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIMenuItem::UKUIMenuItem(QQuickItem *parent) : QQuickItem(parent) UKUIMenuItem::UKUIMenuItem(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuimenuitem.h
View File

@ -31,7 +31,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIMenuItem : public QQuickItem class UKUIMenuItem : public QQuickItem
{ {
@ -172,6 +172,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIMenuItem, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIMenuItem, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUIMENUITEM_H #endif // UKUIMENUITEM_H

2
ukui-qml-style-helper/styleparameter/ukuipopup.cpp
View File

@ -1,7 +1,7 @@
#include "ukuipopup.h" #include "ukuipopup.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIPopup::UKUIPopup(QQuickItem *parent) : QQuickItem(parent) UKUIPopup::UKUIPopup(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuipopup.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIPopup : public QQuickItem class UKUIPopup : public QQuickItem
{ {
@ -98,6 +98,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIPopup, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIPopup, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUIPOPUP_H #endif // UKUIPOPUP_H

2
ukui-qml-style-helper/styleparameter/ukuiprogressbar.cpp
View File

@ -1,7 +1,7 @@
#include "ukuiprogressbar.h" #include "ukuiprogressbar.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIProgressBar::UKUIProgressBar(QQuickItem *parent) : QQuickItem(parent) UKUIProgressBar::UKUIProgressBar(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuiprogressbar.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIProgressBar : public QQuickItem class UKUIProgressBar : public QQuickItem
{ {
@ -125,6 +125,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIProgressBar, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIProgressBar, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUIPROGRESSBAR_H #endif // UKUIPROGRESSBAR_H

2
ukui-qml-style-helper/styleparameter/ukuiradiobutton.cpp
View File

@ -1,7 +1,7 @@
#include <QApplication> #include <QApplication>
#include "ukuiradiobutton.h" #include "ukuiradiobutton.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIRadioButton::UKUIRadioButton(QQuickItem *parent) : QQuickItem(parent) UKUIRadioButton::UKUIRadioButton(QQuickItem *parent) : QQuickItem(parent)
{ {

8
ukui-qml-style-helper/styleparameter/ukuiradiobutton.h
View File

@ -29,7 +29,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIRadioButton : public QQuickItem class UKUIRadioButton : public QQuickItem
{ {
@ -282,9 +282,9 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIRadioButton, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIRadioButton, QML_HAS_ATTACHED_PROPERTIES)
//Q_DECLARE_METATYPE(UIUIQQC2Style::UKUIButton); //Q_DECLARE_METATYPE(UKUIQQC2Style::UKUIButton);
//Q_DECLARE_METATYPE(std::shared_ptr<UIUIQQC2Style::UKUIButton>) //Q_DECLARE_METATYPE(std::shared_ptr<UKUIQQC2Style::UKUIButton>)
#endif // UKUIRADIOBUTTON_H #endif // UKUIRADIOBUTTON_H

2
ukui-qml-style-helper/styleparameter/ukuiscrollbar.cpp
View File

@ -1,7 +1,7 @@
#include "ukuiscrollbar.h" #include "ukuiscrollbar.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIScrollBar::UKUIScrollBar(QQuickItem *parent) : QQuickItem(parent) UKUIScrollBar::UKUIScrollBar(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuiscrollbar.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIScrollBar : public QQuickItem class UKUIScrollBar : public QQuickItem
{ {
@ -91,6 +91,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIScrollBar, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIScrollBar, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUISCROLLBAR_H #endif // UKUISCROLLBAR_H

2
ukui-qml-style-helper/styleparameter/ukuislider.cpp
View File

@ -1,7 +1,7 @@
#include "ukuislider.h" #include "ukuislider.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUISlider::UKUISlider(QQuickItem *parent) : QQuickItem(parent) UKUISlider::UKUISlider(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuislider.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUISlider : public QQuickItem class UKUISlider : public QQuickItem
{ {
@ -226,6 +226,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUISlider, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUISlider, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUISLIDER_H #endif // UKUISLIDER_H

2
ukui-qml-style-helper/styleparameter/ukuispinbox.cpp
View File

@ -1,7 +1,7 @@
#include "ukuispinbox.h" #include "ukuispinbox.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUISpinBox::UKUISpinBox(QQuickItem *parent) : QQuickItem(parent) UKUISpinBox::UKUISpinBox(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuispinbox.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUISpinBox : public QQuickItem class UKUISpinBox : public QQuickItem
{ {
@ -281,6 +281,6 @@ private:
int m_btnBorderWidth; int m_btnBorderWidth;
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUISpinBox, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUISpinBox, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUISPINBOX_H #endif // UKUISPINBOX_H

2
ukui-qml-style-helper/styleparameter/ukuitabbar.cpp
View File

@ -1,7 +1,7 @@
#include "ukuitabbar.h" #include "ukuitabbar.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUITabBar::UKUITabBar(QQuickItem *parent) : QQuickItem(parent) UKUITabBar::UKUITabBar(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuitabbar.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUITabBar : public QQuickItem class UKUITabBar : public QQuickItem
{ {
@ -61,6 +61,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUITabBar, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUITabBar, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUITABBAR_H #endif // UKUITABBAR_H

2
ukui-qml-style-helper/styleparameter/ukuitabbutton.cpp
View File

@ -1,7 +1,7 @@
#include "ukuitabbutton.h" #include "ukuitabbutton.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUITabButton::UKUITabButton(QQuickItem *parent) : QQuickItem(parent) UKUITabButton::UKUITabButton(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuitabbutton.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUITabButton : public QQuickItem class UKUITabButton : public QQuickItem
{ {
@ -129,6 +129,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUITabButton, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUITabButton, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUITABBUTTON_H #endif // UKUITABBUTTON_H

2
ukui-qml-style-helper/styleparameter/ukuitextfiled.cpp
View File

@ -1,7 +1,7 @@
#include <QApplication> #include <QApplication>
#include "ukuitextfiled.h" #include "ukuitextfiled.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUITextFiled::UKUITextFiled(QQuickItem *parent) : QQuickItem(parent) UKUITextFiled::UKUITextFiled(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuitextfiled.h
View File

@ -29,7 +29,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUITextFiled : public QQuickItem class UKUITextFiled : public QQuickItem
{ {
@ -243,6 +243,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUITextFiled, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUITextFiled, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUITEXTFILED_H #endif // UKUITEXTFILED_H

2
ukui-qml-style-helper/styleparameter/ukuitooltip.cpp
View File

@ -1,7 +1,7 @@
#include "ukuitooltip.h" #include "ukuitooltip.h"
#include "qdebug.h" #include "qdebug.h"
using namespace UIUIQQC2Style; using namespace UKUIQQC2Style;
UKUIToolTip::UKUIToolTip(QQuickItem *parent) : QQuickItem(parent) UKUIToolTip::UKUIToolTip(QQuickItem *parent) : QQuickItem(parent)
{ {

4
ukui-qml-style-helper/styleparameter/ukuitooltip.h
View File

@ -32,7 +32,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "tokenparameter.h" #include "tokenparameter.h"
namespace UIUIQQC2Style { namespace UKUIQQC2Style {
class UKUIToolTip : public QQuickItem class UKUIToolTip : public QQuickItem
{ {
@ -103,6 +103,6 @@ private:
}; };
} }
QML_DECLARE_TYPEINFO(UIUIQQC2Style::UKUIToolTip, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(UKUIQQC2Style::UKUIToolTip, QML_HAS_ATTACHED_PROPERTIES)
#endif // UKUITOOLTIP_H #endif // UKUITOOLTIP_H

1
ukui-styles/dt-tmp-readconfig.cpp
View File

@ -333,7 +333,6 @@ GlobalDTConfigPrivate::GlobalDTConfigPrivate()
path + "k" + m_widgetThemeName + "-" + m_lightMode + ".css" : path + "k" + m_widgetThemeName + "-" + m_lightMode + ".css" :
path + "k" + m_widgetThemeName + ".css"; path + "k" + m_widgetThemeName + ".css";
m_ukui_dt_loadConfig = this->load("/usr/share/config/globaltheme/token/kfashion-light.css");
this->initUKUIGlobalThemeParameters(); this->initUKUIGlobalThemeParameters();
} }