Skip to content
GitLab
Commit dc2703ed authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

ui: cleanup css, smartlist margin fixes, settings overhaul 

Change-Id: Iec0f4e8e8f2739059fc0cfa42e4eb5e18f46cecd
parent 81083553
Expand all Hide whitespace changes
Inline Side-by-side
accountitemdelegate.cpp
View file @ dc2703ed
......@@ -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_);
}
......
advancedsettingswidget.ui
View file @ dc2703ed
......@@ -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>
......
bezierconnectorwidget.cpp
View file @ dc2703ed
......@@ -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);
......
callwidget.ui
View file @ dc2703ed
......@@ -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>
......
conversationitemdelegate.cpp
View file @ dc2703ed
......@@ -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);
......
currentaccountcombobox.cpp
View file @ dc2703ed
......@@ -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;
}
......
currentaccountcombobox.h
View file @ dc2703ed
......@@ -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;
......
deleteaccountdialog.cpp
View file @ dc2703ed
......@@ -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()
......
deleteaccountdialog.ui
View file @ dc2703ed
......@@ -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>
......
invitebuttonswidget.ui
View file @ dc2703ed
......@@ -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">