mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Colors managment rework

Browse source
This commit is contained in:
Julien Wadel 2021-09-06 19:51:56 +02:00
parent 3c267e25bf
commit 56b001eb0c
95 changed files with 1330 additions and 1140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1470
linphone-app/src/app/App.cpp
View file

File diff suppressed because it is too large Load diff

74
linphone-app/src/components/other/colors/ColorListModel.cpp
View file

@ -69,9 +69,14 @@ QVariant ColorListModel::data (const QModelIndex &index, int role) const {
void ColorListModel::add(std::shared_ptr<ColorModel> color){
int row = mList.count();
connect(color.get(), &ColorModel::uiColorChanged, this, &ColorListModel::handleUiColorChanged);
beginInsertRows(QModelIndex(), row, row);
setProperty(color->getName().toStdString().c_str(), QVariant::fromValue(color.get()));
mData.insert(color->getName(), QVariant::fromValue(color.get()));
mList << color;
@ -79,6 +84,47 @@ void ColorListModel::add(std::shared_ptr<ColorModel> color){
emit layoutChanged();
}
ColorModel * ColorListModel::add(const QString& id, const QString& idLink, QString description, QString colorValue){
ColorModel * color = getColor(id);
if(!color){
if(idLink != ""){
if( colorValue == ""){
auto linkColor = getColor(idLink);
if(linkColor){
colorValue = linkColor->getColor().name(QColor::HexArgb);
}
}
addLink(id, idLink);
}
if( description == ""){
description = id;
description.replace("_", " ");
}
auto colorShared = std::make_shared<ColorModel>(id, colorValue, description);
add(colorShared);
color = colorShared.get();
}
return color;
}
void ColorListModel::addLink(const QString& a, const QString& b){
int index = 0;
if( mColorLinkIndexes.contains(b)){
index = mColorLinkIndexes[b];
}else {
index = mColorLinks.size();
mColorLinks.push_back(QStringList(b));
mColorLinkIndexes[b] = index;
}
mColorLinks[index].push_back(a);
mColorLinkIndexes[a] = index;
}
void ColorListModel::removeLink(const QString& a){
mColorLinks[mColorLinkIndexes[a]].removeOne(a);
mColorLinkIndexes.remove(a);
}
bool ColorListModel::removeRow (int row, const QModelIndex &parent){
return removeRows(row, 1, parent);
}
@ -117,6 +163,13 @@ QString ColorListModel::getNames(){
return names.join(", ");
}
ColorModel * ColorListModel::getColor(const QString& id){
if(mData.contains(id)){
return mData[id].value<ColorModel*>();
}else
return nullptr;
}
QQmlPropertyMap * ColorListModel::getQmlData() {
return &mData;
}
@ -125,6 +178,13 @@ const QQmlPropertyMap * ColorListModel::getQmlData() const{
return &mData;
}
int ColorListModel::getLinkIndex(const QString& id){
if( mColorLinkIndexes.contains(id))
return mColorLinkIndexes[id];
else
return -1;
}
void ColorListModel::overrideColors (const std::shared_ptr<linphone::Config> &config) {
if (!config)
return;
@ -137,7 +197,21 @@ void ColorListModel::overrideColors (const std::shared_ptr<linphone::Config> &co
}
}
void ColorListModel::handleUiColorChanged(const QString& id, const QColor& color){
if( mColorLinkIndexes.contains(id)){
int index = mColorLinkIndexes[id];
for(int i = 0 ; i < mColorLinks[index].size() ; ++i){
auto colorToUpdate =getColor(mColorLinks[index][i]);
if(colorToUpdate)
colorToUpdate->setInternalColor(color);
}
}
}
//--------------------------------------------------------------------------------
/*
std::shared_ptr<ColorModel> ColorListModel::getImdnState(const std::shared_ptr<const linphone::Color> & state){
std::shared_ptr<ColorModel> imdn;

15
linphone-app/src/components/other/colors/ColorListModel.hpp
View file

@ -133,10 +133,23 @@ public:
void useConfig (const std::shared_ptr<linphone::Config> &config);
Q_INVOKABLE QString getNames();
ColorModel * getColor(const QString& id);
// id: set an ID. If the ID already exist, the funtion return the item instead of create one.
// color : if empty, use the color from link
// description : describe the color
// idLink : link this color with another ID
Q_INVOKABLE ColorModel * add(const QString& id, const QString& idLink, QString description = "", QString color = "");
void addLink(const QString& a, const QString& b);
void removeLink(const QString& a);
QQmlPropertyMap * getQmlData();
const QQmlPropertyMap * getQmlData() const;
int getLinkIndex(const QString& id);
public slots:
void handleUiColorChanged(const QString& id, const QColor& color);
signals:
void colorChanged();
@ -153,6 +166,8 @@ private:
QStringList getColorNames () const;
QQmlPropertyMap mData;
QVector<QStringList> mColorLinks;
QMap<QString, int> mColorLinkIndexes;// Optimization for access
};
#undef ADD_COLOR

8
linphone-app/src/components/other/colors/ColorModel.cpp
View file

@ -51,6 +51,14 @@ QString ColorModel::getDescription() const{
void ColorModel::setColor(const QColor& color){
if(color != mColor){
mColor = color;
emit colorChanged();
emit uiColorChanged(mName, color);
}
}
void ColorModel::setInternalColor(const QColor& color){
if(color != mColor){
mColor = color;
emit colorChanged();

2
linphone-app/src/components/other/colors/ColorModel.hpp
View file

@ -45,11 +45,13 @@ public:
void setColor(const QColor& color);
void setInternalColor(const QColor& color);
void setAlpha(const int& alpha);
void setDescription(const QString& description);
signals:
void colorChanged();
void uiColorChanged(const QString& id, const QColor& color); // UI request a change
void descriptionChanged();
private:

21
linphone-app/src/components/other/colors/ColorProxyModel.cpp
View file

@ -32,23 +32,26 @@
ColorProxyModel::ColorProxyModel (QObject *parent) : QSortFilterProxyModel(parent){
setSourceModel(App::getInstance()->getColorListModel());
sort(0);
}
bool ColorProxyModel::filterAcceptsRow (
int sourceRow,
const QModelIndex &sourceParent
) const {
int sourceRow,
const QModelIndex &sourceParent
) const {
Q_UNUSED(sourceRow)
Q_UNUSED(sourceParent)
//const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
//const ParticipantDeviceModel *device = index.data().value<ParticipantDeviceModel *>();
//const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
//const ParticipantDeviceModel *device = index.data().value<ParticipantDeviceModel *>();
return true;
}
bool ColorProxyModel::lessThan (const QModelIndex &left, const QModelIndex &right) const {
const ColorModel *a = sourceModel()->data(left).value<ColorModel *>();
const ColorModel *b = sourceModel()->data(right).value<ColorModel *>();
return a->getName() < b->getName() ;
ColorListModel * model = static_cast<ColorListModel*>(sourceModel());
const ColorModel *a = model->data(left).value<ColorModel *>();
const ColorModel *b = model->data(right).value<ColorModel *>();
return model->getLinkIndex(a->getName()) < model->getLinkIndex(b->getName());
//return a->getName() < b->getName() ;
}
//---------------------------------------------------------------------------------

5
linphone-app/ui/modules/Common/Dialog/DialogTitle.qml
View file

@ -5,6 +5,7 @@ import Linphone 1.0
import Common.Styles 1.0
import Units 1.0
import ColorsList 1.0
// =============================================================================
// Title bar used by dialogs.
@ -22,8 +23,8 @@ Item {
Rectangle{
anchors.fill:parent
gradient: Gradient {
GradientStop { position: 0.0; color: Colors.y.color }
GradientStop { position: 1.0; color: Colors.z.color}
GradientStop { position: 0.0; color: ColorsList.add("Dialog_title_gradient_low", "y").color }
GradientStop { position: 1.0; color: ColorsList.add("Dialog_title_gradient_high", "z").color}
}
visible:showBar
}

4
linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml
View file

@ -1,10 +1,10 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("Busy_indicator", "i").color
property int duration: 1250
property int nSpheres: 6
}

5
linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml
View file

@ -2,11 +2,12 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("Dialog", "k").color
property QtObject buttons: QtObject {
property int bottomMargin: 30
@ -27,7 +28,7 @@ QtObject {
}
property QtObject description: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Dialog_description", "j").color
property int leftMargin: 50
property int pointSize: Units.dp * 11
property int rightMargin: 50

10
linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
View file

@ -1,7 +1,7 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
@ -9,10 +9,10 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color hovered: Colors.n.color
property color normal: Colors.x.color
property color pressed: Colors.i.color
property color selected: Colors.g.color
property color hovered: ColorsList.add("Exclusive_button_hovered", "n").color
property color normal: ColorsList.add("Exclusive_button_normal", "x").color
property color pressed: ColorsList.add("Exclusive_button_pressed", "i").color
property color selected: ColorsList.add("Exclusive_button_selected", "g").color
}
}
}

7
linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
View file

@ -1,5 +1,6 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
@ -11,9 +12,9 @@ QtObject {
property int iconSize: 16
property QtObject color: QtObject {
property color hovered: Colors.c.color
property color normal: Colors.f.color
property color pressed: Colors.c.color
property color hovered: ColorsList.add("FileChooser_hovered", "c").color
property color normal: ColorsList.add("FileChooser_normal", "f").color
property color pressed: ColorsList.add("FileChooser_pressed", "c").color
}
}
}

9
linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -14,14 +15,14 @@ QtObject {
property int radius: 20
property QtObject color: QtObject {
property color hovered: Colors.c.color
property color normal: Colors.f.color
property color pressed: Colors.i.color
property color hovered: ColorsList.add("SmallButton_background_hovered", "c").color
property color normal: ColorsList.add("SmallButton_background_normal", "f").color
property color pressed: ColorsList.add("SmallButton_background_pressed", "i").color
}
}
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("SmallButton_text", "q").color
property int pointSize: Units.dp * 8
}
}

17
linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
View file

@ -1,22 +1,23 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.o.color
property color hovered: Colors.j.color
property color normal: Colors.r.color
property color pressed: Colors.i.color
property color disabled: ColorsList.add("TextButton_background_disabled", "o").color
property color hovered: ColorsList.add("TextButton_background_hovered", "j").color
property color normal: ColorsList.add("TextButton_background_normal", "r").color
property color pressed: ColorsList.add("TextButton_background_pressed", "i").color
}
property QtObject textColor: QtObject {
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.q.color
property color pressed: Colors.q.color
property color disabled: ColorsList.add("TextButton_text_disabled", "q").color
property color hovered: ColorsList.add("TextButton_text_hovered", "q").color
property color normal: ColorsList.add("TextButton_text_normal", "q").color
property color pressed: ColorsList.add("TextButton_text_pressed", "q").color
}
property QtObject borderColor : backgroundColor
}

18
linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml
View file

@ -1,22 +1,22 @@
// TextButtonBStyle
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.i30.color
property color hovered: Colors.b.color
property color normal: Colors.i.color
property color pressed: Colors.m.color
property color disabled: ColorsList.add("TextButtonB_background_disabled", "i30").color
property color hovered: ColorsList.add("TextButtonB_background_hovered", "b").color
property color normal: ColorsList.add("TextButtonB_background_normal", "i").color
property color pressed: ColorsList.add("TextButtonB_background_pressed", "m").color
}
property QtObject textColor: QtObject {
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.q.color
property color pressed: Colors.q.color
property color disabled: ColorsList.add("TextButtonB_text_disabled", "q").color
property color hovered: ColorsList.add("TextButtonB_text_hovered", "q").color
property color normal: ColorsList.add("TextButtonB_text_normal", "q").color
property color pressed: ColorsList.add("TextButtonB_text_pressed", "q").color
}
property QtObject borderColor : backgroundColor
}

7
linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -11,8 +12,8 @@ QtObject {
property int size: 18
property QtObject color: QtObject {
property color pressed: Colors.i.color
property color hovered: Colors.h.color
property color normal: Colors.g.color
property color pressed: ColorsList.add("CheckBox_pressed", "i").color
property color hovered: ColorsList.add("CheckBox_hovered", "h").color
property color normal: ColorsList.add("CheckBox_normal", "g").color
}
}

10
linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file

@ -2,7 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -13,13 +13,13 @@ QtObject {
property int width: 200
property QtObject border: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("ComboBox_border_normal", "c").color
property int width: 1
}
property QtObject color: QtObject {
property color normal: Colors.q.color
property color readOnly: Colors.e.color
property color normal: ColorsList.add("ComboBox_normal", "q").color
property color readOnly: ColorsList.add("ComboBox_readonly", "e").color
}
}
@ -29,7 +29,7 @@ QtObject {
property int spacing: 5
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("ComboBox_text_normal", "d").color
property int pointSize: Units.dp * 10
}
}

11
linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml
View file

@ -2,13 +2,14 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject color: QtObject {
property color hovered: Colors.o.color
property color normal: Colors.q.color
property color hovered: ColorsList.add("CommonItem_hovered", "o").color
property color normal: ColorsList.add("CommonItem_normal", "q").color
}
property QtObject contentItem: QtObject {
@ -16,18 +17,18 @@ QtObject {
property int spacing: 5
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("CommonItem_text", "d").color
property int pointSize: Units.dp * 10
}
}
property QtObject indicator: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("CommonItem_indicator", "i").color
property int width: 5
}
property QtObject separator: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("CommonItem_separator", "c").color
property int height: 1
}
}

11
linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml
View file

@ -2,12 +2,13 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.e.color
property color outsideBackgroundColor: Colors.aa.color
property color backgroundColor: ColorsList.add("DroppableTextArea_Chat_background", "e").color
property color outsideBackgroundColor: ColorsList.add("DroppableTextArea_Chat_outsideBackground", "aa").color
property QtObject fileChooserButton: QtObject {
property int margins: 6
@ -15,16 +16,16 @@ QtObject {
}
property QtObject hoverContent: QtObject {
property color backgroundColor: Colors.q.color
property color backgroundColor: ColorsList.add("DroppableTextArea_Chat_hoverContent_background", "q").color
property QtObject text: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("DroppableTextArea_Chat_hoverContent_text", "i").color
property int pointSize: Units.dp * 11
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("DroppableTextArea_Chat_text", "d").color
property int pointSize: Units.dp * 10
}
}

7
linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -11,12 +12,12 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color normal: Colors.f.color
property color pressed: Colors.c.color
property color normal: ColorsList.add("NumericField_normal", "f").color
property color pressed: ColorsList.add("NumericField_pressed", "c").color
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("NumericField_text", "d").color
property int pointSize: Units.dp * 9
}
}

9
linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,18 +14,18 @@ QtObject {
property int radius: 4
property QtObject border: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("TextAreaField_background_border", "c").color
property int width: 1
}
property QtObject color: QtObject {
property color normal: Colors.q.color
property color readOnly: Colors.e.color
property color normal: ColorsList.add("TextAreaField_background_normal", "q").color
property color readOnly: ColorsList.add("TextAreaField_background_reeadOnly", "e").color
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("TextAreaField_text", "d").color
property int pointSize: Units.dp * 10
property int padding: 8
}

37
linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -14,22 +15,22 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: Colors.error.color
property color normal: Colors.c.color
property color selected: Colors.i.color
property color error: ColorsList.add("TextField_normal_background_border_error", "error").color
property color normal: ColorsList.add("TextField_normal_background_border_normal", "c").color
property color selected: ColorsList.add("TextField_normal_background_border_selected", "i").color
}
property int width: 1
}
property QtObject color: QtObject {
property color normal: Colors.q.color
property color readOnly: Colors.e.color
property color normal: ColorsList.add("TextField_normal_background_normal", "q").color
property color readOnly: ColorsList.add("TextField_normal_background_readonly", "e").color
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("TextField_normal_text", "d").color
property int pointSize: Units.dp * 10
property int rightPadding: 10
}
@ -43,22 +44,22 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: Colors.error.color
property color normal: Colors.c.color
property color selected: Colors.i.color
property color error: "black"
property color normal: "black"
property color selected: "black"
}
property int width: 0
}
property QtObject color: QtObject {
property color normal: Colors.q.color
property color readOnly: Colors.e.color
property color normal: ColorsList.add("TextField_unbordered_background_normal", "q").color
property color readOnly: ColorsList.add("TextField_unbordered_background_readonly", "e").color
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("TextField_unbordered_text", "d").color
property int pointSize: Units.dp * 10
property int rightPadding: 10
}
@ -72,22 +73,22 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: Colors.error.color
property color normal: Colors.c.color
property color selected: Colors.i.color
property color error: "black"
property color normal: "black"
property color selected: "black"
}
property int width: 0
}
property QtObject color: QtObject {
property color normal: Colors.q.color
property color readOnly: Colors.e.color
property color normal: ColorsList.add("TextField_flat_background_normal", "q").color
property color readOnly: ColorsList.add("TextField_flat_background_readonly", "e").color
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("TextField_flat_text", "d").color
property int pointSize: Units.dp * 10
property int rightPadding: 10
}

5
linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -10,7 +11,7 @@ QtObject {
property QtObject value: QtObject {
property QtObject placeholder: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("ListForm_placeholder", "n").color
property int pointSize: Units.dp * 10
}
@ -24,7 +25,7 @@ QtObject {
property int iconSize: 18
property QtObject text: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("ListForm_text", "j").color
property int pointSize: Units.dp * 9
property int width: 130
}

3
linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,7 +14,7 @@ QtObject {
}
property QtObject legend: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("FormHGroup_legend", "j").color
property int pointSize: Units.dp * 10
property int height: 36
property int width: 200

5
linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,12 +14,12 @@ QtObject {
property int spacing: 5
property QtObject separator: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("Form_header_separator", "i").color
property int height: 2
}
property QtObject title: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("Form_header_title", "i").color
property int pointSize: Units.dp * 12
}
}

3
linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -14,7 +15,7 @@ QtObject {
property int maxWidth: 400
property QtObject text: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Form_entry_text", "j").color
property int pointSize: Units.dp * 10
}
}

5
linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,13 +14,13 @@ QtObject {
}
property QtObject error: QtObject {
property color color: Colors.error.color
property color color: ColorsList.add("FormV_error", "error").color
property int pointSize: Units.dp * 10
property int height: 11
}
property QtObject legend: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("FormV_legend", "j").color
property int pointSize: Units.dp * 10
}
}

4
linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml
View file

@ -1,9 +1,9 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color shadowColor: Colors.l.color
property color shadowColor: ColorsList.add("SearchBox_shadow", "l").color
}

14
linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml
View file

@ -1,18 +1,18 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject background: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("Slider_background", "c").color
property int height: 4
property int radius: 2
property int width: 200
property QtObject content: QtObject {
property color color: Colors.m.color
property color color: ColorsList.add("Slider_content", "m").color
property int radius: 2
}
}
@ -24,14 +24,14 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color normal: Colors.c.color
property color pressed: Colors.c.color
property color normal: ColorsList.add("Slider_handle_border_normal", "c").color
property color pressed: ColorsList.add("Slider_handle_border_pressed", "c").color
}
}
property QtObject color: QtObject {
property color normal: Colors.e.color
property color pressed: Colors.f.color
property color normal: ColorsList.add("Slider_handle_normal", "e").color
property color pressed: ColorsList.add("Slider_handle_pressed", "f").color
}
}
}

53
linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml
View file

@ -1,5 +1,6 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject{
@ -14,16 +15,16 @@ QtObject{
property int width: 48
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: Colors.i.color
property color disabled: Colors.c.color
property color normal: Colors.c.color
property color checked: ColorsList.add("Switch_normal_indicator_border_checked", "i").color
property color disabled: ColorsList.add("Switch_normal_indicator_border_disabled", "c").color
property color normal: ColorsList.add("Switch_normal_indicator_border_normal", "c").color
}
}
property QtObject color: QtObject {
property color checked: Colors.i.color
property color disabled: Colors.e.color
property color normal: Colors.q.color
property color checked: ColorsList.add("Switch_normal_indicator_checked", "i").color
property color disabled: ColorsList.add("Switch_normal_indicator_disabled", "e").color
property color normal: ColorsList.add("Switch_normal_indicator_normal", "q").color
}
}
@ -32,17 +33,17 @@ QtObject{
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: Colors.i.color
property color disabled: Colors.c.color
property color normal: Colors.n.color
property color pressed: Colors.n.color
property color checked: ColorsList.add("Switch_normal_sphere_border_checked", "i").color
property color disabled: ColorsList.add("Switch_normal_sphere_border_disabled", "c").color
property color normal: ColorsList.add("Switch_normal_sphere_border_normal", "n").color
property color pressed: ColorsList.add("Switch_normal_sphere_border_pressed", "n").color
}
}
property QtObject color: QtObject {
property color pressed: Colors.c.color
property color disabled: Colors.e.color
property color normal: Colors.q.color
property color pressed: ColorsList.add("Switch_normal_sphere_pressed", "c").color
property color disabled: ColorsList.add("Switch_normal_sphere_disabled", "e").color
property color normal: ColorsList.add("Switch_normal_sphere_normal", "q").color
}
}
}
@ -57,16 +58,16 @@ QtObject{
property int width: 48
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: Colors.s.color
property color disabled: Colors.c.color
property color normal: Colors.c.color
property color checked: ColorsList.add("Switch_aux_indicator_border_checked", "s").color
property color disabled: ColorsList.add("Switch_aux_indicator_border_disabled", "c").color
property color normal: ColorsList.add("Switch_aux_indicator_border_normal", "c").color
}
}
property QtObject color: QtObject {
property color checked: Colors.s.color
property color disabled: Colors.e.color
property color normal: Colors.q.color
property color checked: ColorsList.add("Switch_aux_indicator_checked", "s").color
property color disabled: ColorsList.add("Switch_aux_indicator_disabled", "e").color
property color normal: ColorsList.add("Switch_aux_indicator_normal", "q").color
}
}
@ -75,17 +76,17 @@ QtObject{
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: Colors.s.color
property color disabled: Colors.c.color
property color normal: Colors.n.color
property color pressed: Colors.n.color
property color checked: ColorsList.add("Switch_aux_sphere_border_checked", "s").color
property color disabled: ColorsList.add("Switch_aux_sphere_border_disabled", "c").color
property color normal: ColorsList.add("Switch_aux_sphere_border_normal", "n").color
property color pressed: ColorsList.add("Switch_aux_sphere_border_pressed", "n").color
}
}
property QtObject color: QtObject {
property color pressed: Colors.c.color
property color disabled: Colors.e.color
property color normal: Colors.q.color
property color pressed: ColorsList.add("Switch_aux_sphere_pressed", "c").color
property color disabled: ColorsList.add("Switch_aux_sphere_disabled", "e").color
property color normal: ColorsList.add("Switch_aux_sphere_normal", "q").color
}
}
}

21
linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -9,11 +10,11 @@ QtObject {
property int spacing: 8
property QtObject backgroundColor: QtObject {
property color disabled: Colors.i30.color
property color hovered: Colors.b.color
property color normal: Colors.i.color
property color pressed: Colors.m.color
property color selected: Colors.k.color
property color disabled: ColorsList.add("TabButton_background_disabled", "i30").color
property color hovered: ColorsList.add("TabButton_background_hovered", "b").color
property color normal: ColorsList.add("TabButton_background_normal", "i").color
property color pressed: ColorsList.add("TabButton_background_pressed", "m").color
property color selected: ColorsList.add("TabButton_background_selected", "k").color
}
property QtObject icon: QtObject {
@ -27,11 +28,11 @@ QtObject {
property int rightPadding: 10
property QtObject color: QtObject {
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.q.color
property color pressed: Colors.q.color
property color selected: Colors.i.color
property color disabled: ColorsList.add("TabButton_text_disabled", "q").color
property color hovered: ColorsList.add("TabButton_text_hovered", "q").color
property color normal: ColorsList.add("TabButton_text_normal", "q").color
property color pressed: ColorsList.add("TabButton_text_pressed", "q").color
property color selected: ColorsList.add("TabButton_text_selected", "i").color
}
}
}

5
linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
View file

@ -1,10 +1,11 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("TabContainer", "k").color
property int bottomMargin: 30
property int leftMargin: 30
property int rightMargin: 40
@ -12,6 +13,6 @@ QtObject {
property QtObject separator: QtObject {
property int height: 2
property color color: Colors.f.color
property color color: ColorsList.add("TabContainer_separator", "f").color
}
}

9
linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
View file

@ -2,16 +2,17 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.f.color
property color backgroundColor: ColorsList.add("TabTransparentTextInput_background", "f").color
property int iconSize: 12
property int padding: 10
property QtObject placeholder: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("TabTransparentTextInput_palceholder", "n").color
property int pointSize: Units.dp * 10
}
@ -19,8 +20,8 @@ QtObject {
property int pointSize: Units.dp * 10
property QtObject color: QtObject {
property color focused: Colors.l.color
property color normal: Colors.d.color
property color focused: ColorsList.add("TabTransparentTextInput_text_focused", "l").color
property color normal: ColorsList.add("TabTransparentTextInput_text_normal", "d").color
}
}
}

14
linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
View file

@ -1,6 +1,8 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
@ -10,26 +12,26 @@ QtObject {
property QtObject high: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.o.color
property color enabled: Colors.n.color
property color disabled: ColorsList.add("VuMeter_background_disabled", "o").color
property color enabled: ColorsList.add("VuMeter_background_enabled", "n").color
}
}
property QtObject contentItem: QtObject {
property color color: Colors.b.color
property color color: ColorsList.add("VuMeter_contentItem", "b").color
}
}
property QtObject low: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.o.color
property color enabled: Colors.n.color
property color disabled: ColorsList.add("VuMeter_low_background_disabled", "o").color
property color enabled: ColorsList.add("VuMeter_low_background_enabled", "n").color
}
}
property QtObject contentItem: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("VuMeter_low_contentItem", "j").color
}
}
}

17
linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
View file

@ -2,12 +2,13 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property int spacing: 1
property color backgroundColor: Colors.n.color
property color backgroundColor: ColorsList.add("ApplicationMenu_background", "n").color
property QtObject entry: QtObject {
property int iconSize: 24
@ -16,14 +17,14 @@ QtObject {
property int spacing: 18
property QtObject color: QtObject {
property color hovered: Colors.h.color
property color normal: Colors.g.color
property color pressed: Colors.i.color
property color selected: Colors.j.color
property color hovered: ColorsList.add("ApplicationMenu_entry_hovered", "h").color
property color normal: ColorsList.add("ApplicationMenu_entry_normal", "g").color
property color pressed: ColorsList.add("ApplicationMenu_entry_pressed", "i").color
property color selected: ColorsList.add("ApplicationMenu_entry_selected", "j").color
}
property QtObject indicator: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("ApplicationMenu_entry_indicator", "i").color
property int width: 5
}
@ -31,8 +32,8 @@ QtObject {
property int pointSize: Units.dp * 10
property QtObject color: QtObject {
property color normal: Colors.q.color //q50
property color selected: Colors.q.color
property color normal: ColorsList.add("ApplicationMenu_entry_text_normal", "q").color
property color selected: ColorsList.add("ApplicationMenu_entry_text_selected", "q").color
}
}
}

9
linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,13 +14,13 @@ QtObject {
property int rightMargin: 8
property QtObject color: QtObject {
property color hovered: Colors.j.color
property color normal: Colors.g.color
property color pressed: Colors.i.color
property color hovered: ColorsList.add("DropDownMenu_entry_hovered", "j").color
property color normal: ColorsList.add("DropDownMenu_entry_normal", "g").color
property color pressed: ColorsList.add("DropDownMenu_entry_pressed", "i").color
}
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("DropDownMenu_entry_text", "q").color
property int pointSize: Units.dp * 9
}
}

57
linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml
View file

@ -3,6 +3,7 @@ import QtQml 2.2
import QtQuick 2.3
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -15,9 +16,9 @@ QtObject {
property int height: 30
property QtObject color: QtObject {
property color hovered: Colors.o.color
property color normal: Colors.q.color
property color pressed: Colors.o.color
property color hovered: ColorsList.add("MenuItem_normal_background_hovered", "o").color
property color normal: ColorsList.add("MenuItem_normal_background_normal", "q").color
property color pressed: ColorsList.add("MenuItem_normal_background_pressed", "o").color
}
}
@ -26,10 +27,10 @@ QtObject {
property int weight : Font.Bold
property QtObject color: QtObject {
property color hovered: Colors.j.color
property color normal: Colors.j.color
property color pressed: Colors.j.color
property color disabled: Colors.l50.color
property color hovered: ColorsList.add("MenuItem_normal_text_hovered", "j").color
property color normal: ColorsList.add("MenuItem_normal_text_normal", "j").color
property color pressed: ColorsList.add("MenuItem_normal_text_pressed", "j").color
property color disabled: ColorsList.add("MenuItem_normal_text_disabled", "l50").color
}
}
}
@ -41,9 +42,9 @@ QtObject {
property int height: 40
property QtObject color: QtObject {
property color hovered: Colors.v.color
property color normal: Colors.a.color
property color pressed: Colors.v.color
property color hovered: ColorsList.add("MenuItem_aux_background_hovered", "v").color
property color normal: ColorsList.add("MenuItem_aux_background_normal", "a").color
property color pressed: ColorsList.add("MenuItem_aux_background_pressed", "v").color
}
}
@ -52,10 +53,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: Colors.j.color
property color normal: Colors.j.color
property color pressed: Colors.j.color
property color disabled: Colors.l50.color
property color hovered: ColorsList.add("MenuItem_aux_text_hovered", "j").color
property color normal: ColorsList.add("MenuItem_aux_text_normal", "j").color
property color pressed: ColorsList.add("MenuItem_aux_text_pressed", "j").color
property color disabled: ColorsList.add("MenuItem_aux_text_disabled", "l50").color
}
}
}
@ -67,9 +68,9 @@ QtObject {
property int height: 40
property QtObject color: QtObject {
property color hovered: Colors.v.color
property color normal: Colors.a.color
property color pressed: Colors.v.color
property color hovered: ColorsList.add("MenuItem_auxRed_background_hovered", "v").color
property color normal: ColorsList.add("MenuItem_auxRed_background_normal", "a").color
property color pressed: ColorsList.add("MenuItem_auxRed_background_pressed", "v").color
}
}
@ -78,10 +79,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: Colors.error.color
property color normal: Colors.error.color
property color pressed: Colors.error.color
property color disabled: Colors.l50.color
property color hovered: ColorsList.add("MenuItem_auxRed_text_hovered", "error").color
property color normal: ColorsList.add("MenuItem_auxRed_text_normal", "error").color
property color pressed: ColorsList.add("MenuItem_auxRed_text_pressed", "error").color
property color disabled: ColorsList.add("MenuItem_auxRed_text_disabled", "l50").color
}
}
}
@ -93,9 +94,9 @@ QtObject {
property int height: 50
property QtObject color: QtObject {
property color hovered: Colors.w.color
property color normal: Colors.w.color
property color pressed: Colors.w.color
property color hovered: ColorsList.add("MenuItem_aux2_background_hovered", "w").color
property color normal: ColorsList.add("MenuItem_aux2_background_normal", "w").color
property color pressed: ColorsList.add("MenuItem_aux2_background_pressed", "v").color
}
}
@ -104,10 +105,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: Colors.m.color
property color normal: Colors.j.color
property color pressed: Colors.m.color
property color disabled: Colors.l50.color
property color hovered: ColorsList.add("MenuItem_aux2_text_hovered", "m").color
property color normal: ColorsList.add("MenuItem_aux2_text_normal", "j").color
property color pressed: ColorsList.add("MenuItem_aux2_text_pressed", "m").color
property color disabled: ColorsList.add("MenuItem_aux2_text_disabled", "l50").color
}
}
}

13
linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml
View file

@ -1,40 +1,41 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject normal : QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Menu_normal", "q").color
property int width: 130
property bool shadowEnabled: true
property int radius : 0
property QtObject border : QtObject {
property color color: Colors.u.color
property color color: "black"
property int width: 0
}
}
property QtObject aux : QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Menu_aux", "q").color
property int width: 200
property bool shadowEnabled: false
property int radius : 5
property QtObject border : QtObject {
property color color: Colors.u.color
property color color: ColorsList.add("Menu_aux_border", "u").color
property int width: 1
}
}
property QtObject aux2 : QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Menu_aux2", "q").color
property int width: 250
property bool shadowEnabled: false
property int radius : 0
property QtObject border : QtObject {
property color color: Colors.u.color
property color color: "black"
property int width: 0
}
}

9
linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject background : QtObject {
property color color: Colors.g20.color
property color color: ColorsList.add("ForceScrollBar_background", "g20").color
property int radius : 10
}
@ -16,8 +17,8 @@ QtObject {
}
property QtObject color: QtObject {
property color hovered: Colors.h.color
property color normal: Colors.g20.color
property color pressed: Colors.d.color
property color hovered: ColorsList.add("ForceScrollBar_hovered", "h").color
property color normal: ColorsList.add("ForceScrollBar_normal", "g20").color
property color pressed: ColorsList.add("ForceScrollBar_pressed", "d").color
}
}

7
linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml
View file

@ -1,6 +1,7 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
@ -10,9 +11,9 @@ QtObject {
property int width: 5
property QtObject color: QtObject {
property color hovered: Colors.h.color
property color normal: Colors.c.color
property color pressed: Colors.d.color
property color hovered: ColorsList.add("Paned_hovered", "h").color
property color normal: ColorsList.add("Paned_normal", "c").color
property color pressed: ColorsList.add("Paned_pressed", "d").color
}
}
}

5
linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml
View file

@ -1,14 +1,15 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.k.color
property color backgroundColor: ColorsList.add("Popup_background", "k").color
property QtObject shadow: QtObject {
property color color: Colors.l.color
property color color: ColorsList.add("Popup_shadow", "l").color
property int horizontalOffset: 2
property int radius: 10
property int samples: 15

5
linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml
View file

@ -2,12 +2,13 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.g.color
property color color: Colors.q.color
property color backgroundColor: ColorsList.add("Tooltip_background", "g").color
property color color: ColorsList.add("Tooltip", "q").color
property int arrowSize: 8
property int delay: 1000
property int pointSize: Units.dp * 9

3
linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject transientWindow: QtObject {
property color color: Colors.l80.color
property color color: ColorsList.add("Window_transient", "l80").color
}
}

5
linphone-app/ui/modules/Linphone/Chat/FileMessage.qml
View file

@ -9,6 +9,7 @@ import LinphoneEnums 1.0
import Linphone.Styles 1.0
import Utils 1.0
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -72,7 +73,7 @@ Row {
//property ContentModel contentModel : ($chatEntry.getContent(0) ? $chatEntry.getContent(0) : null)
property ContentModel contentModel : $chatEntry.fileContentModel
property string thumbnail : contentModel.thumbnail
property string thumbnail : contentModel ? contentModel.thumbnail : ''
color: isOutgoing
? ChatStyle.entry.message.outgoing.backgroundColor
: ChatStyle.entry.message.incoming.backgroundColor
@ -311,7 +312,7 @@ Row {
spacing:5
Text{
text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime)
color: Colors.ad.color
color: ColorsList.add("FileMessage_ephemeral_text", "ad").color
font.pointSize: Units.dp * 8
Timer{
running:parent.visible

4
linphone-app/ui/modules/Linphone/Chat/Message.qml
View file

@ -13,6 +13,8 @@ import Units 1.0
import UtilsCpp 1.0
import LinphoneEnums 1.0
import ColorsList 1.0
import 'Message.js' as Logic
// =============================================================================
@ -57,7 +59,7 @@ Item {
spacing:5
Text{
text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime)
color: Colors.ad.color
color: ColorsList.add("Message_ephemeral_text", "ad").color
font.pointSize: Units.dp * 8
Timer{
running:parent.visible

3
linphone-app/ui/modules/Linphone/Chat/Notice.qml
View file

@ -7,6 +7,7 @@ import Linphone.Styles 1.0
import Utils 1.0
import LinphoneEnums 1.0
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -84,7 +85,7 @@ RowLayout{
}
property bool isImportant: $chatEntry.eventLogType == LinphoneEnums.EventLogTypeConferenceTerminated
property bool isError: $chatEntry.status == ChatNoticeModel.NoticeError
property color eventColor : (isError ? Colors.error.color : ( isImportant ? Colors.error.color : Colors.ab.color ))
property color eventColor : (isError ? ColorsList.add("Notice_error", "error").color : ( isImportant ? ColorsList.add("Notice_important", "error").color : ColorsList.add("Notice", "ab").color ))
Layout.preferredHeight: ChatStyle.entry.lineHeight

5
linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -15,12 +16,12 @@ QtObject {
}
property QtObject sipAddress: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Account_sipAddress", "g").color
property int pointSize: Units.dp * 10
}
property QtObject username: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Account_username", "j").color
property int pointSize: Units.dp * 11
}
property QtObject messageCounter: QtObject {

5
linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -14,7 +15,7 @@ QtObject {
}
property QtObject description: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("CardBlock_description", "n").color
property int pointSize: Units.dp * 10
property int height: 40
}
@ -25,7 +26,7 @@ QtObject {
}
property QtObject title: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("CardBlock_title", "j").color
property int bottomMargin: 10
property int pointSize: Units.dp * 10
property int height: 20

3
linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -9,7 +10,7 @@ QtObject {
property int height: 60
property QtObject error: QtObject {
property color color: Colors.error.color
property color color: ColorsList.add("RequestBlock_error", "error").color
property int pointSize: Units.dp * 11
property int padding: 4
}

3
linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.e.color
property color color: ColorsList.add("CallControl", "e").color
property int height: 60
property int leftMargin: 12
property int rightMargin: 12

9
linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
View file

@ -2,11 +2,12 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.e.color
property color color: ColorsList.add("CallStats", "e").color
property int height: 280
property int leftMargin: 12
property int rightMargin: 12
@ -14,19 +15,19 @@ QtObject {
property int topMargin: 10
property QtObject title: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("CallStats_title", "d").color
property int bottomMargin: 20
property int pointSize: Units.dp * 16
}
property QtObject key: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("CallStats_key", "d").color
property int pointSize: Units.dp * 10
property int width: 200
}
property QtObject value: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("CallStats_value", "d").color
property int pointSize: Units.dp * 10
}
}

15
linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml
View file

@ -1,6 +1,7 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
@ -12,24 +13,24 @@ QtObject {
property int width: 200
property QtObject color: QtObject {
property color normal: Colors.e.color
property color selected: Colors.j.color
property color normal: ColorsList.add("Calls_entry_normal", "e").color
property color selected: ColorsList.add("Calls_entry_selected", "j").color
}
property QtObject endCallAnimation: QtObject {
property color blinkColor: Colors.i.color
property color blinkColor: ColorsList.add("Calls_entry_end_blink", "i").color
property int duration: 300
property int loops: 3
}
property QtObject sipAddressColor: QtObject {
property color normal: Colors.n.color
property color selected: Colors.q.color
property color normal: ColorsList.add("Calls_entry_sipAddress_normal", "n").color
property color selected: ColorsList.add("Calls_entry_sipAddress_selected", "q").color
}
property QtObject usernameColor: QtObject {
property color normal: Colors.j.color
property color selected: Colors.q.color
property color normal: ColorsList.add("Calls_entry_username_normal", "j").color
property color selected: ColorsList.add("Calls_entry_username_selected", "q").color
}
}
}

3
linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.e.color
property color color: ColorsList.add("ConferenceControls", "e").color
property int height: 60
property int leftMargin: 12
property int rightMargin: 12

31
linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file

@ -2,24 +2,25 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Chat", "q").color
property QtObject sectionHeading: QtObject {
property int padding: 5
property int bottomMargin: 20
property QtObject border: QtObject {
property color color: Colors.g10.color
property color color: ColorsList.add("Chat_section_border", "g10").color
property int width: 1
}
property QtObject text: QtObject {
property int pointSize: Units.dp * 10
property color color: Colors.ab.color
property color color: ColorsList.add("Chat_section_text", "ab").color
}
}
@ -27,13 +28,13 @@ QtObject {
property int height: 80
property QtObject border: QtObject {
property color color: Colors.f.color
property color color: ColorsList.add("Chat_send_border", "f").color
property int width: 1
}
}
property QtObject composingText: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("Chat_composing_text", "d").color
property int height: 25
property int leftPadding: 20
property int pointSize: Units.dp * 9
@ -50,7 +51,7 @@ QtObject {
property int iconSize: 18
property QtObject text: QtObject {
property color color: Colors.ac.color
property color color: ColorsList.add("Chat_entry_text", "ac").color
property int pointSize: Units.dp * 10
}
}
@ -79,11 +80,11 @@ QtObject {
property QtObject extension: QtObject {
property QtObject background: QtObject {
property color color: Colors.l50.color
property color color: ColorsList.add("Chat_file_extension_background", "l50").color
}
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Chat_file_extension_text", "q").color
}
}
@ -95,11 +96,11 @@ QtObject {
property int radius: 3
property QtObject background: QtObject {
property color color: Colors.f.color
property color color: ColorsList.add("Chat_file_statusbar_background", "f").color
}
property QtObject contentItem: QtObject {
property color color: Colors.p.color
property color color: ColorsList.add("Chat_file_statusbar_content", "p").color
}
}
}
@ -110,30 +111,30 @@ QtObject {
}
property QtObject incoming: QtObject {
property color backgroundColor: Colors.o.color
property color backgroundColor: ColorsList.add("Chat_incoming_background", "o").color
property int avatarSize: 20
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("Chat_incoming_text", "d").color
property int pointSize: Units.dp * 10
}
}
property QtObject outgoing: QtObject {
property color backgroundColor: Colors.e.color
property color backgroundColor: ColorsList.add("Chat_outgoing_background", "e").color
property int areaSize: 16
property int busyIndicatorSize: 16
property int sendIconSize: 12
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("Chat_outgoing_text", "d").color
property int pointSize: Units.dp * 10
}
}
}
property QtObject time: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("Chat_time", "d").color
property int pointSize: Units.dp * 10
property int width: 44
}

9
linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -13,8 +14,8 @@ QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color normal: Colors.a.color
property color hovered: Colors.o.color
property color normal: ColorsList.add("Codecs_normal", "a").color
property color hovered: ColorsList.add("Codecs_hovered", "o").color
}
}
@ -23,7 +24,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Codecs_text", "j").color
property int pointSize: Units.dp * 10
}
}
@ -38,7 +39,7 @@ QtObject {
}
property QtObject legend: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Codecs_legend", "j").color
property int pointSize: Units.dp * 10
property int height: 50
}

5
linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file

@ -2,14 +2,15 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.d.color
property color backgroundColor: ColorsList.add("Avatar_background", "d").color
property QtObject initials: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Avatar_initials", "q").color
property int pointSize: Units.dp * 10
property int ratio: 30
}

7
linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
View file

@ -3,22 +3,23 @@ import QtQml 2.2
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject sipAddress: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("ContactDescription_sipAddress", "n").color
property int pointSize: Units.dp * 10
property int weight: Font.Normal
}
property QtObject username: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("ContactDescription_username", "j").color
property int pointSize: Units.dp * 11
property int weight: Font.Bold
property QtObject status : QtObject{
property color color : Colors.g.color
property color color : ColorsList.add("ContactDescription_status", "g").color
property int pointSize : Units.dp * 9
}
}

9
linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -17,19 +18,19 @@ QtObject {
property int radius: 6
property QtObject background: QtObject {
property color color: Colors.f.color
property color color: ColorsList.add("OnlineInstallerDialog_bar_background", "f").color
}
property QtObject contentItem: QtObject {
property QtObject color: QtObject {
property color failed: Colors.error.color
property color normal: Colors.p.color
property color failed: ColorsList.add("OnlineInstallerDialog_bar_content_failed", "error").color
property color normal: ColorsList.add("OnlineInstallerDialog_bar_content_normal", "p").color
}
}
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("OnlineInstallerDialog_text", "d").color
property int pointSize: Units.dp * 11
}
}

11
linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml
View file

@ -2,24 +2,25 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("History", "q").color
property QtObject sectionHeading: QtObject {
property int padding: 5
property int bottomMargin: 20
property QtObject border: QtObject {
property color color: Colors.g10.color
property color color: ColorsList.add("History_section_border", "g10").color
property int width: 1
}
property QtObject text: QtObject {
property int pointSize: Units.dp * 10
property color color: Colors.g.color
property color color: ColorsList.add("History_section_text", "g").color
}
}
@ -35,7 +36,7 @@ QtObject {
property int iconSize: 18
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("History_event_text", "d").color
property int pointSize: Units.dp * 10
}
}
@ -52,7 +53,7 @@ QtObject {
}
property QtObject time: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("History_time", "d").color
property int pointSize: Units.dp * 10
property int width: 44
}

10
linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml
View file

@ -3,6 +3,8 @@ import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -16,13 +18,13 @@ QtObject {
property int width: 300
property QtObject color: QtObject {
property color hovered: Colors.j.color
property color normal: Colors.g.color
property color pressed: Colors.i.color
property color hovered: ColorsList.add("SipAddressView_entry_hovered", "j").color
property color normal: ColorsList.add("SipAddressView_entry_normal", "g").color
property color pressed: ColorsList.add("SipAddressView_entry_pressed", "i").color
}
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("SipAddressView_entry_text", "q").color
property int pointSize: Units.dp * 10
}
}

4
linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml
View file

@ -3,6 +3,8 @@ import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -12,7 +14,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("MessageCounter_text", "q").color
property int pointSize: Units.dp * 6
}
}

3
linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -11,7 +12,7 @@ QtObject {
property int overrodeHeight: 55
property QtObject message: QtObject {
property color color: Colors.h.color
property color color: ColorsList.add("Notification_basic_message", "h").color
property int pointSize: Units.dp * 10
}
}

7
linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml
View file

@ -2,23 +2,24 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("NorificationReceived_file", "k").color
property int leftMargin: 25
property int overrodeHeight: 55
property int rightMargin: 15
property int spacing: 10
property QtObject fileName: QtObject {
property color color: Colors.h.color
property color color: ColorsList.add("NorificationReceived_file_name", "h").color
property int pointSize: Units.dp * 10
}
property QtObject fileSize: QtObject {
property color color: Colors.h.color
property color color: ColorsList.add("NorificationReceived_file_size", "h").color
property int pointSize: Units.dp * 9
property int width: 100
}

7
linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
View file

@ -2,11 +2,12 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("NorificationReceived_message", "k").color
property int bottomMargin: 15
property int leftMargin: 15
property int overrodeHeight: 55
@ -14,12 +15,12 @@ QtObject {
property int spacing: 0
property QtObject messageContainer: QtObject {
property color color: Colors.o.color
property color color: ColorsList.add("NorificationReceived_message_container", "o").color
property int radius: 6
property int margins: 10
property QtObject text: QtObject {
property color color: Colors.l.color
property color color: ColorsList.add("NorificationReceived_message_container_text", "l").color
property int pointSize: Units.dp * 9
}
}

6
linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml
View file

@ -1,16 +1,18 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("Norification", "k").color
property int height: 120
property int iconSize: 40
property int width: 300
property QtObject border: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("Norification_border", "n").color
property int width: 1
}
}

14
linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml
View file

@ -2,7 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -10,19 +10,19 @@ QtObject {
property int height: 180
property int rowSpacing: 0
property int width: 180
property color color: Colors.k.color
property color selectedColor : Colors.m.color
property color color: ColorsList.add("TelKeypad", "k").color
property color selectedColor : ColorsList.add("TelKeypad_selected", "m").color
property int selectedBorderWidth: 2
property real radius : 5.0
property QtObject button: QtObject {
property QtObject color: QtObject {
property color normal: Colors.q.color
property color pressed: Colors.i.color
property color normal: ColorsList.add("TelKeypad_button_normal", "q").color
property color pressed: ColorsList.add("TelKeypad_button_pressed", "i").color
}
property QtObject line: QtObject {
property color color: Colors.l50.color
property color color: ColorsList.add("TelKeypad_button_line", "l50").color
property int bottomMargin: 4
property int height: 2
property int leftMargin: 8
@ -31,7 +31,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("TelKeypad_button_text", "d").color
property int pointSize: Units.dp * 11
}
}

23
linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
View file

@ -2,42 +2,43 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Timeline_background", "q").color
property QtObject contact: QtObject {
property int height: 60
property QtObject backgroundColor: QtObject {
property color a: Colors.g10.color
property color b: Colors.a.color
property color selected: Colors.i.color
property color a: ColorsList.add("Timeline_contact_background_a", "g10").color
property color b: ColorsList.add("Timeline_contact_background_b", "a").color
property color selected: ColorsList.add("Timeline_contact_background_selected", "i").color
}
property QtObject sipAddress: QtObject {
property QtObject color: QtObject {
property color normal: Colors.n.color
property color selected: Colors.q.color
property color normal: ColorsList.add("Timeline_contact_sipAddress_normal", "n").color
property color selected: ColorsList.add("Timeline_contact_sipAddress_selected", "q").color
}
}
property QtObject username: QtObject {
property QtObject color: QtObject {
property color normal: Colors.j.color
property color selected: Colors.q.color
property color normal: ColorsList.add("Timeline_contact_username_normal", "j").color
property color selected: ColorsList.add("Timeline_contact_username_selected", "q").color
}
}
}
property QtObject legend: QtObject {
property QtObject backgroundColor: QtObject {
property color normal: Colors.f.color
property color hovered: Colors.c.color
property color normal: ColorsList.add("Timeline_contact_legend_background_normal", "f").color
property color hovered: ColorsList.add("Timeline_contact_legend_background_hovered", "c").color
}
property color color: Colors.d.color
property color color: ColorsList.add("Timeline_contact_legend", "d").color
property int pointSize: Units.dp * 10
property int height: 30
property int iconSize: 14

3
linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -9,7 +10,7 @@ QtObject {
property QtObject entry: QtObject {
property QtObject status: QtObject {
property color color : Colors.g.color
property color color : ColorsList.add("Participants_entry_status", "g").color
property int pointSize : Units.dp * 8
}
}

17
linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -12,17 +13,17 @@ QtObject {
property int rightMargin: 10
property QtObject color: QtObject {
property color hovered: Colors.o.color
property color normal: Colors.q.color
property color hovered: ColorsList.add("SipAddressesView_entry_hovered", "o").color
property color normal: ColorsList.add("SipAddressesView_entry_normal", "q").color
}
property QtObject indicator: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("SipAddressesView_entry_indicator", "i").color
property int width: 5
}
property QtObject separator: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("SipAddressesView_entry_separator", "c").color
property int height: 1
}
}
@ -37,16 +38,16 @@ QtObject {
}
property QtObject color: QtObject {
property color normal: Colors.j.color
property color pressed: Colors.i.color
property color normal: ColorsList.add("SipAddressesView_header_normal", "j").color
property color pressed: ColorsList.add("SipAddressesView_header_pressed", "i").color
}
property QtObject text: QtObject {
property int pointSize: Units.dp * 9
property QtObject color: QtObject {
property color normal: Colors.q.color
property color pressed: Colors.q.color
property color normal: ColorsList.add("SipAddressesView_header_text_normal", "q").color
property color pressed: ColorsList.add("SipAddressesView_header_text_pressed", "q").color
}
}
}

6
linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Controls 2.5
import Common 1.0
import Linphone 1.0
import Linphone.Styles 1.0
import ColorsList 1.0
import 'Timeline.js' as Logic
@ -117,7 +118,7 @@ Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: filterChoices.height
Layout.alignment: Qt.AlignCenter
border.color: Colors.border.color
border.color: ColorsList.add("Timeline_filter_border", "border").color
border.width: 2
visible:false
@ -181,10 +182,9 @@ Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 40
Layout.alignment: Qt.AlignCenter
border.color: Colors.border.color
border.color: ColorsList.add("Timeline_search_border", "border").color
border.width: 2
visible:false
//color: ContactsStyle.bar.backgroundColor
onVisibleChanged: if(visible){
timeline.model.filterText = searchBar.text
searchBar.forceActiveFocus()

8
linphone-app/ui/views/App/Main/Conversation.qml
View file

@ -11,6 +11,8 @@ import App.Styles 1.0
import Common.Styles 1.0
import Units 1.0
import ColorsList 1.0
import 'Conversation.js' as Logic
@ -117,7 +119,7 @@ ColumnLayout {
//: 'Admin' : Admin(istrator)
//~ Context One word title for describing the current admin status
text: qsTr('adminStatus')
color: Colors.af.color
color: ColorsList.add("Conversation_admin_status", "af").color
font.pointSize: Units.dp * 8
}
}
@ -336,7 +338,7 @@ ColumnLayout {
id: separator1
height:1
width:parent.width
color:Colors.u.color
color: ColorsList.add("Conversation_menu_separator", "u").color
visible: groupInfoMenu.visible && devicesMenuItem.visible
}
MenuItem{
@ -357,7 +359,7 @@ ColumnLayout {
id: separator2
height:1
width:parent.width
color:Colors.u.color
color: ColorsList.add("Conversation_menu_separator", "u").color
visible: ephemeralMenuItem.visible && (groupInfoMenu.visible || devicesMenuItem.visible)
}
MenuItem{

15
linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml
View file

@ -10,6 +10,7 @@ import App.Styles 1.0
import Common.Styles 1.0
import Units 1.0
import UtilsCpp 1.0
import ColorsList 1.0
// =============================================================================
@ -94,7 +95,7 @@ DialogPlus {
Layout.fillWidth: true
//: 'Would you like to encrypt your chat?' : Ask about setting the chat room as secured.
text:qsTr('askEncryption')
color: Colors.g.color
color: ColorsList.add("NewChatRoom_ask_encryption", "g").color
font.pointSize: Units.dp * 11
font.weight: Font.DemiBold
}
@ -153,7 +154,7 @@ DialogPlus {
textFormat: Text.RichText
//: 'Subject' : Label of a text field about the subject of the chat room
text :qsTr('subjectLabel') +'<span style="color:red">*</span>'
color: Colors.g.color
color: ColorsList.add("NewChatRoom_subject_title", "g").color
font.pointSize: Units.dp * 11
font.weight: Font.DemiBold
}
@ -183,7 +184,7 @@ DialogPlus {
Text{
//: 'Last contacts' : Header for showing last contacts
text : qsTr('LastContactsTitle')
color: Colors.g.color
color: ColorsList.add("NewChatRoom_recent_contact_title", "g").color
font.pointSize: Units.dp * 11
font.weight: Font.DemiBold
}
@ -231,7 +232,7 @@ DialogPlus {
font.weight: Font.DemiBold
lineHeight: 0.8
color: Colors.g.color
color: ColorsList.add("NewChatRoom_recent_contact_username", "g").color
font.pointSize: Units.dp * 9
clip:false
}
@ -282,7 +283,7 @@ DialogPlus {
Layout.fillHeight: true
Layout.fillWidth: true
border.width: 1
border.color: Colors.l.color
border.color: ColorsList.add("NewChatRoom_addresses_border", "l").color
ColumnLayout {
anchors.fill: parent
@ -339,7 +340,7 @@ DialogPlus {
//~ one word for admin status
text : qsTr('adminStatus')
color: Colors.g.color
color: ColorsList.add("NewChatRoom_addresses_admin", "g").color
font.pointSize: Units.dp * 11
font.weight: Font.Light
visible: participantView.count > 0
@ -401,7 +402,7 @@ DialogPlus {
//: 'Required' : Word relative to a star to explain that it is a requirement (Field form)
text : '<span style="color:red">*</span> '+qsTr('requiredField')
//font.weight: Font.DemiBold
color: Colors.g.color
color: ColorsList.add("NewChatRoom_requiered_text", "g").color
font.pointSize: Units.dp * 8
}
}

7
linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
View file

@ -9,6 +9,7 @@ import LinphoneEnums 1.0
import App.Styles 1.0
import Units 1.0
import ColorsList 1.0
import '../Conversation.js' as Logic
@ -121,7 +122,7 @@ DialogPlus {
}
}
Rectangle {
color: Colors.ag.color
color: ColorsList.add("ParticipantDevices_separator", "ag").color
Layout.preferredHeight: 1
Layout.fillWidth: true
}
@ -147,7 +148,7 @@ DialogPlus {
width:parent.width
height:50
color: Colors.ah.color
color: ColorsList.add("ParticipantDevices_line_background", "ah").color
RowLayout{
anchors.fill:parent
Text{
@ -188,7 +189,7 @@ DialogPlus {
}
}
Rectangle {
color: Colors.ag.color
color: ColorsList.add("ParticipantDevices_separator", "ag").color
anchors.left : parent.left
anchors.right :parent.right
anchors.bottom: parent.bottom

5
linphone-app/ui/views/App/Settings/SettingsAudio.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.10
import Common 1.0
import Linphone 1.0
import Utils 1.0
import ColorsList 1.0
import App.Styles 1.0
@ -141,12 +142,12 @@ TabContainer {
width: audioTestSlider.availableWidth
height: implicitHeight
radius: 2
color: Colors.slider_background.color
color: ColorsList.add("SettingsAudio_slider_background", "slider_background").color
Rectangle {
width: audioTestSlider.visualPosition * parent.width
height: parent.height
color: audioTestSlider.value > 0.8 ? Colors.slider_high.color : Colors.slider_low.color
color: audioTestSlider.value > 0.8 ? ColorsList.add("SettingsAudio_slider_high", "slider_high").color : ColorsList.add("SettingsAudio_slider_low", "slider_low").color
radius: 2
}
}

19
linphone-app/ui/views/App/Styles/Calls/CallStyle.qml
View file

@ -2,11 +2,12 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.f.color
property color backgroundColor: ColorsList.add("Call_background", "f").color
property QtObject actionArea: QtObject {
property int height: 100
@ -27,7 +28,7 @@ QtObject {
}
property QtObject callError: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("Call_action_error", "i").color
property int pointSize: Units.dp * 12
}
}
@ -36,15 +37,15 @@ QtObject {
property int margins: 15
property QtObject avatar: QtObject {
property color backgroundColor: Colors.n.color
property color backgroundColor: ColorsList.add("Call_container_avatar_background", "n").color
property int maxSize: 300
}
property QtObject pause: QtObject {
property color color: Colors.g90.color
property color color: ColorsList.add("Call_container_pause", "g90").color
property QtObject text: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("Call_container_pause_text", "q").color
property int pointSizeFactor: 10
}
}
@ -59,7 +60,7 @@ QtObject {
property int topMargin: 26
property QtObject busyIndicator: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Call_header_busy", "g").color
property int height: 30
property int width: 30
}
@ -70,7 +71,7 @@ QtObject {
}
property QtObject elapsedTime: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Call_header_elapsed_time", "j").color
property int pointSize: Units.dp * 10
property QtObject fullscreen: QtObject {
@ -91,8 +92,8 @@ QtObject {
}
property QtObject text: QtObject {
property color colorA: Colors.j.color
property color colorB: Colors.i.color
property color colorA: ColorsList.add("Call_zrtp_text_a", "j").color
property color colorB: ColorsList.add("Call_zrtp_text_b", "i").color
property int pointSize: Units.dp * 10
property int wordsSpacing: 5
}

8
linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml
View file

@ -1,6 +1,6 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
@ -13,14 +13,14 @@ QtObject {
}
property QtObject callsList: QtObject {
property color color: Colors.q.color
property color color: ColorsList.add("CallsWindow_list_background", "q").color
property int defaultWidth: 250
property int maximumWidth: 250
property int minimumWidth: 110
property QtObject header: QtObject {
property color color1: Colors.q.color
property color color2: Colors.f.color
property color color1: ColorsList.add("CallsWindow_list_header_a", "q").color
property color color2: ColorsList.add("CallsWindow_list_header_b", "f").color
property int height: 60
property int iconSize: 40
property int leftMargin: 10

3
linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml
View file

@ -2,12 +2,13 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject description: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Conference_description", "j").color
property int pointSize: Units.dp * 12
property int height: 60
property int width: 150

3
linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml
View file

@ -1,6 +1,7 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
@ -14,7 +15,7 @@ QtObject {
}
property QtObject separator: QtObject {
property color color: Colors.c.color
property color color: ColorsList.add("ConferenceManager_separator", "c").color
property int leftMargin: 25
property int rightMargin: 25
property int width: 1

3
linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -9,7 +10,7 @@ QtObject {
property int spacing: 20
property QtObject activationSteps: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("ActivateApp_email_steps", "g").color
property int pointSize: Units.dp * 10
}
}

3
linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -9,7 +10,7 @@ QtObject {
property int spacing: 20
property QtObject activationSteps: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("ActivateApp_phone_steps", "g").color
property int pointSize: Units.dp * 10
}
}

5
linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -19,12 +20,12 @@ QtObject {
property int spacing: 20
property QtObject description: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Assistant_info_description", "g").color
property int pointSize: Units.dp * 11
}
property QtObject title: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Assistant_info_title", "g").color
property int pointSize: Units.dp * 11
}
}

5
linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -11,13 +12,13 @@ QtObject {
property int iconSize: 150
property QtObject description: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Assistant_home_description", "g").color
property int pointSize: Units.dp * 10
property int height: 40
}
property QtObject title: QtObject {
property color color: Colors.g.color
property color color: ColorsList.add("Assistant_home_title", "g").color
property int pointSize: Units.dp * 11
property int height: 40
}

4
linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml
View file

@ -1,10 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("Assistant", "k").color
property int bottomMargin: 35
property int leftMargin: 90
property int rightMargin: 90

9
linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -12,7 +13,7 @@ QtObject {
}
property QtObject bar: QtObject {
property color color: Colors.e.color
property color color: ColorsList.add("ContactEdit_bar", "e").color
property int avatarSize: 60
property int height: 80
property int leftMargin: 40
@ -41,13 +42,13 @@ QtObject {
}
property QtObject username: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("ContactEdit_username", "j").color
property int pointSize: Units.dp * 13
}
}
property QtObject content: QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("ContactEdit_content", "k").color
}
property QtObject values: QtObject {
@ -57,7 +58,7 @@ QtObject {
property int topMargin: 20
property QtObject separator: QtObject {
property color color: Colors.f.color
property color color: ColorsList.add("ContactEdit_separator", "f").color
property int height: 1
}
}

17
linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml
View file

@ -2,15 +2,16 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.k.color
property color backgroundColor: ColorsList.add("Contacts_background", "k").color
property int spacing: 20
property QtObject bar: QtObject {
property color backgroundColor: Colors.e.color
property color backgroundColor: ColorsList.add("Contacts_bar_background", "e").color
property int height: 60
property int leftMargin: 18
property int rightMargin: 18
@ -27,27 +28,27 @@ QtObject {
property int spacing: 15
property QtObject backgroundColor: QtObject {
property color normal: Colors.k.color
property color hovered: Colors.g10.color
property color normal: ColorsList.add("Contacts_contact_background_normal", "k").color
property color hovered: ColorsList.add("Contacts_contact_background_hovered", "g10").color
}
property QtObject border: QtObject {
property color color: Colors.f.color
property color color: ColorsList.add("Contacts_contact_border", "f").color
property int width: 1
}
property QtObject indicator: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("Contacts_contact_indicator", "i").color
property int width: 5
}
property QtObject presence: QtObject {
property int pointSize: Units.dp * 10
property color color: Colors.n.color
property color color: ColorsList.add("Contacts_contact_presence", "n").color
}
property QtObject username: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Contacts_contact_username", "j").color
property int pointSize: Units.dp * 10
property int width: 220
}

13
linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml
View file

@ -3,12 +3,13 @@ import QtQml 2.2
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject bar: QtObject {
property color backgroundColor: Colors.e.color
property color backgroundColor: ColorsList.add("Conversation_bar_background", "e").color
property int avatarSize: 60
property int groupChatSize: 55
property int height: 80
@ -34,17 +35,17 @@ QtObject {
property QtObject contactDescription : QtObject {
property QtObject sipAddress: QtObject {
property color color: Colors.n.color
property color color: ColorsList.add("Conversation_description_sipAddress", "n").color
property int pointSize: Units.dp * 10
property int weight: Font.Light
}
property QtObject username: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("Conversation_description_username", "j").color
property int pointSize: Units.dp * 11
property int weight: Font.Normal
property QtObject status : QtObject{
property color color : Colors.g.color
property color color : ColorsList.add("Conversation_description_username_status", "g").color
property int pointSize : Units.dp * 9
}
}
@ -52,12 +53,12 @@ QtObject {
}
property QtObject filters: QtObject {
property color backgroundColor: Colors.q.color
property color backgroundColor: ColorsList.add("Conversation_filters_background", "q").color
property int height: 51
property int leftMargin: 40
property QtObject border: QtObject {
property color color: Colors.g10.color
property color color: ColorsList.add("Conversation_filters_border", "g10").color
property int bottomWidth: 1
property int topWidth: 0
}

9
linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml
View file

@ -1,6 +1,7 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
import Units 1.0
// =============================================================================
@ -14,12 +15,12 @@ QtObject {
property int spacing: 10
property QtObject license: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("About_license", "d").color
property int pointSize: Units.dp * 10
}
property QtObject url: QtObject {
property color color: Colors.i.color
property color color: ColorsList.add("About_url", "i").color
property int pointSize: Units.dp * 10
}
}
@ -29,12 +30,12 @@ QtObject {
property int spacing: 10
property QtObject appVersion: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("About_appVersion", "d").color
property int pointSize: Units.dp * 10
}
property QtObject coreVersion: QtObject {
property color color: Colors.d.color
property color color: ColorsList.add("About_coreVersion", "d").color
property int pointSize: Units.dp * 10
}
}

4
linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml
View file

@ -3,6 +3,7 @@ import QtQml 2.2
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -22,10 +23,11 @@ QtObject {
property int preferredWidth: 50
}
property QtObject descriptionText: QtObject {
property int preferredWidth: 200
property int leftMargin: 10
property int rightMargin: 10
property real pointSize: Units.dp * 11
property color color: Colors.d.color
property color color: ColorsList.add("Ephemeral_popup_description", "d").color
}
property QtObject timerPicker: QtObject {
property int preferredWidth: 150

29
linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml
View file

@ -3,6 +3,7 @@ import QtQml 2.2
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -22,11 +23,11 @@ QtObject {
property QtObject results : QtObject{
property int topMargin : 10
property color color : Colors.g.color
property color color : ColorsList.add("InfoChatRoom_results", "g").color
property QtObject title : QtObject{
property int topMargin: 10
property int leftMargin: 20
property color color: Colors.j.color
property color color: ColorsList.add("InfoChatRoom_results_title", "j").color
property int pointSize : Units.dp * 11
property int weight : Font.DemiBold
}
@ -42,23 +43,23 @@ QtObject {
property QtObject leaveButton :
QtObject {
property QtObject backgroundColor: QtObject {
property color disabled: Colors.o.color
property color hovered: Colors.j.color
property color normal: Colors.k.color
property color pressed: Colors.i.color
property color disabled: ColorsList.add("InfoChatRoom_leave_background_disabled", "o").color
property color hovered: ColorsList.add("InfoChatRoom_leave_background_hovered", "j").color
property color normal: ColorsList.add("InfoChatRoom_leave_background_normal", "k").color
property color pressed: ColorsList.add("InfoChatRoom_leave_background_pressed", "i").color
}
property QtObject textColor: QtObject {
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.i.color
property color pressed: Colors.q.color
property color disabled: ColorsList.add("InfoChatRoom_leave_text_disabled", "q").color
property color hovered: ColorsList.add("InfoChatRoom_leave_text_hovered", "q").color
property color normal: ColorsList.add("InfoChatRoom_leave_text_normal", "i").color
property color pressed: ColorsList.add("InfoChatRoom_leave_text_pressed", "q").color
}
property QtObject borderColor : QtObject{
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.i.color
property color pressed: Colors.q.color
property color disabled: ColorsList.add("InfoChatRoom_leave_border_disabled", "q").color
property color hovered: ColorsList.add("InfoChatRoom_leave_border_hovered", "q").color
property color normal: ColorsList.add("InfoChatRoom_leave_border_normal", "i").color
property color pressed: ColorsList.add("InfoChatRoom_leave_border_pressed", "q").color
}
}
}

19
linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml
View file

@ -3,6 +3,7 @@ import QtQml 2.2
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -20,17 +21,17 @@ QtObject {
property QtObject okButton : QtObject{
property QtObject backgroundColor: QtObject {
property color disabled: Colors.i30.color
property color hovered: Colors.b.color
property color normal: Colors.s.color
property color pressed: Colors.m.color
property color disabled: ColorsList.add("InfoEncryption_ok_background_disabled", "i30").color
property color hovered: ColorsList.add("InfoEncryption_ok_background_hovered", "b").color
property color normal: ColorsList.add("InfoEncryption_ok_background_normal", "s").color
property color pressed: ColorsList.add("InfoEncryption_ok_background_pressed", "m").color
}
property QtObject textColor: QtObject {
property color disabled: Colors.q.color
property color hovered: Colors.q.color
property color normal: Colors.q.color
property color pressed: Colors.q.color
property color disabled: ColorsList.add("InfoEncryption_ok_text_disabled", "q").color
property color hovered: ColorsList.add("InfoEncryption_ok_text_hovered", "q").color
property color normal: ColorsList.add("InfoEncryption_ok_text_normal", "q").color
property color pressed: ColorsList.add("InfoEncryption_ok_text_pressed", "q").color
}
}
@ -44,6 +45,6 @@ QtObject {
property int leftMargin: 10
property int rightMargin: 10
property real pointSize: Units.dp * 11
property color color: Colors.d.color
property color color: ColorsList.add("InfoEncryption_description", "d").color
}
}

12
linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml
View file

@ -1,12 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property QtObject bar: QtObject {
property color backgroundColor: Colors.e.color
property color backgroundColor: ColorsList.add("HistoryView_bar_background", "e").color
property int avatarSize: 60
property int height: 80
property int leftMargin: 40
@ -30,18 +30,18 @@ QtObject {
}
property QtObject description: QtObject {
property color sipAddressColor: Colors.g.color
property color usernameColor: Colors.j.color
property color sipAddressColor: ColorsList.add("HistoryView_bar_description_sipAddress", "g").color
property color usernameColor: ColorsList.add("HistoryView_bar_description_username", "j").color
}
}
property QtObject filters: QtObject {
property color backgroundColor: Colors.q.color
property color backgroundColor: ColorsList.add("HistoryView_filters_background", "q").color
property int height: 51
property int leftMargin: 40
property QtObject border: QtObject {
property color color: Colors.g10.color
property color color: ColorsList.add("HistoryView_filters_border", "g10").color
property int bottomWidth: 1
property int topWidth: 0
}

4
linphone-app/ui/views/App/Styles/Main/HomeStyle.qml
View file

@ -1,10 +1,10 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("Home_background", "k").color
property int spacing: 20
}

3
linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("InviteFriends_background", "k").color
property int width: 400
property QtObject message: QtObject {

5
linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQuick 2.7
import Units 1.0
import ColorsList 1.0
// =============================================================================
@ -24,7 +25,7 @@ QtObject {
property QtObject text: QtObject {
property int pointSize: Units.dp * 8
property color color: Colors.i.color
property color color: ColorsList.add("MainWindow_auto_answer_text", "i").color
}
}
@ -44,7 +45,7 @@ QtObject {
property int spacing: 16
property var background: Rectangle {
color: Colors.f.color
color: ColorsList.add("MainWindow_toolbar_background", "f").color
}
}
}

5
linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml
View file

@ -2,6 +2,7 @@ pragma Singleton
import QtQml 2.2
import Units 1.0
import ColorsList 1.0
// =============================================================================
QtObject {
@ -10,10 +11,10 @@ QtObject {
}
property QtObject error: QtObject {
property color color: Colors.error.color
property color color: ColorsList.add("SettingsAdvanced_error", "error").color
}
property QtObject info: QtObject {
property color color: Colors.j.color
property color color: ColorsList.add("SettingsAdvanced_info", "j").color
property int pointSize: Units.dp * 11
}
property QtObject lists: QtObject {

3
linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml
View file

@ -1,11 +1,12 @@
pragma Singleton
import QtQml 2.2
import ColorsList 1.0
// =============================================================================
QtObject {
property color color: Colors.k.color
property color color: ColorsList.add("Settings_background", "k").color
property int height: 640
property int width: 1024