From dc2703ed994af98eee3d5fe4e180e686a7b0ff9e Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 17 Jan 2019 18:02:31 -0500
Subject: [PATCH] ui: cleanup css, smartlist margin fixes, settings overhaul
Change-Id: Iec0f4e8e8f2739059fc0cfa42e4eb5e18f46cecd
---
accountitemdelegate.cpp | 5 +-
advancedsettingswidget.ui | 20 +-
bezierconnectorwidget.cpp | 4 +-
callwidget.ui | 4 +-
conversationitemdelegate.cpp | 18 +-
currentaccountcombobox.cpp | 19 +-
currentaccountcombobox.h | 3 +-
deleteaccountdialog.cpp | 2 +
deleteaccountdialog.ui | 33 +-
invitebuttonswidget.ui | 247 ++--
passworddialog.ui | 2 +-
regnamedialog.ui | 2 +-
ringthemeutils.h | 4 +-
setavatardialog.ui | 2 +-
settingsitemwidget.cpp | 3 +-
settingswidget.cpp | 57 +-
settingswidget.ui | 2210 +++++++++++++++++-----------------
stylesheet.css | 122 +-
18 files changed, 1385 insertions(+), 1372 deletions(-)
diff --git a/accountitemdelegate.cpp b/accountitemdelegate.cpp
index 015e35f..da4bd9c 100644
--- a/accountitemdelegate.cpp
+++ b/accountitemdelegate.cpp
@@ -52,14 +52,17 @@ AccountItemDelegate::paint(QPainter* painter,
QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, opt.widget);
+ QColor presenceBorderColor = Qt::white;
bool selected = false;
if (option.state & QStyle::State_Selected) {
selected = true;
opt.state ^= QStyle::State_Selected;
painter->fillRect(option.rect, RingTheme::smartlistSelection_);
+ presenceBorderColor = RingTheme::smartlistSelection_;
}
else if (option.state & QStyle::State_MouseOver) {
painter->fillRect(option.rect, RingTheme::smartlistHighlight_);
+ presenceBorderColor = RingTheme::smartlistHighlight_;
}
QRect &rect = opt.rect;
@@ -113,7 +116,7 @@ AccountItemDelegate::paint(QPainter* painter,
qreal outerCRadius = avatarSize_ / 6, innerCRadius = outerCRadius * 0.75;
outerCircle.addEllipse(center, outerCRadius, outerCRadius);
innerCircle.addEllipse(center, innerCRadius, innerCRadius);
- painter->fillPath(outerCircle, Qt::white);
+ painter->fillPath(outerCircle, presenceBorderColor);
painter->fillPath(innerCircle, RingTheme::presenceGreen_);
}
diff --git a/advancedsettingswidget.ui b/advancedsettingswidget.ui
index 38bc793..e1686da 100644
--- a/advancedsettingswidget.ui
+++ b/advancedsettingswidget.ui
@@ -14,7 +14,7 @@
<string>Form</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -121,7 +121,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
</item>
@@ -540,7 +540,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
</item>
@@ -588,7 +588,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
</item>
@@ -636,7 +636,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
</item>
@@ -855,7 +855,7 @@
</widget>
</item>
<item>
- <widget class="QFrame" name="frame_5">
+ <widget class="QFrame" name="Video">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -940,7 +940,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-arrow_drop_down-24px.svg</normaloff>images/icons/round-arrow_drop_down-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-arrow_drop_down-24px.svg</normaloff>../../../.designer/backup/images/icons/round-arrow_drop_down-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -974,7 +974,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-arrow_drop_up-24px.svg</normaloff>images/icons/round-arrow_drop_up-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-arrow_drop_up-24px.svg</normaloff>../../../.designer/backup/images/icons/round-arrow_drop_up-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -1085,7 +1085,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-arrow_drop_down-24px.svg</normaloff>images/icons/round-arrow_drop_down-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-arrow_drop_down-24px.svg</normaloff>../../../.designer/backup/images/icons/round-arrow_drop_down-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -1119,7 +1119,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>images/icons/round-arrow_drop_up-24px.svg</normaloff>images/icons/round-arrow_drop_up-24px.svg</iconset>
+ <normaloff>../../../.designer/backup/images/icons/round-arrow_drop_up-24px.svg</normaloff>../../../.designer/backup/images/icons/round-arrow_drop_up-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
diff --git a/bezierconnectorwidget.cpp b/bezierconnectorwidget.cpp
index 75dcab5..2461f88 100644
--- a/bezierconnectorwidget.cpp
+++ b/bezierconnectorwidget.cpp
@@ -56,8 +56,8 @@ BezierConnectorWidget::paintEvent(QPaintEvent* event)
} else if (this->objectName().contains("left", Qt::CaseInsensitive)) {
p0 = rect().bottomLeft();
p3 = rect().topRight();
- p1 = QPointF(p0.x(), p0.y() - c * rect().height());
- p2 = QPointF(p3.x() - c * rect().width(), p3.y());
+ p1 = QPointF(p0.x(), p3.y() + c * rect().height());
+ p2 = QPointF(p0.x() + c * rect().width(), p3.y());
}
bezierPath.moveTo(p0);
diff --git a/callwidget.ui b/callwidget.ui
index d806ddd..46025eb 100644
--- a/callwidget.ui
+++ b/callwidget.ui
@@ -114,7 +114,7 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>56</height>
+ <height>60</height>
</size>
</property>
<property name="autoFillBackground">
@@ -159,7 +159,7 @@
<number>15</number>
</property>
<property name="topMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="rightMargin">
<number>15</number>
diff --git a/conversationitemdelegate.cpp b/conversationitemdelegate.cpp
index 8de9adb..f5326f4 100644
--- a/conversationitemdelegate.cpp
+++ b/conversationitemdelegate.cpp
@@ -61,16 +61,21 @@ ConversationItemDelegate::paint(QPainter* painter
// One does not simply keep the highlighted state drawn when the context
// menu is open�
+ QColor presenceBorderColor = Qt::white;
auto rowHighlight = highlightMap_.find(index.row());
if (selected) {
painter->fillRect(option.rect, RingTheme::smartlistSelection_);
+ presenceBorderColor = RingTheme::smartlistSelection_;
} else if (rowHighlight != highlightMap_.end() && (*rowHighlight).second) {
painter->fillRect(option.rect, RingTheme::smartlistHighlight_);
+ presenceBorderColor = RingTheme::smartlistHighlight_;
}
auto convUid = index.data(static_cast<int>(SmartListModel::Role::UID)).value<QString>().toStdString();
auto conversation = Utils::getConversationFromUid(convUid, *LRCInstance::getCurrentConversationModel());
if (LRCInstance::getCurrentCallModel()->hasCall(conversation->callId)) {
- auto color = QColor(RingTheme::blue_.lighter(180)); color.setAlpha(128);
+ auto color = QColor(RingTheme::blue_.lighter(180));
+ presenceBorderColor = color;
+ color.setAlpha(128);
painter->fillRect(option.rect, color);
}
@@ -98,7 +103,7 @@ ConversationItemDelegate::paint(QPainter* painter
QPainterPath ellipse;
qreal ellipseHeight = sizeImage_ / 6;
qreal ellipseWidth = ellipseHeight;
- QPointF ellipseCenter(rectAvatar.right() - ellipseWidth, rectAvatar.top() + ellipseHeight + 1);
+ QPointF ellipseCenter(rectAvatar.right() - ellipseWidth + 1, rectAvatar.top() + ellipseHeight + 1);
QRect ellipseRect(ellipseCenter.x() - ellipseWidth, ellipseCenter.y() - ellipseHeight,
ellipseWidth * 2, ellipseHeight * 2);
ellipse.addRoundedRect(ellipseRect, ellipseWidth, ellipseHeight);
@@ -116,12 +121,12 @@ ConversationItemDelegate::paint(QPainter* painter
if (index.data(static_cast<int>(SmartListModel::Role::Presence)).value<bool>()) {
qreal radius = sizeImage_ / 6;
QPainterPath outerCircle, innerCircle;
- QPointF center(rectAvatar.right() - radius, (rectAvatar.bottom() - radius) + 1);
+ QPointF center(rectAvatar.right() - radius + 2, (rectAvatar.bottom() - radius) + 1 + 2);
qreal outerCRadius = radius;
qreal innerCRadius = outerCRadius * 0.75;
outerCircle.addEllipse(center, outerCRadius, outerCRadius);
innerCircle.addEllipse(center, innerCRadius, innerCRadius);
- painter->fillPath(outerCircle, Qt::white);
+ painter->fillPath(outerCircle, presenceBorderColor);
painter->fillPath(innerCircle, RingTheme::presenceGreen_);
}
@@ -264,6 +269,11 @@ ConversationItemDelegate::paintRingConversationItem(QPainter* painter,
}
}
interactionStr = QString::fromUcs4(&emojiless.at(0), emojiless.size());
+ // remove everythin after 'call'
+ auto indexOfCallStr = interactionStr.lastIndexOf(QString("call"), -1, Qt::CaseInsensitive);
+ if (indexOfCallStr != -1) {
+ interactionStr = interactionStr.left(indexOfCallStr + 4);
+ }
} else {
QFont emojiMsgFont(QStringLiteral("Segoe UI Emoji"));
emojiMsgFont.setItalic(false);
diff --git a/currentaccountcombobox.cpp b/currentaccountcombobox.cpp
index 03a2a64..e807d0b 100644
--- a/currentaccountcombobox.cpp
+++ b/currentaccountcombobox.cpp
@@ -58,7 +58,6 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
this->setCurrentIndex(std::distance(accountList.begin(), it));
}
});
-
gearLabel_.setPixmap(QPixmap(":/images/icons/round-settings-24px.svg"));
gearLabel_.setParent(this);
gearLabel_.setStyleSheet("background: transparent;");
@@ -75,7 +74,7 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
{
Q_UNUSED(e);
- QPoint avatarTopLeft(16, 6);
+ QPoint avatarTopLeft(16, 8);
QPainter painter(this);
painter.setRenderHints((QPainter::Antialiasing | QPainter::TextAntialiasing), true);
@@ -106,8 +105,8 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
if (accountStatus == lrc::api::account::Status::REGISTERED) {
// paint the presence indicator circle
QPainterPath outerCircle, innerCircle;
- QPointF presenceCenter(40.0 + avatarTopLeft.x(), 40.0);
- qreal outerCircleRadius = cellHeight_/6.5;
+ QPointF presenceCenter(avatarSize_ + avatarTopLeft.x() - 9, avatarSize_ - 3);
+ qreal outerCircleRadius = avatarSize_ / 6;
qreal innerCircleRadius = outerCircleRadius * 0.75;
outerCircle.addEllipse(presenceCenter, outerCircleRadius, outerCircleRadius);
innerCircle.addEllipse(presenceCenter, innerCircleRadius, innerCircleRadius);
@@ -116,10 +115,10 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
}
QRect comboBoxRect(
- cellHeight_ + avatarTopLeft.x() + 10 + 2,
- 6,
- this->width() - cellHeight_,
- cellHeight_ - 10); // [screen awareness]
+ avatarSize_ + avatarTopLeft.x() + 10 + 2,
+ 8,
+ this->width() - avatarSize_,
+ avatarSize_ - 10); // [screen awareness]
// write primary and secondary account identifiers to combobox label
QString primaryAccountID = QString::fromStdString(Utils::bestNameForAccount(LRCInstance::getCurrentAccountInfo()));
@@ -167,7 +166,7 @@ void
CurrentAccountComboBox::importLabelPhoto(int index)
{
currentAccountAvatarImage_ = accountListModel_->data(accountListModel_->index(index, 0), // [efficiency improvement]
- AccountListModel::Role::Picture).value<QPixmap>().scaledToHeight(cellHeight_ - 4, Qt::SmoothTransformation);
+ AccountListModel::Role::Picture).value<QPixmap>().scaledToHeight(avatarSize_ - 4, Qt::SmoothTransformation);
}
void
@@ -206,7 +205,7 @@ CurrentAccountComboBox::mouseMoveEvent(QMouseEvent* mouseEvent)
{
if (gearLabel_.frameGeometry().contains(mouseEvent->x(), mouseEvent->y())) {
QComboBox::mouseMoveEvent(mouseEvent);
- gearLabel_.setStyleSheet("background: rgb(237, 237, 237); border-width: 0px; border-radius: 8px;");
+ gearLabel_.setStyleSheet("background: rgb(237, 237, 237); border-width: 0px; border-radius: 15px;");
return;
}
diff --git a/currentaccountcombobox.h b/currentaccountcombobox.h
index 58716d3..f7b2c43 100644
--- a/currentaccountcombobox.h
+++ b/currentaccountcombobox.h
@@ -59,7 +59,8 @@ private:
std::unique_ptr<AccountListModel> accountListModel_;
QPixmap currentAccountAvatarImage_;
- int cellHeight_ = 50; // [screen awareness]
+ int cellHeight_ = 60; // [screen awareness]
+ int avatarSize_ = 48; // [screen awareness]
const int elidConst = 35; // [screen awareness]
const int gearBorder_ = 4;
const int gearSize_ = 24;
diff --git a/deleteaccountdialog.cpp b/deleteaccountdialog.cpp
index 2c2a691..88e2d66 100644
--- a/deleteaccountdialog.cpp
+++ b/deleteaccountdialog.cpp
@@ -36,6 +36,8 @@ DeleteAccountDialog::DeleteAccountDialog(QWidget *parent) :
}
connect(ui->btnDeleteAccept, &QPushButton::clicked, this, &DeleteAccountDialog::on_deleteAcceptBtn_clicked);
connect(ui->btnDeleteCancel, &QPushButton::clicked, this, &DeleteAccountDialog::on_deleteCancelBtn_clicked);
+
+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
}
DeleteAccountDialog::~DeleteAccountDialog()
diff --git a/deleteaccountdialog.ui b/deleteaccountdialog.ui
index 13ef201..1b2c1a0 100644
--- a/deleteaccountdialog.ui
+++ b/deleteaccountdialog.ui
@@ -35,9 +35,9 @@
<string>Account deletion</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" stretch="3,1,1,0,0,0,0,0">
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="labelDeletion">
<property name="maximumSize">
@@ -48,7 +48,7 @@
</property>
<property name="font">
<font>
- <pointsize>8</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -66,7 +66,9 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
</font>
</property>
<property name="text">
@@ -87,7 +89,9 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>MS Sans Serif</family>
+ <pointsize>7</pointsize>
+ <italic>false</italic>
</font>
</property>
<property name="text">
@@ -128,6 +132,11 @@
<height>0</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
<property name="styleSheet">
<string notr="true">color: red;</string>
</property>
@@ -208,11 +217,16 @@
<height>30</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
<property name="toolTip">
<string>Permanently delete account</string>
</property>
<property name="styleSheet">
- <string notr="true">border: 0px;; border-radius:3px; background: rgb(245, 245, 245);</string>
+ <string notr="true"/>
</property>
<property name="text">
<string>Delete</string>
@@ -246,11 +260,16 @@
<height>30</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
<property name="toolTip">
<string>Cancel account deletion</string>
</property>
<property name="styleSheet">
- <string notr="true">border: 0px; border-radius:3px; background: rgb(245, 245, 245);</string>
+ <string notr="true"/>
</property>
<property name="text">
<string>Cancel</string>
diff --git a/invitebuttonswidget.ui b/invitebuttonswidget.ui
index bb6169c..e515f7e 100644
--- a/invitebuttonswidget.ui
+++ b/invitebuttonswidget.ui
@@ -49,106 +49,151 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="btnAcceptInvite">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Accept invite</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="ressources.qrc">
- <normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>18</width>
- <height>18</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnIgnoreInvite">
- <property name="minimumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Ignore invite</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="ressources.qrc">
- <normaloff>:/images/icons/ic_clear_24px.svg</normaloff>:/images/icons/ic_clear_24px.svg</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>18</width>
- <height>18</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnBlockInvite">
- <property name="minimumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Block person</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="ressources.qrc">
- <normaloff>:/images/icons/ic_block_24px.svg</normaloff>:/images/icons/ic_block_24px.svg</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>18</width>
- <height>18</height>
- </size>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnAcceptInvite">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Accept</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>12</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnIgnoreInvite">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Refuse</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_clear_24px.svg</normaloff>:/images/icons/ic_clear_24px.svg</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>12</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBlockInvite">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Block</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_block_24px.svg</normaloff>:/images/icons/ic_block_24px.svg</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
@@ -160,7 +205,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>13</width>
+ <width>12</width>
<height>17</height>
</size>
</property>
diff --git a/passworddialog.ui b/passworddialog.ui
index ee4e26c..483b886 100644
--- a/passworddialog.ui
+++ b/passworddialog.ui
@@ -32,7 +32,7 @@
<string>Change Account Password</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
diff --git a/regnamedialog.ui b/regnamedialog.ui
index ff23e4b..d4643e9 100644
--- a/regnamedialog.ui
+++ b/regnamedialog.ui
@@ -29,7 +29,7 @@
<string>Set Registered Name</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
<property name="modal">
<bool>true</bool>
diff --git a/ringthemeutils.h b/ringthemeutils.h
index 83ad931..733b830 100644
--- a/ringthemeutils.h
+++ b/ringthemeutils.h
@@ -36,8 +36,8 @@ static const QColor notificationRed_{ 255, 59, 48 };
static const QColor urgentOrange_{ 255, 165, 0 };
static const QColor green_ {127, 255, 0};
static const QColor presenceGreen_{ 76, 217, 100 };
-static const QColor smartlistSelection_ { 237, 237, 237 };
-static const QColor smartlistHighlight_ { 242, 242, 242 };
+static const QColor smartlistSelection_ { 240, 240, 240 };
+static const QColor smartlistHighlight_ { 245, 245, 245 };
static const QColor defaultAvatarColor_ = { "#ff9e9e9e" }; //Grey
static const QColor avatarColors_[] {
diff --git a/setavatardialog.ui b/setavatardialog.ui
index b91ca9c..0458b7a 100644
--- a/setavatardialog.ui
+++ b/setavatardialog.ui
@@ -32,7 +32,7 @@
<string>Change Your Avatar Image</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/settingsitemwidget.cpp b/settingsitemwidget.cpp
index 128f1e3..06fde4f 100644
--- a/settingsitemwidget.cpp
+++ b/settingsitemwidget.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (C) 2018-2019 Savoir-faire Linux Inc. *
+ * Copyright (C) 2018-2019 Savoir-faire Linux Inc. *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This library is free software; you can redistribute it and/or *
@@ -22,7 +22,6 @@
#include "api/newdevicemodel.h"
#include "ringthemeutils.h"
-
SettingsItemWidget::SettingsItemWidget(int height, int index, bool banned, QListWidget* parent)
: QListWidgetItem(parent),
banned_(banned),
diff --git a/settingswidget.cpp b/settingswidget.cpp
index e64a639..7361a37 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -30,6 +30,7 @@
#include <QStandardPaths>
#include <QMessageBox>
#include <QSettings>
+#include <QScrollBar>
#include "utils.h"
#include "settingsitemwidget.h"
@@ -63,14 +64,10 @@ SettingsWidget::SettingsWidget(QWidget* parent)
{
ui->setupUi(this);
- ui->accountSettingsButton->setAutoFillBackground(true);
- ui->generalSettingsButton->setAutoFillBackground(true);
- ui->avSettingsButton->setAutoFillBackground(true);
-
ui->accountSettingsButton->setChecked(true);
- ui->exitSettingsButton->setIconSize(QSize(24, 24));
- ui->exitSettingsButton->setIcon(QPixmap(":/images/icons/round-close-24px.svg"));
+ ui->btnExitSettings->setIconSize(QSize(24, 24));
+ ui->btnExitSettings->setIcon(QPixmap(":/images/icons/round-close-24px.svg"));
// display name (aka alias)
ui->displayNameLineEdit->setAlignment(Qt::AlignHCenter);
@@ -92,32 +89,10 @@ SettingsWidget::SettingsWidget(QWidget* parent)
ui->currentAccountAvatar->width() + 2, ui->currentAccountAvatar->height() + 2, QRegion::Ellipse);
ui->currentAccountAvatar->setMask(avatarClickableRegion);
- QString styleS(
- "QPushButton {"
- " background-color: white;"
- " border-right: 1px solid #f0f0f0;"
- "}"
- " QPushButton:hover {"
- " background-color: rgb(245, 245, 245);"
- " border-right: 1px solid #f0f0f0;"
- " }"
-
- "QPushButton:checked {"
- " background-color: rgb(237, 237, 237);"
- " border-right: 1px solid #f0f0f0;"
- "}"
- );
-
- ui->accountSettingsButton->setStyleSheet(styleS);
- ui->generalSettingsButton->setStyleSheet(styleS);
- ui->avSettingsButton->setStyleSheet(styleS);
-
ui->advancedAccountSettingsPButton->setIcon(QPixmap(":/images/icons/round-arrow_drop_down-24px.svg"));
ui->linkDevPushButton->setIcon(QPixmap(":/images/icons/round-add-24px.svg"));
ui->blockedContactsBtn->setIcon(QPixmap(":/images/icons/round-arrow_drop_up-24px.svg"));
- ui->advancedSettingsOffsetLabel->show();
-
auto accountList = LRCInstance::accountModel().getAccountList();
if (!accountList.size()) {
Utils::oneShotConnect(&LRCInstance::accountModel(),
@@ -130,6 +105,11 @@ SettingsWidget::SettingsWidget(QWidget* parent)
setConnections();
}
+ ui->scrollArea->verticalScrollBar()->setEnabled(true);
+ ui->scrollArea->verticalScrollBar()->setStyleSheet("QScrollBar:vertical { width: 10px; }");
+
+ ui->advancedSettingsWidget->setVisible(false);
+
ui->containerWidget->setVisible(false);
}
@@ -275,18 +255,17 @@ SettingsWidget::toggleAdvancedSettings()
{
if (advancedSettingsDropped_) {
ui->advancedAccountSettingsPButton->setIcon(QPixmap(":/images/icons/round-arrow_drop_down-24px.svg"));
- ui->currentAccountSettingsScrollLayout->removeWidget(advancedSettingsWidget_);
ui->scrollBarLabel->show();
- ui->advancedSettingsOffsetLabel->hide();
- delete advancedSettingsWidget_;
- }
- else { // will show advanced settings next
+ ui->advancedSettingsWidget->setVisible(false);
+ } else {
ui->advancedAccountSettingsPButton->setIcon(QPixmap(":/images/icons/round-arrow_drop_up-24px.svg"));
- advancedSettingsWidget_ = new AdvancedSettingsWidget(this);
- advancedSettingsWidget_->setMaximumWidth(ui->scrollAreaWidgetContents->width() - 10);
- ui->currentAccountSettingsScrollLayout->addWidget(advancedSettingsWidget_);
- ui->advancedSettingsOffsetLabel->show();
ui->scrollBarLabel->hide();
+ ui->advancedSettingsWidget->setVisible(true);
+ QTimer::singleShot(50, this,
+ [this] {
+ auto top = ui->advancedAccountSettingsPButton->frameGeometry().top();
+ ui->scrollArea->verticalScrollBar()->setSliderPosition(top);
+ });
}
advancedSettingsDropped_ = !advancedSettingsDropped_;
}
@@ -641,8 +620,8 @@ SettingsWidget::showCurrentAccountSlot()
void
SettingsWidget::setConnections()
{
- // exitSettingsButton
- connect(ui->exitSettingsButton, &QPushButton::clicked, this, &SettingsWidget::leaveSettingsSlot);
+ // btnExitSettings
+ connect(ui->btnExitSettings, &QPushButton::clicked, this, &SettingsWidget::leaveSettingsSlot);
connect(ui->accountSettingsButton, &QPushButton::clicked, [this]() {
setSelected(Button::accountSettingsButton); }
diff --git a/settingswidget.ui b/settingswidget.ui
index 4c7bf99..6c98443 100644
--- a/settingswidget.ui
+++ b/settingswidget.ui
@@ -7,14 +7,14 @@
<x>0</x>
<y>0</y>
<width>896</width>
- <height>682</height>
+ <height>781</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="styleSheet">
- <string notr="true">background: white;</string>
+ <string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
@@ -165,7 +165,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="exitSettingsButton">
+ <widget class="QPushButton" name="btnExitSettings">
<property name="minimumSize">
<size>
<width>30</width>
@@ -179,9 +179,7 @@
</size>
</property>
<property name="styleSheet">
- <string notr="true">QPushButton {background: white; border: 0px; border-radius: 8px;}
-QPushButton:hover {background: rgb(237,237, 237); border: 0px; border-radius: 8px;}
-QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: 8px;}</string>
+ <string notr="true"/>
</property>
<property name="text">
<string/>
@@ -424,7 +422,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
<string notr="true"/>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="generalSettings">
<property name="sizePolicy">
@@ -675,7 +673,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
</property>
<property name="icon">
<iconset>
- <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -797,7 +795,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
</property>
<property name="icon">
<iconset>
- <normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
+ <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -1119,8 +1117,8 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
<rect>
<x>0</x>
<y>0</y>
- <width>617</width>
- <height>580</height>
+ <width>696</width>
+ <height>781</height>
</rect>
</property>
<property name="styleSheet">
@@ -1147,6 +1145,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
<property name="spacing">
<number>0</number>
</property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
@@ -1161,950 +1162,1009 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
</spacer>
</item>
<item>
- <widget class="QWidget" name="centralWidget" native="true">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
+ <layout class="QVBoxLayout" name="centralWidgetContainer">
+ <property name="spacing">
+ <number>0</number>
</property>
- <layout class="QVBoxLayout" name="currentAccountSettingsScrollLayout" stretch="3,0,0,1,0,0,0,0,3,0,5">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="verticalSpacer_7">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QWidget" name="centralWidget" native="true">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <layout class="QVBoxLayout" name="currentAccountSettingsScrollLayout" stretch="3,0,0,0,0,0,3,0,5">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_56">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_17">
- <property name="spacing">
- <number>0</number>
+ <spacer name="verticalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="leftMargin">
- <number>0</number>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="topMargin">
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_56">
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
- <spacer name="verticalSpacer_15">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <layout class="QVBoxLayout" name="verticalLayout_17">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
+ <property name="leftMargin">
+ <number>0</number>
</property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="bottomMargin">
- <number>20</number>
+ <property name="topMargin">
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="currentAccountAvatar">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <spacer name="verticalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>150</height>
- </size>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="maximumSize">
+ <property name="sizeHint" stdset="0">
<size>
- <width>150</width>
- <height>150</height>
+ <width>20</width>
+ <height>10</height>
</size>
</property>
- <property name="font">
- <font>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="cursor">
- <cursorShape>PointingHandCursor</cursorShape>
- </property>
- <property name="styleSheet">
- <string notr="true">border: none;</string>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="bottomMargin">
+ <number>20</number>
</property>
- <property name="text">
- <string/>
+ <item>
+ <widget class="QPushButton" name="currentAccountAvatar">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: none;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>160</width>
+ <height>160</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_64" stretch="0">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="iconSize">
- <size>
- <width>160</width>
- <height>160</height>
- </size>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <property name="flat">
- <bool>false</bool>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- </widget>
+ <item>
+ <widget class="QLineEdit" name="displayNameLineEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>170</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>170</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_64" stretch="0">
+ <layout class="QVBoxLayout" name="verticalLayout_18">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
- <property name="rightMargin">
- <number>0</number>
- </property>
<item>
- <widget class="QLineEdit" name="displayNameLineEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <spacer name="verticalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="minimumSize">
- <size>
- <width>170</width>
- <height>30</height>
- </size>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="maximumSize">
+ <property name="sizeHint" stdset="0">
<size>
- <width>170</width>
- <height>30</height>
+ <width>20</width>
+ <height>10</height>
</size>
</property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ </spacer>
</item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_18">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="verticalSpacer_13">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_58" stretch="0,40">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
<item>
- <widget class="QWidget" name="widget_4" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>114</width>
- <height>0</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_58" stretch="0,40">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="maximumSize">
- <size>
- <width>110</width>
- <height>16777215</height>
- </size>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_19">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_16">
- <property name="bottomMargin">
- <number>5</number>
+ <item>
+ <widget class="QWidget" name="widget_4" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>114</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>110</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_19">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacer_14">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="label_11">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>40</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <stylestrategy>PreferDefault</stylestrategy>
- </font>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Account</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_60">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
- <spacer name="horizontalSpacer_42">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_16">
+ <property name="bottomMargin">
+ <number>5</number>
</property>
- </spacer>
+ <item>
+ <spacer name="horizontalSpacer_14">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_11">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <stylestrategy>PreferDefault</stylestrategy>
+ </font>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Account</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QLabel" name="currentRegisteredIDLabel">
- <property name="enabled">
- <bool>true</bool>
+ <layout class="QHBoxLayout" name="horizontalLayout_60">
+ <property name="bottomMargin">
+ <number>0</number>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>32</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Registered Name</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
- </property>
- </widget>
+ <item>
+ <spacer name="horizontalSpacer_42">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="currentRegisteredIDLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Registered Name</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_59">
- <property name="bottomMargin">
- <number>3</number>
- </property>
<item>
- <spacer name="horizontalSpacer_41">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_59">
+ <property name="bottomMargin">
+ <number>3</number>
</property>
- </spacer>
+ <item>
+ <spacer name="horizontalSpacer_41">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="currentRingIDMessage">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="text">
+ <string>ID</string>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QLabel" name="currentRingIDMessage">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>40</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="text">
- <string>ID</string>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="bottomMargin">
+ <number>0</number>
</property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <property name="spacing">
+ <number>0</number>
</property>
- </widget>
+ <item row="0" column="0">
+ <spacer name="horizontalSpacer_25">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_7">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>26</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>26</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Password</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <spacer name="verticalSpacer_16">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>2</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
</layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>0</number>
- </property>
- <item row="0" column="0">
- <spacer name="horizontalSpacer_25">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_7">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>26</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>26</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Password</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <spacer name="verticalSpacer_16">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>2</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_20">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>10</number>
- </property>
+ </widget>
+ </item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_14">
- <property name="bottomMargin">
- <number>5</number>
- </property>
- <item>
- <widget class="QCheckBox" name="accountEnableCheckBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>40</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Enable</string>
- </property>
- </widget>
- </item>
+ <layout class="QVBoxLayout" name="verticalLayout_20">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>10</number>
+ </property>
<item>
- <spacer name="horizontalSpacer_15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_14">
+ <property name="bottomMargin">
+ <number>5</number>
</property>
- </spacer>
+ <item>
+ <widget class="QCheckBox" name="accountEnableCheckBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string>Enable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_61">
<item>
- <widget class="QLineEdit" name="currentRegisteredID">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>250</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>32</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="mouseTracking">
- <bool>true</bool>
- </property>
- <property name="styleSheet">
- <string notr="true">padding-left: 10; border: 1px solid black;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="frame">
- <bool>false</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="readOnly">
- <bool>false</bool>
- </property>
- <property name="placeholderText">
- <string>Type here to register a username</string>
- </property>
- <property name="clearButtonEnabled">
- <bool>false</bool>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_61">
+ <item>
+ <widget class="QLineEdit" name="currentRegisteredID">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="mouseTracking">
+ <bool>true</bool>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">padding-left: 10; border: 1px solid black;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="frame">
+ <bool>false</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>false</bool>
+ </property>
+ <property name="placeholderText">
+ <string>Type here to register a username</string>
+ </property>
+ <property name="clearButtonEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="regNameButton">
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QPushButton" name="regNameButton">
- <property name="minimumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_62">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>24</width>
- <height>24</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
+ <item>
+ <widget class="QLineEdit" name="currentRingID">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>290</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>8</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <spacer name="horizontalSpacer_9">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <layout class="QHBoxLayout" name="horizontalLayout_63">
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <item>
+ <widget class="QPushButton" name="passwdPushButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>134</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>134</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <underline>false</underline>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+padding: 5px;
+</string>
+ </property>
+ <property name="text">
+ <string>Change Password</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
</layout>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_65">
+ <property name="spacing">
+ <number>15</number>
+ </property>
+ <property name="leftMargin">
+ <number>10</number>
+ </property>
+ <property name="topMargin">
+ <number>10</number>
+ </property>
+ <property name="rightMargin">
+ <number>10</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_62">
- <property name="spacing">
- <number>0</number>
+ <spacer name="horizontalSpacer_19">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <item>
- <widget class="QLineEdit" name="currentRingID">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>290</width>
- <height>40</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>8</pointsize>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 0px; padding: 1px;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_10">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_63">
- <property name="leftMargin">
- <number>0</number>
+ <widget class="QPushButton" name="btnExportAccount">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>30</height>
+ </size>
</property>
- <property name="topMargin">
- <number>0</number>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
</property>
- <item>
- <widget class="QPushButton" name="passwdPushButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>134</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>134</width>
- <height>30</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <underline>false</underline>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
padding: 5px;
</string>
- </property>
- <property name="text">
- <string>Change Password</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </property>
+ <property name="text">
+ <string>Export Account</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnDeletAccount">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+padding: 5px;
+</string>
+ </property>
+ <property name="text">
+ <string>Delete Account</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_26">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>30</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</item>
</layout>
</item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_66">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>1</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_65">
- <property name="spacing">
- <number>15</number>
- </property>
- <property name="leftMargin">
- <number>10</number>
- </property>
+ <layout class="QGridLayout" name="gridLayout_8">
<property name="topMargin">
- <number>10</number>
- </property>
- <property name="rightMargin">
- <number>10</number>
+ <number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacer_19">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>30</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnExportAccount">
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>30</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
-padding: 5px;
-</string>
- </property>
- <property name="text">
- <string>Export Account</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnDeletAccount">
- <property name="minimumSize">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="maximumSize">
<size>
- <width>150</width>
+ <width>16777215</width>
<height>30</height>
</size>
</property>
<property name="font">
<font>
- <pointsize>9</pointsize>
+ <pointsize>11</pointsize>
</font>
</property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
-padding: 5px;
-</string>
- </property>
<property name="text">
- <string>Delete Account</string>
+ <string>Linked Devices</string>
</property>
- <property name="flat">
- <bool>true</bool>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
</property>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacer_26">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>30</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_8">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <spacer name="verticalSpacer_12">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>30</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_66">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>1</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <layout class="QGridLayout" name="gridLayout_8">
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>0</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
+ <item>
+ <spacer name="horizontalSpacer_46">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_12">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="linkDevPushButton">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>30</height>
+ </size>
+ </property>
<property name="maximumSize">
<size>
<width>16777215</width>
@@ -2113,342 +2173,264 @@ padding: 5px;
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+padding: 5px;
+</string>
+ </property>
<property name="text">
- <string>Linked Devices</string>
+ <string>Link Another Device</string>
</property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
</property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer_46">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="label_12">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>30</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="linkDevPushButton">
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>30</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
-padding: 5px;
-</string>
- </property>
- <property name="text">
- <string>Link Another Device</string>
- </property>
- <property name="iconSize">
- <size>
- <width>24</width>
- <height>24</height>
- </size>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- </layout>
- </item>
- <item>
- <widget class="QListWidget" name="settingsListWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>600</width>
- <height>140</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>130</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">border: 1px solid grey;</string>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>false</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::NoSelection</enum>
- </property>
- <property name="uniformItemSizes">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_67">
- <property name="topMargin">
- <number>5</number>
- </property>
<item>
- <widget class="QPushButton" name="blockedContactsBtn">
+ <widget class="QListWidget" name="settingsListWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>120</width>
- <height>30</height>
+ <width>600</width>
+ <height>140</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>180</width>
- <height>30</height>
+ <width>16777215</width>
+ <height>130</height>
</size>
</property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
+ <property name="styleSheet">
+ <string notr="true">border: 1px solid grey;</string>
</property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
</property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
-padding-right: 20px;
-padding-left: 15px;
-</string>
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
</property>
- <property name="text">
- <string>Blocked Contacts</string>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
</property>
- <property name="iconSize">
- <size>
- <width>24</width>
- <height>24</height>
- </size>
+ <property name="alternatingRowColors">
+ <bool>false</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>true</bool>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_47">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <layout class="QHBoxLayout" name="horizontalLayout_67">
+ <property name="topMargin">
+ <number>5</number>
</property>
- </spacer>
+ <item>
+ <widget class="QPushButton" name="blockedContactsBtn">
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>180</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+padding-right: 20px;
+padding-left: 15px;
+</string>
+ </property>
+ <property name="text">
+ <string>Blocked Contacts</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_47">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="advancedSettingsOffsetLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>4</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>4</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_10">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_68" stretch="1,0,1">
- <property name="topMargin">
- <number>4</number>
- </property>
- <property name="bottomMargin">
- <number>15</number>
- </property>
<item>
- <spacer name="horizontalSpacer_48">
+ <spacer name="verticalSpacer_10">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="QPushButton" name="advancedAccountSettingsPButton">
- <property name="minimumSize">
- <size>
- <width>180</width>
- <height>30</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>30</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
+ <layout class="QHBoxLayout" name="horizontalLayout_68" stretch="1,0,1">
+ <property name="topMargin">
+ <number>4</number>
</property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
+ <property name="bottomMargin">
+ <number>15</number>
</property>
- <property name="styleSheet">
- <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
+ <item>
+ <spacer name="horizontalSpacer_48">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="advancedAccountSettingsPButton">
+ <property name="minimumSize">
+ <size>
+ <width>180</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ </font>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245);
padding-right: 20px;
padding-left: 15px;
</string>
- </property>
- <property name="text">
- <string>Advanced Account Settings</string>
- </property>
- <property name="iconSize">
- <size>
- <width>24</width>
- <height>24</height>
- </size>
- </property>
- </widget>
+ </property>
+ <property name="text">
+ <string>Advanced Account Settings</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_49">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <spacer name="horizontalSpacer_49">
+ <spacer name="verticalSpacer_9">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>20</width>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
- </item>
- <item>
- <spacer name="verticalSpacer_9">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="AdvancedSettingsWidget" name="advancedSettingsWidget" native="true"/>
+ </item>
+ </layout>
</item>
<item>
<widget class="QLabel" name="scrollBarLabel">
<property name="minimumSize">
<size>
- <width>4</width>
+ <width>10</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>4</width>
+ <width>10</width>
<height>16777215</height>
</size>
</property>
@@ -3152,6 +3134,12 @@ padding-left: 15px;
<header>videowidget.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>AdvancedSettingsWidget</class>
+ <extends>QWidget</extends>
+ <header location="global">advancedsettingswidget.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/stylesheet.css b/stylesheet.css
index bec70de..314c40a 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -32,7 +32,7 @@ QPushButton#refuseButton:pressed, QPushButton#cancelButton:pressed{
background-color: #db3c30;
}
-QPushButton {
+QPushButton {
background-color: rgb(242, 242, 242);
border-style: solid;
border-width: 0px;
@@ -49,7 +49,7 @@ QPushButton#btnExportAccount, QPushButton#btnDeletAccount {
border-radius: 0px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
- color: rgb(32, 32, 32);
+ color: rgb(32, 32, 32);
height: 28px;
padding: 0px;
background-color: rgb(240, 240, 240);
@@ -76,13 +76,14 @@ QPushButton#btnExportAccount:checked, QPushButton#btnDeletAccount:checked {
QPushButton#imBackButton, QPushButton#btnAcceptInvite, QPushButton#btnIgnoreInvite,
QPushButton#btnBlockInvite, QPushButton#btnAudioCall, QPushButton#btnVideoCall,
-QPushButton#sendContactRequestButton, QPushButton#sendButton, QPushButton#sendIMButton {
+QPushButton#sendContactRequestButton, QPushButton#sendButton, QPushButton#sendIMButton,
+QPushButton#btnExitSettings {
background-color: transparent;
border-style: solid;
border-width: 0px;
- border-radius: 9px;
+ border-radius: 15px;
padding: 8px;
- color: rgb(32, 32, 32);
+ color: rgb(32, 32, 32);
}
QPushButton#btnAcceptInvite:hover, QPushButton#btnIgnoreInvite:hover, QPushButton#btnBlockInvite:hover {
@@ -94,15 +95,34 @@ QPushButton#btnAcceptInvite:pressed, QPushButton#btnIgnoreInvite:pressed, QPushB
}
QPushButton#imBackButton:hover, QPushButton#btnAudioCall:hover, QPushButton#btnVideoCall:hover,
-QPushButton#sendContactRequestButton:hover, QPushButton#sendButton:hover, QPushButton#sendIMButton:hover {
+QPushButton#sendContactRequestButton:hover, QPushButton#sendButton:hover, QPushButton#sendIMButton:hover,
+QPushButton#btnExitSettings:hover, QPushButton#btnDeleteAccept:hover, QPushButton#btnDeleteCancel:hover {
background-color: rgb(237, 237, 237);
}
QPushButton#imBackButton:pressed, QPushButton#btnAudioCall:pressed, QPushButton#btnVideoCall:pressed,
-QPushButton#sendContactRequestButton:pressed, QPushButton#sendButton:pressed, QPushButton#sendIMButton:pressed {
+QPushButton#sendContactRequestButton:pressed, QPushButton#sendButton:pressed, QPushButton#sendIMButton:pressed,
+QPushButton#btnExitSettings:pressed, QPushButton#btnDeleteAccept:pressed, QPushButton#btnDeleteCancel:pressed {
background-color: rgb(212, 212, 212);
}
+QPushButton#accountSettingsButton, QPushButton#generalSettingsButton, QPushButton#avSettingsButton {
+ border-radius: 0px;
+ background-color: transparent;
+}
+
+QPushButton#accountSettingsButton:hover,
+QPushButton#generalSettingsButton:hover,
+QPushButton#avSettingsButton:hover {
+ background-color: rgb(245, 245, 245);
+}
+
+QPushButton#accountSettingsButton:checked,
+QPushButton#generalSettingsButton:checked,
+QPushButton#avSettingsButton:checked {
+ background-color: rgb(240, 240, 240);
+}
+
QWidget#searchBarLayoutWidget, QWidget#smartList,
QWidget#sidePanelLayoutWidget, QWidget#leftSettingsWidget {
border-right: 2px solid rgb(240, 240, 240);
@@ -186,14 +206,12 @@ QListView#cipherListView::item:disabled
background-color: transparent;
}
-SmartListView::item:selected, QListView#accountView::item:selected, QListView#contactView::item:selected,
-QListView#BannedList::item:selected {
+SmartListView::item:selected, QListView#BannedList::item:selected {
background-color: rgba(220, 220, 220, 255);
border: none;
}
-SmartListView::item:hover, QListView#accountView::item:hover, QListView#contactView::item:hover,
-QListView#BannedList::item:hover {
+SmartListView::item:hover, QListView#BannedList::item:hover {
background-color: rgba(242, 242, 242, 255);
}
@@ -248,31 +266,11 @@ QPushButton#hangupButton:pressed{
background-color: rgba(255, 0, 0, 0.8);
}
-QPushButton#exitSettingsButton, QPushButton#settingsButton, QPushButton#addToContactButton,
-QPushButton#sendCRBackButton, QPushButton#copyCMButton, QPushButton#pendingCRBackButton,
-QPushButton#videoCfgBtn{
- background-color: #414141;
- border-radius: 15px;
- border:solid 1px;
-}
-
-QPushButton#exitSettingsButton:hover, QPushButton#settingsButton:hover,
-QPushButton#sendCRBackButton:hover, QPushButton#copyCMButton:hover, QPushButton#pendingCRBackButton:hover,
-QPushButton#videoCfgBtn:hover{
- background-color: #515151;
-}
-
-QPushButton#exitSettingsButton:pressed, QPushButton#settingsButton:pressed,
-QPushButton#sendCRBackButton:pressed, QPushButton#copyCMButton:pressed, QPushButton#pendingCRBackButton:pressed,
-QPushButton#videoCfgBtn:pressed{
- background-color: #313131;
-}
-
QToolButton#qrButton, QToolButton#shareButton{
background-color: rgb(242, 242, 242);
border-style: solid;
border-width: 0px;
- border-radius: 5px;
+ border-radius: 15px;
padding: 8px;
color: rgb(32, 32, 32);
}
@@ -304,26 +302,6 @@ QScrollBar::handle:vertical{
background: rgb(77, 77, 77);
}
-QDialog#CallUtilsDialog, QDialog#QualityDialog{
- background: transparent;
-}
-
-QWidget#roundedFrame{
- background-color: rgba(250, 250, 250, 0.8);
- border-color: rgba(25, 25, 25, 1.0);
- border-radius: 8px;
- border:solid 1px;
-}
-
-QWidget#spike{
- background-color: rgba(250, 250, 250, 0.8);
- border-color: rgba(25, 25, 25, 1.0);
-}
-
-QListView#contactView{
- background: transparent;
-}
-
QWidget#messagingPage, QWidget#contactRequestPage,
QDialog#DeleteAccountDialog {
background: rgb(255, 255, 255);
@@ -451,30 +429,6 @@ QWidget#horizontalWidget{
background: transparent;
}
-
-QPushButton#generalTabButton, QPushButton#videoTabButton, QPushButton#accountTabButton{
- background: transparent;
- color: rgb(77, 77, 77);
- border-radius: 0px;
- border-style: solid;
- border-width: 2px;
- border-color: #414141;
- border-top: transparent;
- border-left: transparent;
- border-right: transparent;
- font: 12pt "Sans Serif";
- padding: 2px;
-}
-
-QPushButton#quickValidCRBtn, QPushButton#quickMuteCRBtn, QPushButton#quickBanCRBtn{
- border-radius: 2px;
- height:25px;
- width:25px;
- margin: 2px 2px 2px 2px;
- text-align: center;
- font: 10pt "FontAwesome";
-}
-
QSpinBox {
background: transparent;
border-radius: 0px;
@@ -602,7 +556,21 @@ QPushButton#pictureButton:checked, QPushButton#fileButton:checked {
}
/* } setAvatarDialog */
-
/* SettingsWidget { */
+QWidget#leftSettingsWidget, QWidget#rightSettingsWidget,
+QWidget#DeleteAccountDialog, QWidget#AdvancedSettingsWidget,
+QWidget#RegNameDialog, QWidget#PasswordDialog, QWidget#centralWidget,
+QWidget#scrollAreaWidgetContents {
+ background-color: rgba(255, 255, 255, 255);
+}
+QLineEdit#currentRingID {
+ border: 0px;
+ padding: 1px;
+ background-color: transparent;
+}
+
+QPushButton#regNameButton {
+ background-color: transparent;
+}
/* } SettingsWidget */
\ No newline at end of file
--
GitLab