Commit 500dd426 authored by Ronan's avatar Ronan

feat(Colors): reorder

parent 416be65e
......@@ -59,6 +59,7 @@ class Colors : public QObject {
Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT);
ADD_COLOR(a, "transparent");
ADD_COLOR(b, "#D64D00");
ADD_COLOR(c, "#CBCBCB");
ADD_COLOR(d, "#5A585B");
ADD_COLOR(e, "#F3F3F3");
......@@ -69,11 +70,10 @@ class Colors : public QObject {
ADD_COLOR(j, "#4B5964");
ADD_COLOR(k, "#FFFFFF");
ADD_COLOR(l, "#000000");
ADD_COLOR(s, "#D64D00");
ADD_COLOR(t, "#FF8600");
ADD_COLOR(w, "#A1A1A1");
ADD_COLOR(y, "#D0D8DE");
ADD_COLOR(z, "#17A81A");
ADD_COLOR(m, "#FF8600");
ADD_COLOR(n, "#A1A1A1");
ADD_COLOR(o, "#D0D8DE");
ADD_COLOR(p, "#17A81A");
ADD_COLOR(error, "#FF0000");
......@@ -81,7 +81,6 @@ class Colors : public QObject {
ADD_COLOR_WITH_ALPHA(g, 20);
ADD_COLOR_WITH_ALPHA(g, 90);
ADD_COLOR_WITH_ALPHA(i, 30);
ADD_COLOR_WITH_ALPHA(j, 75);
ADD_COLOR_WITH_ALPHA(k, 50);
ADD_COLOR_WITH_ALPHA(l, 50);
ADD_COLOR_WITH_ALPHA(l, 80);
......@@ -108,16 +107,6 @@ signals:
void colorTnChanged (const QColor &color);
void colorToChanged (const QColor &color);
void colorTpChanged (const QColor &color);
void colorTqChanged (const QColor &color);
void colorTrChanged (const QColor &color);
void colorTsChanged (const QColor &color);
void colorTtChanged (const QColor &color);
void colorTuChanged (const QColor &color);
void colorTvChanged (const QColor &color);
void colorTwChanged (const QColor &color);
void colorTxChanged (const QColor &color);
void colorTyChanged (const QColor &color);
void colorTzChanged (const QColor &color);
void colorTerrorChanged (const QColor &color);
......
......@@ -10,7 +10,7 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color hovered: Colors.w
property color hovered: Colors.n
property color normal: Colors.c
property color pressed: Colors.i
property color selected: Colors.g
......
......@@ -7,7 +7,7 @@ import Colors 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.y
property color disabled: Colors.o
property color hovered: Colors.j
property color normal: Colors.g
property color pressed: Colors.i
......
......@@ -8,9 +8,9 @@ import Colors 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.i30
property color hovered: Colors.s
property color hovered: Colors.b
property color normal: Colors.i
property color pressed: Colors.t
property color pressed: Colors.m
}
property QtObject textColor: QtObject {
......
......@@ -37,7 +37,7 @@ QtObject {
property QtObject delegate: QtObject {
property QtObject color: QtObject {
property color hovered: Colors.y
property color hovered: Colors.o
property color normal: Colors.k
}
......
......@@ -11,7 +11,7 @@ QtObject {
property QtObject value: QtObject {
property QtObject placeholder: QtObject {
property color color: Colors.w
property color color: Colors.n
property int pointSize: Units.dp * 10
}
......
......@@ -13,7 +13,7 @@ QtObject {
property int width: 200
property QtObject content: QtObject {
property color color: Colors.t
property color color: Colors.m
property int radius: 2
}
}
......
......@@ -36,8 +36,8 @@ QtObject {
property QtObject color: QtObject {
property color checked: Colors.i
property color disabled: Colors.c
property color normal: Colors.w
property color pressed: Colors.w
property color normal: Colors.n
property color pressed: Colors.n
}
}
......
......@@ -11,9 +11,9 @@ QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.i30
property color hovered: Colors.s
property color hovered: Colors.b
property color normal: Colors.i
property color pressed: Colors.t
property color pressed: Colors.m
property color selected: Colors.k
}
......
......@@ -12,7 +12,7 @@ QtObject {
property int padding: 10
property QtObject placeholder: QtObject {
property color color: Colors.w
property color color: Colors.n
property int pointSize: Units.dp * 10
}
......
......@@ -12,21 +12,21 @@ QtObject {
property QtObject high: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.y
property color enabled: Colors.w
property color disabled: Colors.o
property color enabled: Colors.n
}
}
property QtObject contentItem: QtObject {
property color color: Colors.s
property color color: Colors.b
}
}
property QtObject low: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.y
property color enabled: Colors.w
property color disabled: Colors.o
property color enabled: Colors.n
}
}
......
......@@ -8,7 +8,7 @@ import Units 1.0
QtObject {
property int spacing: 1
property color backgroundColor: Colors.w
property color backgroundColor: Colors.n
property QtObject entry: QtObject {
property int iconSize: 24
......
......@@ -14,9 +14,9 @@ QtObject {
property int height: 30
property QtObject color: QtObject {
property color hovered: Colors.y
property color hovered: Colors.o
property color normal: Colors.k
property color pressed: Colors.y
property color pressed: Colors.o
}
}
......
......@@ -15,7 +15,7 @@ QtObject {
}
property QtObject sipAddress: QtObject {
property color color: Colors.j75
property color color: Colors.g
property int pointSize: Units.dp * 10
}
......
......@@ -15,7 +15,7 @@ QtObject {
}
property QtObject description: QtObject {
property color color: Colors.w
property color color: Colors.n
property int pointSize: Units.dp * 10
property int height: 40
}
......
......@@ -24,7 +24,7 @@ QtObject {
}
property QtObject sipAddressColor: QtObject {
property color normal: Colors.w
property color normal: Colors.n
property color selected: Colors.k
}
......
......@@ -100,7 +100,7 @@ QtObject {
}
property QtObject contentItem: QtObject {
property color color: Colors.z
property color color: Colors.p
}
}
}
......@@ -111,7 +111,7 @@ QtObject {
}
property QtObject incoming: QtObject {
property color backgroundColor: Colors.y
property color backgroundColor: Colors.o
property int avatarSize: 20
property QtObject text: QtObject {
......
......@@ -15,7 +15,7 @@ QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color normal: Colors.a
property color hovered: Colors.y
property color hovered: Colors.o
}
}
......
......@@ -8,7 +8,7 @@ import Units 1.0
QtObject {
property QtObject sipAddress: QtObject {
property color color: Colors.w
property color color: Colors.n
property int pointSize: Units.dp * 10
}
......
......@@ -24,7 +24,7 @@ QtObject {
property QtObject contentItem: QtObject {
property QtObject color: QtObject {
property color failed: Colors.error
property color normal: Colors.z
property color normal: Colors.p
}
}
}
......
......@@ -15,7 +15,7 @@ QtObject {
property int spacing: 0
property QtObject messageContainer: QtObject {
property color color: Colors.y
property color color: Colors.o
property int radius: 6
property int margins: 10
......
......@@ -12,7 +12,7 @@ QtObject {
property int width: 300
property QtObject border: QtObject {
property color color: Colors.w
property color color: Colors.n
property int width: 1
}
}
......@@ -20,7 +20,7 @@ QtObject {
property QtObject sipAddress: QtObject {
property QtObject color: QtObject {
property color normal: Colors.w
property color normal: Colors.n
property color selected: Colors.k
}
}
......
......@@ -13,7 +13,7 @@ QtObject {
property int rightMargin: 10
property QtObject color: QtObject {
property color hovered: Colors.y
property color hovered: Colors.o
property color normal: Colors.k
}
......
......@@ -35,7 +35,7 @@ QtObject {
property int margins: 15
property QtObject avatar: QtObject {
property color backgroundColor: Colors.w
property color backgroundColor: Colors.n
property int maxSize: 300
}
......
......@@ -44,7 +44,7 @@ QtObject {
property QtObject presence: QtObject {
property int pointSize: Units.dp * 10
property color color: Colors.w
property color color: Colors.n
}
property QtObject username: QtObject {
......
......@@ -24,7 +24,7 @@ QtObject {
property QtObject text: QtObject {
property int pointSize: Units.dp * 8
property color color: Colors.j75
property color color: Colors.g
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment