From e04298e24ec385715386813195410e041dd26544 Mon Sep 17 00:00:00 2001 From: Achraf k Date: Thu, 17 Feb 2022 17:54:26 +0100 Subject: [PATCH] Locate resources at runtime using QDir::currentpath --- components/appbar.cpp | 4 +--- components/appbar_p.h | 2 ++ components/autocomplete_internal.cpp | 6 +----- components/autocomplete_internal.h | 5 +++++ components/avatar.cpp | 4 +--- components/avatar_p.h | 3 +++ components/badge.cpp | 3 +-- components/badge_p.h | 1 + components/circularprogress.cpp | 6 +----- components/circularprogress_p.h | 6 ++++++ components/dialog_internal.cpp | 2 +- components/drawer_internal.cpp | 8 ++------ components/drawer_internal.h | 7 ++++++- components/fab.cpp | 7 ++----- components/fab_p.h | 6 ++++++ components/lib/checkable.cpp | 6 +++--- components/lib/checkable_p.h | 1 + components/lib/overlaywidget.cpp | 2 +- components/lib/ripple.cpp | 2 +- components/lib/style.cpp | 11 +++++------ components/lib/style_p.h | 2 ++ components/lib/theme.cpp | 10 ++++------ components/lib/theme_p.h | 4 ++++ examples/avatarsettingseditor.cpp | 3 ++- examples/avatarsettingseditor.h | 3 ++- examples/badgesettingseditor.cpp | 5 +---- examples/badgesettingseditor.h | 2 ++ 27 files changed, 67 insertions(+), 54 deletions(-) diff --git a/components/appbar.cpp b/components/appbar.cpp index 557765b..6b8103d 100644 --- a/components/appbar.cpp +++ b/components/appbar.cpp @@ -1,12 +1,10 @@ #include "appbar.h" #include "appbar_p.h" -#include -#include #include "lib/style.h" namespace md { /*! - * \class QtMaterialAppBarPrivate + * \class AppBarPrivate * \internal */ diff --git a/components/appbar_p.h b/components/appbar_p.h index 85e2c55..dcb1cb2 100644 --- a/components/appbar_p.h +++ b/components/appbar_p.h @@ -3,6 +3,8 @@ #include #include +#include +#include namespace md { diff --git a/components/autocomplete_internal.cpp b/components/autocomplete_internal.cpp index 7fff61b..621dbc9 100644 --- a/components/autocomplete_internal.cpp +++ b/components/autocomplete_internal.cpp @@ -1,13 +1,9 @@ #include "autocomplete_internal.h" -#include -#include -#include -#include namespace md { /*! - * \class QtMaterialAutoCompleteStateMachine + * \class AutoCompleteStateMachine * \internal */ diff --git a/components/autocomplete_internal.h b/components/autocomplete_internal.h index d628b55..a913eca 100644 --- a/components/autocomplete_internal.h +++ b/components/autocomplete_internal.h @@ -1,7 +1,12 @@ #ifndef AUTOCOMPLETESTATEMACHINE_H #define AUTOCOMPLETESTATEMACHINE_H +#include #include +#include +#include +#include + #include "autocomplete.h" namespace md diff --git a/components/avatar.cpp b/components/avatar.cpp index c1d0ea2..ef3bfb7 100644 --- a/components/avatar.cpp +++ b/components/avatar.cpp @@ -1,13 +1,11 @@ #include "avatar.h" #include "avatar_p.h" -#include -#include #include "lib/style.h" namespace md { /*! - * \class QtMaterialAvatarPrivate + * \class AvatarPrivate * \internal */ diff --git a/components/avatar_p.h b/components/avatar_p.h index 5901b24..127496b 100644 --- a/components/avatar_p.h +++ b/components/avatar_p.h @@ -7,6 +7,9 @@ #include #include #include +#include +#include + #include "lib/theme.h" namespace md diff --git a/components/badge.cpp b/components/badge.cpp index f6dff5a..0461c3e 100644 --- a/components/badge.cpp +++ b/components/badge.cpp @@ -1,13 +1,12 @@ #include "badge.h" #include "badge_p.h" -#include #include "lib/style.h" namespace md { /*! - * \class QtMaterialBadgePrivate + * \class BadgePrivate * \internal */ diff --git a/components/badge_p.h b/components/badge_p.h index 89a110f..b4a98c9 100644 --- a/components/badge_p.h +++ b/components/badge_p.h @@ -5,6 +5,7 @@ #include #include #include +#include namespace md { diff --git a/components/circularprogress.cpp b/components/circularprogress.cpp index 2203a2e..3284979 100644 --- a/components/circularprogress.cpp +++ b/components/circularprogress.cpp @@ -1,9 +1,5 @@ #include "circularprogress.h" #include "circularprogress_p.h" -#include -#include -#include -#include #include "circularprogress_internal.h" #include "lib/style.h" @@ -11,7 +7,7 @@ namespace md { /*! - * \class QtMaterialCircularProgressPrivate + * \class CircularProgressPrivate * \internal */ diff --git a/components/circularprogress_p.h b/components/circularprogress_p.h index ad22930..5f5f051 100644 --- a/components/circularprogress_p.h +++ b/components/circularprogress_p.h @@ -2,7 +2,13 @@ #define CIRCULARPROGRESS_P_H #include +#include +#include +#include +#include + #include "lib/theme.h" + namespace md { diff --git a/components/dialog_internal.cpp b/components/dialog_internal.cpp index 1e58c7e..167c623 100644 --- a/components/dialog_internal.cpp +++ b/components/dialog_internal.cpp @@ -82,7 +82,7 @@ void DialogProxy::paintEvent(QPaintEvent *event) } /*! - * \class QtMaterialDialogWindow + * \class DialogWindow * \internal */ diff --git a/components/drawer_internal.cpp b/components/drawer_internal.cpp index 3e2f1e7..62308c9 100644 --- a/components/drawer_internal.cpp +++ b/components/drawer_internal.cpp @@ -1,14 +1,10 @@ #include "drawer_internal.h" -#include -#include -#include -#include -#include #include "drawer.h" + namespace md { /*! - * \class QtMaterialDrawerStateMachine + * \class DrawerStateMachine * \internal */ diff --git a/components/drawer_internal.h b/components/drawer_internal.h index 5370179..dea6fb8 100644 --- a/components/drawer_internal.h +++ b/components/drawer_internal.h @@ -2,6 +2,12 @@ #define DRAWER_INTERNAL_H #include +#include +#include +#include +#include +#include + #include "lib/overlaywidget.h" namespace md @@ -52,7 +58,6 @@ inline qreal DrawerStateMachine::opacity() const class DrawerWidget : public OverlayWidget { Q_OBJECT - Q_PROPERTY(int offset WRITE setOffset READ offset) public: diff --git a/components/fab.cpp b/components/fab.cpp index 0e57f68..0d42123 100644 --- a/components/fab.cpp +++ b/components/fab.cpp @@ -1,15 +1,12 @@ #include "fab.h" #include "fab_p.h" -#include -#include -#include -#include #include "lib/rippleoverlay.h" + namespace md { /*! - * \class QtMaterialFloatingActionButtonPrivate + * \class FloatingActionButtonPrivate * \internal */ diff --git a/components/fab_p.h b/components/fab_p.h index 9055fd1..2e784bb 100644 --- a/components/fab_p.h +++ b/components/fab_p.h @@ -1,7 +1,13 @@ #ifndef FAB_P_H #define FAB_P_H +#include +#include +#include +#include + #include "raisedbutton_p.h" + namespace md { diff --git a/components/lib/checkable.cpp b/components/lib/checkable.cpp index d69d6cb..e160afd 100644 --- a/components/lib/checkable.cpp +++ b/components/lib/checkable.cpp @@ -8,7 +8,7 @@ namespace md { /*! - * \class QtMaterialCheckablePrivate + * \class CheckablePrivate * \internal */ @@ -26,8 +26,8 @@ void CheckablePrivate::init() Q_Q(Checkable); rippleOverlay = new RippleOverlay; - checkedIcon = new CheckableIcon(QIcon(":/icons/icons/toggle/svg/production/ic_check_box_24px.svg"), q); - uncheckedIcon = new CheckableIcon(QIcon(":/icons/icons/toggle/svg/production/ic_check_box_outline_blank_24px.svg"), q); + checkedIcon = new CheckableIcon(QIcon(QDir::currentPath()+"/../components/icons/toggle/svg/production/ic_check_box_24px.svg"), q); + uncheckedIcon = new CheckableIcon(QIcon(QDir::currentPath()+"/../components/icons/toggle/svg/production/ic_check_box_outline_blank_24px.svg"), q); stateMachine = new QStateMachine(q); uncheckedState = new QState; checkedState = new QState; diff --git a/components/lib/checkable_p.h b/components/lib/checkable_p.h index 5c88547..2fb61fd 100644 --- a/components/lib/checkable_p.h +++ b/components/lib/checkable_p.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "lib/checkable.h" diff --git a/components/lib/overlaywidget.cpp b/components/lib/overlaywidget.cpp index 8bde9fc..1dd5deb 100644 --- a/components/lib/overlaywidget.cpp +++ b/components/lib/overlaywidget.cpp @@ -4,7 +4,7 @@ namespace md { /*! - * \class QtMaterialOverlayWidget + * \class OverlayWidget * \internal */ diff --git a/components/lib/ripple.cpp b/components/lib/ripple.cpp index 8488ae2..6fcc6e7 100644 --- a/components/lib/ripple.cpp +++ b/components/lib/ripple.cpp @@ -4,7 +4,7 @@ namespace md { /*! - * \class QtMaterialRipple + * \class Ripple * \internal */ diff --git a/components/lib/style.cpp b/components/lib/style.cpp index eff72a4..e3838bd 100644 --- a/components/lib/style.cpp +++ b/components/lib/style.cpp @@ -1,11 +1,10 @@ #include "lib/style.h" -#include #include "lib/theme.h" namespace md { /*! - * \class QtMaterialStylePrivate + * \class StylePrivate * \internal */ @@ -22,15 +21,15 @@ void StylePrivate::init() { Q_Q(Style); - QFontDatabase::addApplicationFont(":/fonts/roboto_regular"); - QFontDatabase::addApplicationFont(":/fonts/roboto_medium"); - QFontDatabase::addApplicationFont(":/fonts/roboto_bold"); + QFontDatabase::addApplicationFont(QDir::currentPath()+"/../fonts/roboto_regular"); + QFontDatabase::addApplicationFont(QDir::currentPath()+"/../fonts/roboto_medium"); + QFontDatabase::addApplicationFont(QDir::currentPath()+"/../fonts/roboto_bold"); q->setTheme(new Theme); } /*! - * \class QtMaterialStyle + * \class Style * \internal */ diff --git a/components/lib/style_p.h b/components/lib/style_p.h index d32afa0..f262d59 100644 --- a/components/lib/style_p.h +++ b/components/lib/style_p.h @@ -2,6 +2,8 @@ #define STYLE_P_H #include +#include +#include namespace md { diff --git a/components/lib/theme.cpp b/components/lib/theme.cpp index 9b6f057..ea1e1a0 100644 --- a/components/lib/theme.cpp +++ b/components/lib/theme.cpp @@ -1,12 +1,10 @@ #include "lib/theme.h" #include "lib/theme_p.h" -#include -#include -#include + namespace md { -/*!material - * \class QtMaterialThemePrivate +/*! + * \class ThemePrivate * \internal */ @@ -156,7 +154,7 @@ void Theme::setColor(const QString &key, Material::Color color) QIcon Theme::icon(QString category, QString icon) { - return QIcon(":/icons/icons/" % category % "/svg/production/ic_" % icon % "_24px.svg"); + return QIcon(QDir::currentPath() % "/../components/icons/" % category % "/svg/production/ic_" % icon % "_24px.svg"); } } diff --git a/components/lib/theme_p.h b/components/lib/theme_p.h index 4d69995..43e4566 100644 --- a/components/lib/theme_p.h +++ b/components/lib/theme_p.h @@ -3,6 +3,10 @@ #include #include +#include +#include +#include +#include namespace md { diff --git a/examples/avatarsettingseditor.cpp b/examples/avatarsettingseditor.cpp index 2ae95ce..a2f58ce 100644 --- a/examples/avatarsettingseditor.cpp +++ b/examples/avatarsettingseditor.cpp @@ -70,7 +70,8 @@ void AvatarSettingsEditor::updateWidget() m_avatar->setLetter(QChar('X')); break; case 1: - m_avatar->setImage(QImage(":/images/assets/sikh.jpg")); + qDebug()<setImage(QImage(QDir::currentPath()+"/assets/sikh.jpg")); break; case 2: m_avatar->setIcon(Theme::icon("communication", "message")); diff --git a/examples/avatarsettingseditor.h b/examples/avatarsettingseditor.h index 655bbfa..5a909d2 100644 --- a/examples/avatarsettingseditor.h +++ b/examples/avatarsettingseditor.h @@ -2,8 +2,9 @@ #define AVATARSETTINGSEDITOR_H #include - #include +#include + #include #include diff --git a/examples/badgesettingseditor.cpp b/examples/badgesettingseditor.cpp index e33ed89..bdf4f22 100644 --- a/examples/badgesettingseditor.cpp +++ b/examples/badgesettingseditor.cpp @@ -1,12 +1,9 @@ #include "badgesettingseditor.h" -#include -#include -#include BadgeSettingsEditor::BadgeSettingsEditor(QWidget *parent) : QWidget(parent), ui(new Ui::BadgeSettingsForm), - m_avatar(new Avatar(QImage(":/images/assets/sikh.jpg"))), + m_avatar(new Avatar(QImage(QDir::currentPath()+"/assets/sikh.jpg"))), m_badge(new Badge) { QVBoxLayout *layout = new QVBoxLayout; diff --git a/examples/badgesettingseditor.h b/examples/badgesettingseditor.h index 4c687a8..2644600 100644 --- a/examples/badgesettingseditor.h +++ b/examples/badgesettingseditor.h @@ -2,6 +2,8 @@ #define BADGESETTINGSEDITOR_H #include +#include +#include #include #include