168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix resource mess

This commit is contained in:
johanneshilden 2017-09-29 00:28:08 +03:00
parent c9a1f772b3
commit 8dfeac448e
8 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lib/qtmaterialtheme.cpp
View File

@ -1,8 +1,10 @@
#include "lib/qtmaterialtheme.h"
#include "lib/qtmaterialtheme_p.h"
#include <QString>
#include <QStringBuilder>
#include <QDebug>
/*!
/*!material
* \class QtMaterialThemePrivate
* \internal
*/
@ -150,3 +152,8 @@ void QtMaterialTheme::setColor(const QString &key, Material::Color color)
d->colors.insert(key, palette[color]);
}
QIcon QtMaterialTheme::icon(QString category, QString icon)
{
return QIcon(":/icons/icons/" % category % "/svg/production/ic_" % icon % "_24px.svg");
}

3
components/lib/qtmaterialtheme.h
View File

@ -4,6 +4,7 @@
#include <QObject>
#include <QScopedPointer>
#include <QColor>
#include <QIcon>
namespace Material
{
@ -330,6 +331,8 @@ public:
void setColor(const QString &key, const QColor &color);
void setColor(const QString &key, Material::Color color);
static QIcon icon(QString category, QString icon);
protected:
const QScopedPointer<QtMaterialThemePrivate> d_ptr;

5
components/resources.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/material">
<qresource prefix="/fonts">
<file>../fonts/Roboto/Roboto-Black.ttf</file>
<file>../fonts/Roboto/Roboto-Bold.ttf</file>
<file>../fonts/Roboto/Roboto-Medium.ttf</file>
@ -7,4 +7,7 @@
<file>../fonts/Roboto/Roboto-Light.ttf</file>
<file>../fonts/Roboto/Roboto-Thin.ttf</file>
</qresource>
<qresource prefix="/icons">
<file>icons/communication/svg/production/ic_message_24px.svg</file>
</qresource>
</RCC>

6
examples/examples.pro
View File

@ -1,8 +1,10 @@
QT += core gui widgets
TEMPLATE = app
SOURCES = mainwindow.cpp main.cpp
HEADERS = mainwindow.h
HEADERS = mainwindow.h
LIBS += ../components/libcomponents.a
INCLUDEPATH += ../components/
TARGET = ../examples-exe
RESOURCES += resources.qrc
RESOURCES += \
examples.qrc

5
examples/examples.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/images">
<file>assets/uxceo-128.jpg</file>
</qresource>
</RCC>

2
examples/main.cpp
View File

@ -6,6 +6,8 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
Q_INIT_RESOURCE(resources);
MainWindow window;
window.show();

7
examples/mainwindow.cpp
View File

@ -1,14 +1,17 @@
#include "mainwindow.h"
#include <QtWidgets/QVBoxLayout>
#include <QtGui/QIcon>
#include <qtmaterialavatar.h>
#include <QDebug>
#include <lib/qtmaterialtheme.h>
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
{
QtMaterialAvatar *avatars[3];
avatars[0] = new QtMaterialAvatar(QImage("../qt-material-widgets/examples/assets/uxceo-128.jpg"));
avatars[0] = new QtMaterialAvatar(QImage(":/images/assets/uxceo-128.jpg"));
avatars[1] = new QtMaterialAvatar('W');
avatars[2] = new QtMaterialAvatar(QIcon(":/icons/assets/ic_message_24px.svg"));
avatars[2] = new QtMaterialAvatar(QIcon(QtMaterialTheme::icon("communication", "message")));
QWidget *widget = new QWidget;
QVBoxLayout *layout = new QVBoxLayout;

5
examples/resources.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/icons">
<file>assets/ic_message_24px.svg</file>
</qresource>
</RCC>