diff --git a/advancedsettingswidget.ui b/advancedsettingswidget.ui index 61c4ba423bba70b23f1d2331f48753d008697bc5..38bc793965588cf6fae5149f84ad3cb1a59b0a3c 100644 --- a/advancedsettingswidget.ui +++ b/advancedsettingswidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>688</width> - <height>1197</height> + <height>1273</height> </rect> </property> <property name="windowTitle"> @@ -17,13 +17,6 @@ <string notr="true">background: white;</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="CallSettings"> <property name="styleSheet"> @@ -63,6 +56,11 @@ </property> <item> <widget class="QCheckBox" name="checkBoxUntrusted"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Allow Calls From Untrusted Peers</string> </property> @@ -72,6 +70,11 @@ </item> <item> <widget class="QCheckBox" name="checkBoxAutoAnswer"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Auto Answer Calls</string> </property> @@ -87,6 +90,11 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Enable Custom Ringtone</string> </property> @@ -100,6 +108,11 @@ <height>25</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">background: rgb(248, 248, 248); border-radius: 3px;</string> </property> @@ -135,19 +148,6 @@ </layout> </widget> </item> - <item> - <widget class="Line" name="line_2"> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="NameServer"> <property name="frameShape"> @@ -188,6 +188,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="frameShape"> <enum>QFrame::NoFrame</enum> </property> @@ -223,6 +228,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -233,16 +243,6 @@ </layout> </widget> </item> - <item> - <widget class="Line" name="line_3"> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="OpenDHTConfiguration"> <property name="frameShape"> @@ -288,6 +288,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Enable Proxy</string> </property> @@ -320,6 +325,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -339,6 +349,11 @@ </property> <item> <widget class="QLabel" name="labelBootstrap"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Bootstrap</string> </property> @@ -371,6 +386,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -381,16 +401,6 @@ </layout> </widget> </item> - <item> - <widget class="Line" name="line_4"> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="Security"> <property name="frameShape"> @@ -425,6 +435,11 @@ </property> <item row="3" column="0"> <widget class="QLabel" name="label_21"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Private Key Password</string> </property> @@ -432,6 +447,11 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="label_19"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>User Certificate</string> </property> @@ -451,6 +471,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -461,6 +486,11 @@ </item> <item row="2" column="0"> <widget class="QLabel" name="label_20"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Private Key</string> </property> @@ -468,6 +498,11 @@ </item> <item row="0" column="0"> <widget class="QLabel" name="label_18"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>CA Certificate</string> </property> @@ -489,6 +524,11 @@ <height>25</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="layoutDirection"> <enum>Qt::LeftToRight</enum> </property> @@ -532,6 +572,11 @@ <height>25</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="layoutDirection"> <enum>Qt::LeftToRight</enum> </property> @@ -575,6 +620,11 @@ <height>25</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="layoutDirection"> <enum>Qt::LeftToRight</enum> </property> @@ -613,16 +663,6 @@ </layout> </widget> </item> - <item> - <widget class="Line" name="line_5"> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="Connectivity"> <property name="frameShape"> @@ -657,6 +697,11 @@ </property> <item row="3" column="2"> <widget class="QLineEdit" name="lineEditTurnUsername"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -680,6 +725,11 @@ </item> <item row="2" column="0"> <widget class="QLabel" name="label_13"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string> TURN Address</string> </property> @@ -699,6 +749,11 @@ <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="autoFillBackground"> <bool>false</bool> </property> @@ -709,6 +764,11 @@ </item> <item row="5" column="0"> <widget class="QCheckBox" name="checkBoxSTUNEnable"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Use STUN</string> </property> @@ -716,6 +776,11 @@ </item> <item row="4" column="2"> <widget class="QLineEdit" name="lineEditTurnPsswd"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -723,6 +788,11 @@ </item> <item row="5" column="2"> <widget class="QLineEdit" name="lineEditSTUNAddress"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="styleSheet"> <string notr="true">border-bottom: 1px solid black;</string> </property> @@ -733,6 +803,11 @@ </item> <item row="3" column="0"> <widget class="QLabel" name="label_14"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string> TURN Username</string> </property> @@ -740,6 +815,11 @@ </item> <item row="4" column="0"> <widget class="QLabel" name="label_12"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string> TURN Password</string> </property> @@ -747,6 +827,11 @@ </item> <item row="0" column="0"> <widget class="QCheckBox" name="checkBoxUPnP"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Use UPnP</string> </property> @@ -754,6 +839,11 @@ </item> <item row="1" column="0"> <widget class="QCheckBox" name="checkBoxTurnEnable"> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string>Use TURN</string> </property> @@ -764,16 +854,6 @@ </layout> </widget> </item> - <item> - <widget class="Line" name="line_6"> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="QFrame" name="frame_5"> <property name="frameShape"> @@ -809,11 +889,11 @@ </property> <property name="font"> <font> - <pointsize>10</pointsize> + <pointsize>9</pointsize> </font> </property> <property name="styleSheet"> - <string notr="true">border-bottom: 1px solid black;</string> + <string notr="true"/> </property> <property name="text"> <string>Audio Codecs</string> @@ -850,6 +930,11 @@ <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string/> </property> @@ -879,6 +964,11 @@ <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string/> </property> @@ -944,11 +1034,11 @@ </property> <property name="font"> <font> - <pointsize>10</pointsize> + <pointsize>9</pointsize> </font> </property> <property name="styleSheet"> - <string notr="true">border-bottom: 1px solid black;</string> + <string notr="true"/> </property> <property name="text"> <string>Video Codecs</string> @@ -985,6 +1075,11 @@ <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string/> </property> @@ -1014,6 +1109,11 @@ <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="text"> <string/> </property> diff --git a/callwidget.cpp b/callwidget.cpp index 6cd66fe1aacbf7e8a8ede75462aabd36ad2fef6c..088fb35ef504d1946986bad519600c823a4014e7 100644 --- a/callwidget.cpp +++ b/callwidget.cpp @@ -111,8 +111,6 @@ CallWidget::CallWidget(QWidget* parent) : ui->mainActivitySplitter->setCollapsible(0, false); ui->mainActivitySplitter->setCollapsible(1, false); - ui->splitter->setCollapsible(0, false); - ui->splitter->setCollapsible(1, false); //disable dropdown shadow on combobox ui->currentAccountComboBox->view()->window()->setWindowFlags(Qt::Popup | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint); @@ -221,6 +219,8 @@ CallWidget::CallWidget(QWidget* parent) : setCallPanelVisibility(false); ui->containerWidget->setVisible(false); + + ui->smartListWidget->setStyleSheet("border-right: 2px solid rgb(240, 240, 240);"); } CallWidget::~CallWidget() @@ -850,6 +850,7 @@ CallWidget::showIMOutOfCall(const QModelIndex& nodeIdx) auto convModel = LRCInstance::getCurrentConversationModel(); auto currentConversation = Utils::getConversationFromUid(LRCInstance::getSelectedConvUid(), *convModel); + ui->messageView->clear(); ui->messageView->printHistory(*convModel, currentConversation->interactions, true); @@ -891,9 +892,7 @@ CallWidget::on_ringContactLineEdit_textChanged(const QString& text) void CallWidget::backToWelcomePage() { - qDebug() << "backToWelcomePage"; deselectConversation(); - ui->messageView->hideMessages(); ui->stackedWidget->setCurrentWidget(ui->welcomePage); } @@ -909,7 +908,17 @@ CallWidget::hideMiniSpinner() void CallWidget::on_imBackButton_clicked() { - backToWelcomePage(); + ui->messageView->clear(); + QMetaObject::Connection* const connection = new QMetaObject::Connection; + *connection = connect(ui->messageView, &MessageWebView::messagesCleared, + [this, connection] { + qDebug() << "messagesCleared"; + if (connection) { + QObject::disconnect(*connection); + delete connection; + } + backToWelcomePage(); + }); } void @@ -1225,8 +1234,8 @@ void CallWidget::setCallPanelVisibility(bool visible) { ui->stackedWidget->setCurrentWidget(ui->mainActivityWidget); - ui->callStackWidget->setVisible(visible); ui->imBackButton->setVisible(!visible); ui->btnAudioCall->setVisible(!visible); ui->btnVideoCall->setVisible(!visible); + ui->callStackWidget->setVisible(visible); } diff --git a/callwidget.ui b/callwidget.ui index 44d2dbb4db048b6d41fa82e4384d0d2698097b77..c024671aea0f46654cf22f975b43bf026f961903 100644 --- a/callwidget.ui +++ b/callwidget.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>1350</width> + <width>1440</width> <height>664</height> </rect> </property> @@ -39,599 +39,595 @@ <widget class="QWidget" name="containerWidget" native="true"> <layout class="QGridLayout" name="gridLayout_2"> <property name="leftMargin"> - <number>1</number> + <number>0</number> </property> <property name="topMargin"> - <number>1</number> + <number>0</number> </property> <property name="rightMargin"> - <number>1</number> + <number>0</number> </property> <property name="bottomMargin"> - <number>1</number> + <number>0</number> </property> <property name="spacing"> <number>0</number> </property> <item row="0" column="0"> - <widget class="QSplitter" name="splitter"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="5,16"> + <property name="spacing"> + <number>0</number> </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <property name="topMargin"> + <number>0</number> </property> - <property name="opaqueResize"> - <bool>true</bool> + <property name="rightMargin"> + <number>0</number> </property> - <property name="handleWidth"> - <number>2</number> - </property> - <property name="childrenCollapsible"> - <bool>false</bool> - </property> - <widget class="QWidget" name="widgetSplitterLeft" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>300</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>380</width> - <height>16777215</height> - </size> - </property> - <layout class="QVBoxLayout" name="verticalLayout_9"> - <property name="spacing"> - <number>0</number> - </property> - <property name="sizeConstraint"> - <enum>QLayout::SetMinimumSize</enum> - </property> - <property name="leftMargin"> - <number>0</number> + <item> + <widget class="QWidget" name="sidePanelLayoutWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="topMargin"> - <number>0</number> + <property name="minimumSize"> + <size> + <width>320</width> + <height>0</height> + </size> </property> - <property name="rightMargin"> - <number>0</number> + <property name="maximumSize"> + <size> + <width>380</width> + <height>16777215</height> + </size> </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QWidget" name="sidePanelLayoutWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0"> - <property name="spacing"> - <number>0</number> + <layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0,0"> + <property name="spacing"> + <number>0</number> + </property> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>4</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="CurrentAccountComboBox" name="currentAccountComboBox" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="sizeConstraint"> - <enum>QLayout::SetDefaultConstraint</enum> + <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> + </size> </property> - <property name="leftMargin"> - <number>0</number> + <property name="autoFillBackground"> + <bool>false</bool> </property> - <property name="topMargin"> - <number>4</number> + <property name="styleSheet"> + <string notr="true"/> </property> - <property name="rightMargin"> - <number>0</number> + </widget> + </item> + <item> + <widget class="QWidget" name="selectBar" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="maximumSize"> + <size> + <width>16777214</width> + <height>30</height> + </size> </property> - <item> - <widget class="CurrentAccountComboBox" name="currentAccountComboBox" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>60</height> - </size> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - </widget> - </item> - <item> - <widget class="QWidget" name="selectBar" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>16777214</width> - <height>30</height> - </size> - </property> - <layout class="QHBoxLayout" name="selectBar_layout" stretch="0,0,0"> - <property name="spacing"> - <number>0</number> + <layout class="QHBoxLayout" name="selectBar_layout_3" stretch="0,0,0"> + <property name="spacing"> + <number>0</number> + </property> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </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="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="sizeConstraint"> - <enum>QLayout::SetDefaultConstraint</enum> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="leftMargin"> - <number>0</number> + <property name="sizeHint" stdset="0"> + <size> + <width>10</width> + <height>38</height> + </size> </property> - <property name="topMargin"> - <number>0</number> + </spacer> + </item> + <item> + <widget class="RingContactLineEdit" name="ringContactLineEdit"> + <property name="enabled"> + <bool>true</bool> </property> - <property name="rightMargin"> - <number>0</number> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="minimumSize"> + <size> + <width>266</width> + <height>30</height> + </size> </property> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>10</width> - <height>38</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="RingContactLineEdit" name="ringContactLineEdit"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>266</width> - <height>30</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>244</width> - <height>30</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="cursor"> - <cursorShape>IBeamCursor</cursorShape> - </property> - <property name="toolTip"> - <string>Search contact text input</string> - </property> - <property name="maxLength"> - <number>100</number> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - <property name="placeholderText"> - <string>Search contacts or enter ID</string> - </property> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>10</width> - <height>38</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QWidget" name="smartListWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0"> - <property name="spacing"> - <number>0</number> + <property name="baseSize"> + <size> + <width>244</width> + <height>30</height> + </size> </property> - <property name="leftMargin"> - <number>1</number> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> </property> - <property name="topMargin"> - <number>1</number> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> </property> - <property name="rightMargin"> - <number>0</number> + <property name="toolTip"> + <string>Search contact text input</string> </property> - <property name="bottomMargin"> - <number>1</number> + <property name="maxLength"> + <number>100</number> </property> - <item> - <widget class="ConversationsFilterWidget" name="conversationsFilterWidget" native="true"> - <layout class="QHBoxLayout" name="conversationFilterLayout"> - <property name="spacing"> - <number>10</number> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + <property name="placeholderText"> + <string>Search contacts or enter ID</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>10</width> + <height>38</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="smartListWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="verticalLayout_13" stretch="0,0"> + <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> + <widget class="ConversationsFilterWidget" name="conversationsFilterWidget" native="true"> + <layout class="QHBoxLayout" name="conversationFilterLayout_3"> + <property name="spacing"> + <number>10</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> + <widget class="QPushButton" name="btnConversations"> + <property name="toolTip"> + <string>Show conversations</string> </property> - <property name="leftMargin"> - <number>10</number> + <property name="text"> + <string>Conversations</string> </property> - <property name="topMargin"> - <number>10</number> + <property name="checkable"> + <bool>true</bool> </property> - <property name="rightMargin"> - <number>10</number> + </widget> + </item> + <item> + <widget class="QPushButton" name="btnInvites"> + <property name="toolTip"> + <string>Show invites</string> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="text"> + <string>Invites</string> </property> - <item> - <widget class="QPushButton" name="btnConversations"> - <property name="toolTip"> - <string>Show conversations</string> - </property> - <property name="text"> - <string>Conversations</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="btnInvites"> - <property name="toolTip"> - <string>Show invites</string> - </property> - <property name="text"> - <string>Invites</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_15"> + <property name="spacing"> + <number>0</number> + </property> + <property name="topMargin"> + <number>10</number> + </property> <item> - <layout class="QVBoxLayout" name="verticalLayout_13"> - <property name="spacing"> + <widget class="SmartListView" name="smartList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="autoScrollMargin"> + <number>16</number> + </property> + <property name="indentation"> <number>0</number> </property> - <property name="topMargin"> - <number>10</number> + <property name="rootIsDecorated"> + <bool>false</bool> </property> - <item> - <widget class="SmartListView" name="smartList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="autoScrollMargin"> - <number>16</number> - </property> - <property name="indentation"> - <number>0</number> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="expandsOnDoubleClick"> - <bool>false</bool> - </property> - <attribute name="headerVisible"> - <bool>false</bool> - </attribute> - <attribute name="headerDefaultSectionSize"> - <number>0</number> - </attribute> - <attribute name="headerMinimumSectionSize"> - <number>0</number> - </attribute> - </widget> - </item> - </layout> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="expandsOnDoubleClick"> + <bool>false</bool> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <attribute name="headerDefaultSectionSize"> + <number>0</number> + </attribute> + <attribute name="headerMinimumSectionSize"> + <number>0</number> + </attribute> + </widget> </item> </layout> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="widgetSplitterRight" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_4"> - <property name="sizeConstraint"> - <enum>QLayout::SetNoConstraint</enum> - </property> - <property name="leftMargin"> - <number>0</number> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="mainLayoutWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <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="QWidget" name="mainLayoutWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>0</number> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="sizeConstraint"> + <enum>QLayout::SetMaximumSize</enum> + </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> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="sizeConstraint"> - <enum>QLayout::SetMaximumSize</enum> + <property name="toolTip"> + <string/> </property> - <property name="leftMargin"> - <number>0</number> + <property name="currentIndex"> + <number>1</number> </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QStackedWidget" name="stackedWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QWidget" name="welcomePage"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="verticalLayout_16"> + <property name="spacing"> + <number>0</number> </property> - <property name="toolTip"> - <string/> + <property name="leftMargin"> + <number>0</number> </property> - <property name="currentIndex"> - <number>1</number> + <property name="topMargin"> + <number>0</number> </property> - <widget class="QWidget" name="welcomePage"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QVBoxLayout" name="verticalLayout_15"> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_9"> <property name="spacing"> <number>0</number> </property> - <property name="leftMargin"> - <number>0</number> - </property> <property name="topMargin"> - <number>0</number> + <number>7</number> </property> <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> + <number>7</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <property name="spacing"> - <number>0</number> - </property> - <property name="topMargin"> - <number>7</number> - </property> - <property name="rightMargin"> - <number>7</number> - </property> - <item> - <spacer name="horizontalSpacer_11"> - <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> - <item> - <spacer name="verticalSpacer"> + <spacer name="horizontalSpacer_11"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>40</height> + <width>40</width> + <height>20</height> </size> </property> </spacer> </item> - <item> - <widget class="QLabel" name="ringLogo"> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="ringLogo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>100</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="leftMargin"> + <number>10</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>10</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="descLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>100</width> - <height>100</height> + <width>400</width> + <height>0</height> </size> </property> <property name="maximumSize"> <size> - <width>16777215</width> - <height>100</height> + <width>400</width> + <height>16777215</height> + </size> + </property> + <property name="baseSize"> + <size> + <width>400</width> + <height>0</height> </size> </property> + <property name="font"> + <font> + <pointsize>11</pointsize> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> <property name="text"> - <string/> + <string>Jami is free software for universal communication which respects the freedoms and privacy of its users.</string> </property> - <property name="scaledContents"> - <bool>false</bool> + <property name="textFormat"> + <enum>Qt::PlainText</enum> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> <property name="wordWrap"> - <bool>false</bool> + <bool>true</bool> </property> </widget> </item> + </layout> + </item> + <item> + <widget class="QLabel" name="thisIsYourLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>50</height> + </size> + </property> + <property name="font"> + <font> + <underline>false</underline> + <strikeout>false</strikeout> + <kerning>true</kerning> + </font> + </property> + <property name="styleSheet"> + <string notr="true">color: #aeaeae</string> + </property> + <property name="text"> + <string> + This is your ID. +Copy and share it with your friends! + </string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <property name="topMargin"> + <number>0</number> + </property> <item> - <layout class="QGridLayout" name="gridLayout_3"> - <property name="leftMargin"> - <number>10</number> - </property> - <property name="topMargin"> - <number>0</number> + <spacer name="horizontalSpacer_8"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="rightMargin"> - <number>10</number> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> </property> - <property name="spacing"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="descLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>400</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>400</width> - <height>16777215</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>400</width> - <height>0</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>11</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="text"> - <string>Jami is free software for universal communication which respects the freedoms and privacy of its users.</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> + </spacer> </item> <item> - <widget class="QLabel" name="thisIsYourLabel"> + <widget class="IdLabel" name="ringIdLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -639,1376 +635,1315 @@ <property name="minimumSize"> <size> <width>0</width> - <height>50</height> + <height>0</height> </size> </property> <property name="font"> <font> - <underline>false</underline> - <strikeout>false</strikeout> - <kerning>true</kerning> + <pointsize>14</pointsize> </font> </property> <property name="styleSheet"> - <string notr="true">color: #aeaeae</string> + <string notr="true"/> </property> - <property name="text"> - <string> - This is your ID. -Copy and share it with your friends! - </string> + <property name="frameShape"> + <enum>QFrame::Box</enum> </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> + <property name="lineWidth"> + <number>0</number> + </property> + <property name="text"> + <string notr="true">id</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> - <property name="wordWrap"> - <bool>true</bool> + <property name="margin"> + <number>5</number> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <property name="topMargin"> - <number>0</number> + <spacer name="horizontalSpacer_10"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <item> - <spacer name="horizontalSpacer_8"> - <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="IdLabel" name="ringIdLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>14</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="frameShape"> - <enum>QFrame::Box</enum> - </property> - <property name="lineWidth"> - <number>0</number> - </property> - <property name="text"> - <string notr="true">id</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - <property name="margin"> - <number>5</number> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_10"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>5</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="qrButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" 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>Show ring ID QR code</string> - </property> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/qrcode.png</normaloff>:/images/qrcode.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>18</width> - <height>18</height> - </size> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_12"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>5</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="shareButton"> - <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>Share ring ID button</string> - </property> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_share_black_48dp_2x.png</normaloff>:/images/icons/ic_share_black_48dp_2x.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>18</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_9"> - <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 name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>5</width> + <height>20</height> + </size> + </property> + </spacer> </item> <item> - <widget class="QLabel" name="copyLabel"> + <widget class="QToolButton" name="qrButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>50</width> - <height>0</height> + <width>30</width> + <height>30</height> </size> </property> - <property name="font"> - <font> - <pointsize>8</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color: #aeaeae</string> + <property name="maximumSize"> + <size> + <width>30</width> + <height>30</height> + </size> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> + <property name="toolTip"> + <string>Show ring ID QR code</string> </property> <property name="text"> - <string>Double-click to copy</string> + <string/> </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/qrcode.png</normaloff>:/images/qrcode.png</iconset> </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + <property name="iconSize"> + <size> + <width>18</width> + <height>18</height> + </size> </property> - <property name="wordWrap"> - <bool>false</bool> + <property name="checkable"> + <bool>true</bool> </property> </widget> </item> <item> - <spacer name="verticalSpacer_4"> + <spacer name="horizontalSpacer_12"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>10</height> + <width>5</width> + <height>20</height> </size> </property> </spacer> </item> <item> - <widget class="QLabel" name="qrLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QToolButton" name="shareButton"> + <property name="minimumSize"> + <size> + <width>30</width> + <height>30</height> + </size> </property> - <property name="styleSheet"> - <string notr="true">color: #aeaeae</string> + <property name="maximumSize"> + <size> + <width>30</width> + <height>30</height> + </size> + </property> + <property name="toolTip"> + <string>Share ring ID button</string> </property> <property name="text"> - <string>Error while generating QR Code</string> + <string/> </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_share_black_48dp_2x.png</normaloff>:/images/icons/ic_share_black_48dp_2x.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>18</width> + <height>18</height> + </size> </property> </widget> </item> <item> - <spacer name="verticalSpacer_2"> + <spacer name="horizontalSpacer_9"> <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> + <width>40</width> <height>20</height> </size> </property> </spacer> </item> </layout> - </widget> - <widget class="QWidget" name="mainActivityWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_5"> - <property name="leftMargin"> - <number>0</number> + </item> + <item> + <widget class="QLabel" name="copyLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="topMargin"> - <number>0</number> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> </property> - <property name="rightMargin"> - <number>0</number> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="styleSheet"> + <string notr="true">color: #aeaeae</string> </property> - <property name="spacing"> - <number>0</number> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <item row="0" column="0"> - <widget class="QSplitter" name="mainActivitySplitter"> + <property name="text"> + <string>Double-click to copy</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_4"> + <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>10</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="qrLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true">color: #aeaeae</string> + </property> + <property name="text"> + <string>Error while generating QR Code</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="mainActivityWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <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> + <property name="spacing"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QSplitter" name="mainActivitySplitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="handleWidth"> + <number>2</number> + </property> + <property name="childrenCollapsible"> + <bool>true</bool> + </property> + <widget class="QStackedWidget" name="callStackWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="videoPage"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="handleWidth"> - <number>2</number> - </property> - <property name="childrenCollapsible"> - <bool>true</bool> - </property> - <widget class="QStackedWidget" name="callStackWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <layout class="QGridLayout" name="gridLayout_6"> + <property name="leftMargin"> + <number>0</number> </property> - <property name="currentIndex"> + <property name="topMargin"> <number>0</number> </property> - <widget class="QWidget" name="videoPage"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_6"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> + <property name="rightMargin"> + <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="VideoView" name="videoWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="rightMargin"> - <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="VideoView" name="videoWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="outgoingCallPage"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_7"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="outgoingCallPage"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QGridLayout" name="gridLayout_7"> + <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> + <property name="spacing"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QWidget" name="outgoingCall" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="rightMargin"> - <number>0</number> + <property name="minimumSize"> + <size> + <width>244</width> + <height>420</height> + </size> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="maximumSize"> + <size> + <width>244</width> + <height>16777215</height> + </size> </property> - <property name="spacing"> - <number>0</number> + <property name="baseSize"> + <size> + <width>0</width> + <height>0</height> + </size> </property> - <item row="0" column="0"> - <widget class="QWidget" name="outgoingCall" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>244</width> - <height>420</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>244</width> - <height>16777215</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <layout class="QVBoxLayout" name="spinnerLayout_3"> - <property name="spacing"> - <number>10</number> - </property> - <property name="leftMargin"> + <layout class="QVBoxLayout" name="spinnerLayout_3"> + <property name="spacing"> + <number>10</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_3"> + <property name="bottomMargin"> <number>0</number> </property> - <property name="topMargin"> - <number>0</number> + <item> + <widget class="QLabel" name="callingPhoto"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="baseSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="callingBestNameLabel"> + <property name="font"> + <font> + <family>Segoe UI Emoji</family> + <pointsize>12</pointsize> + </font> </property> - <property name="rightMargin"> - <number>0</number> + <property name="styleSheet"> + <string notr="true">color: rgb(128, 128, 128);</string> + </property> + <property name="text"> + <string>best name</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="callingBestIdLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="styleSheet"> + <string notr="true">color: rgb(174, 174, 174);</string> + </property> + <property name="text"> + <string>best Id</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="spinnerLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <property name="spacing"> + <number>20</number> </property> <property name="bottomMargin"> <number>0</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> <property name="bottomMargin"> <number>0</number> </property> <item> - <widget class="QLabel" name="callingPhoto"> + <widget class="QPushButton" name="cancelButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>166</width> - <height>166</height> + <width>56</width> + <height>56</height> </size> </property> <property name="maximumSize"> <size> - <width>166</width> - <height>166</height> + <width>56</width> + <height>56</height> </size> </property> <property name="baseSize"> <size> - <width>166</width> - <height>166</height> + <width>56</width> + <height>56</height> </size> </property> - <property name="text"> - <string/> + <property name="toolTip"> + <string>Cancel outgoing call</string> </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> </property> </widget> </item> </layout> </item> <item> - <widget class="QLabel" name="callingBestNameLabel"> - <property name="font"> - <font> - <family>Segoe UI Emoji</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color: rgb(128, 128, 128);</string> - </property> - <property name="text"> - <string>best name</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="callingBestIdLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <pointsize>8</pointsize> - </font> - </property> + <widget class="QLabel" name="cancelCallLabel"> <property name="styleSheet"> <string notr="true">color: rgb(174, 174, 174);</string> </property> <property name="text"> - <string>best Id</string> + <string>Cancel</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> - <item> - <widget class="QLabel" name="spinnerLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>20</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string/> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <property name="spacing"> - <number>20</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QPushButton" name="cancelButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>56</width> - <height>56</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>56</width> - <height>56</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>56</width> - <height>56</height> - </size> - </property> - <property name="toolTip"> - <string>Cancel outgoing call</string> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>24</width> - <height>24</height> - </size> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QLabel" name="cancelCallLabel"> - <property name="styleSheet"> - <string notr="true">color: rgb(174, 174, 174);</string> - </property> - <property name="text"> - <string>Cancel</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - </layout> - </item> </layout> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="incomingCallPage"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <layout class="QGridLayout" name="gridLayout_8"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="incomingCallPage"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QGridLayout" name="gridLayout_8"> + <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> + <property name="spacing"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QWidget" name="callInvite" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="rightMargin"> - <number>0</number> + <property name="minimumSize"> + <size> + <width>200</width> + <height>420</height> + </size> </property> - <property name="bottomMargin"> - <number>0</number> + <property name="maximumSize"> + <size> + <width>200</width> + <height>420</height> + </size> </property> - <property name="spacing"> - <number>0</number> + <property name="baseSize"> + <size> + <width>200</width> + <height>420</height> + </size> </property> - <item row="0" column="0"> - <widget class="QWidget" name="callInvite" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>420</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>200</width> - <height>420</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>200</width> - <height>420</height> - </size> - </property> - <layout class="QVBoxLayout" name="callInviteLayout" stretch="0,2,1,2,1,9"> + <layout class="QVBoxLayout" name="callInviteLayout" stretch="0,2,1,2,1,9"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="callerPhoto"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="baseSize"> + <size> + <width>166</width> + <height>166</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_3"> + <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 alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="callerBestNameLabel"> + <property name="font"> + <font> + <family>Segoe UI Emoji</family> + <pointsize>12</pointsize> + </font> + </property> + <property name="styleSheet"> + <string notr="true">color: rgb(128, 128, 128);</string> + </property> + <property name="text"> + <string>best name</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="wantToTalkLabel"> + <property name="styleSheet"> + <string notr="true">color: rgb(174, 174, 174);</string> + </property> + <property name="text"> + <string>Wants to talk to you!</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_5"> + <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>50</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_3" stretch="2"> <property name="spacing"> <number>0</number> </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="callerPhoto"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>166</width> - <height>166</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>166</width> - <height>166</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>166</width> - <height>166</height> - </size> - </property> - <property name="text"> - <string/> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_3"> - <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 alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="callerBestNameLabel"> - <property name="font"> - <font> - <family>Segoe UI Emoji</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color: rgb(128, 128, 128);</string> - </property> - <property name="text"> - <string>best name</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="wantToTalkLabel"> - <property name="styleSheet"> - <string notr="true">color: rgb(174, 174, 174);</string> - </property> - <property name="text"> - <string>Wants to talk to you!</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_5"> - <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>50</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_3" stretch="2"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> <number>0</number> </property> - <property name="rightMargin"> + <property name="topMargin"> <number>0</number> </property> - <property name="bottomMargin"> + <property name="rightMargin"> <number>0</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <property name="spacing"> <number>0</number> </property> - <property name="topMargin"> - <number>0</number> - </property> <property name="rightMargin"> <number>0</number> </property> <item> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <property name="spacing"> - <number>0</number> - </property> - <property name="rightMargin"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="bottomMargin"> <number>0</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <property name="bottomMargin"> - <number>0</number> + <widget class="QPushButton" name="acceptButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <item> - <widget class="QPushButton" name="acceptButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>56</width> - <height>56</height> - </size> - </property> - <property name="toolTip"> - <string>Answer incoming call button</string> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_done_white_24dp.png</normaloff>:/images/icons/ic_done_white_24dp.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>24</width> - <height>24</height> - </size> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QLabel" name="acceptLabel"> - <property name="styleSheet"> - <string notr="true">color: rgb(174, 174, 174);</string> + <property name="minimumSize"> + <size> + <width>56</width> + <height>56</height> + </size> </property> - <property name="text"> - <string>Answer</string> + <property name="toolTip"> + <string>Answer incoming call button</string> </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_done_white_24dp.png</normaloff>:/images/icons/ic_done_white_24dp.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> </property> </widget> </item> </layout> </item> <item> - <spacer name="horizontalSpacer_21"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <widget class="QLabel" name="acceptLabel"> + <property name="styleSheet"> + <string notr="true">color: rgb(174, 174, 174);</string> </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> + <property name="text"> + <string>Answer</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> - </spacer> + </widget> </item> + </layout> + </item> + <item> + <spacer name="horizontalSpacer_21"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <property name="spacing"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <layout class="QVBoxLayout" name="verticalLayout_7"> - <property name="spacing"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QPushButton" name="refuseButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>56</width> - <height>56</height> - </size> - </property> - <property name="toolTip"> - <string>Ignore incoming call button</string> - </property> - <property name="layoutDirection"> - <enum>Qt::RightToLeft</enum> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>24</width> - <height>24</height> - </size> - </property> - </widget> - </item> - </layout> - </item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> <item> - <widget class="QLabel" name="refuseLabel"> + <widget class="QPushButton" name="refuseButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>56</width> + <height>56</height> + </size> + </property> + <property name="toolTip"> + <string>Ignore incoming call button</string> + </property> <property name="layoutDirection"> <enum>Qt::RightToLeft</enum> </property> - <property name="styleSheet"> - <string notr="true">color: rgb(174, 174, 174);</string> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset> </property> - <property name="text"> - <string>Ignore</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> </property> </widget> </item> </layout> </item> + <item> + <widget class="QLabel" name="refuseLabel"> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="styleSheet"> + <string notr="true">color: rgb(174, 174, 174);</string> + </property> + <property name="text"> + <string>Ignore</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> </layout> </item> </layout> </item> </layout> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </widget> + <widget class="QWidget" name="messagesWidget" native="true"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>460</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <layout class="QVBoxLayout" name="verticalLayout_8"> + <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> + <widget class="QWidget" name="messagingHeaderWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>60</height> + </size> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_10"> + <property name="spacing"> + <number>6</number> + </property> + <property name="leftMargin"> + <number>14</number> + </property> + <property name="topMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>14</number> + </property> + <property name="bottomMargin"> + <number>6</number> + </property> + <item> + <widget class="QPushButton" name="imBackButton"> + <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>Back to homepage button</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_arrow_back_24px.svg</normaloff>:/images/icons/ic_arrow_back_24px.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>18</width> + <height>18</height> + </size> + </property> + <property name="flat"> + <bool>false</bool> + </property> </widget> </item> - </layout> - </widget> - </widget> - <widget class="QWidget" name="messagesWidget" native="true"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>358</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>16777215</height> - </size> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <layout class="QVBoxLayout" name="verticalLayout_8"> - <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> - <widget class="QWidget" name="messagingHeaderWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>60</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>60</height> - </size> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_10"> + <item> + <layout class="QVBoxLayout" name="verticalLayout_17"> <property name="spacing"> - <number>6</number> + <number>0</number> </property> <property name="leftMargin"> - <number>14</number> - </property> - <property name="topMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>14</number> + <number>0</number> </property> <property name="bottomMargin"> - <number>6</number> + <number>0</number> </property> <item> - <widget class="QPushButton" name="imBackButton"> + <widget class="QLabel" name="imNameLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>30</width> - <height>30</height> + <width>200</width> + <height>0</height> </size> </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>30</height> - </size> + <property name="font"> + <font> + <pointsize>11</pointsize> + <weight>50</weight> + <bold>false</bold> + </font> </property> - <property name="toolTip"> - <string>Back to homepage button</string> + <property name="styleSheet"> + <string notr="true">color: rgb(63,63,63);</string> </property> <property name="text"> <string/> </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_arrow_back_24px.svg</normaloff>:/images/icons/ic_arrow_back_24px.svg</iconset> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> - <property name="iconSize"> - <size> - <width>18</width> - <height>18</height> - </size> - </property> - <property name="flat"> + <property name="wordWrap"> <bool>false</bool> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_16"> - <property name="spacing"> - <number>0</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QLabel" name="imNameLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>11</pointsize> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color: rgb(63,63,63);</string> - </property> - <property name="text"> - <string/> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="imIdLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color: rgb(192,192,192);</string> - </property> - <property name="text"> - <string/> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_6"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <spacer name="horizontalSpacer_13"> - <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="btnAudioCall"> - <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="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_phone_24px.svg</normaloff>:/images/icons/ic_phone_24px.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>18</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="btnVideoCall"> - <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="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="ressources.qrc"> - <normaloff>:/images/icons/ic_video_call_24px.svg</normaloff>:/images/icons/ic_video_call_24px.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>18</width> - <height>18</height> - </size> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="sendContactRequestButton"> + <widget class="QLabel" name="imIdLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>30</width> - <height>30</height> + <width>200</width> + <height>0</height> </size> </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>30</height> - </size> - </property> - <property name="toolTip"> - <string>Add to contacts</string> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> </property> <property name="styleSheet"> - <string notr="true"/> + <string notr="true">color: rgb(192,192,192);</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 name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </property> </widget> </item> </layout> - </widget> - </item> - <item> - <widget class="QWidget" name="messageViewLayoutWidget" native="true"> - <layout class="QHBoxLayout" name="messagesHBoxLayout" stretch="0,0,0"> - <property name="spacing"> - <number>0</number> + </item> + <item> + <spacer name="verticalSpacer_6"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="leftMargin"> - <number>1</number> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="topMargin"> - <number>1</number> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>40</height> + </size> </property> - <property name="rightMargin"> - <number>1</number> + </spacer> + </item> + <item> + <spacer name="horizontalSpacer_13"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="bottomMargin"> - <number>1</number> + <property name="sizeType"> + <enum>QSizePolicy::MinimumExpanding</enum> </property> - <item> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="MessageWebView" name="messageView"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>1000</width> - <height>16777215</height> - </size> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_14"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="btnAudioCall"> + <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="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_phone_24px.svg</normaloff>:/images/icons/ic_phone_24px.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>18</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="btnVideoCall"> + <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="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="ressources.qrc"> + <normaloff>:/images/icons/ic_video_call_24px.svg</normaloff>:/images/icons/ic_video_call_24px.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>18</width> + <height>18</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="sendContactRequestButton"> + <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>Add to contacts</string> + </property> + <property name="styleSheet"> + <string notr="true"/> + </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> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="messageViewLayoutWidget" native="true"> + <layout class="QHBoxLayout" name="messagesHBoxLayout" stretch="0,0,0"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>1</number> + </property> + <property name="topMargin"> + <number>1</number> + </property> + <property name="rightMargin"> + <number>1</number> + </property> + <property name="bottomMargin"> + <number>1</number> + </property> + <item> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="MessageWebView" name="messageView"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>1000</width> + <height>16777215</height> + </size> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_14"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -2027,16 +1962,21 @@ Copy and share it with your friends! <header>videoview.h</header> <container>1</container> </customwidget> - <customwidget> - <class>RingContactLineEdit</class> - <extends>QLineEdit</extends> - <header>ringcontactlineedit.h</header> - </customwidget> <customwidget> <class>IdLabel</class> <extends>QLabel</extends> <header>idlabel.h</header> </customwidget> + <customwidget> + <class>MessageWebView</class> + <extends>QWebEngineView</extends> + <header>messagewebview.h</header> + </customwidget> + <customwidget> + <class>RingContactLineEdit</class> + <extends>QLineEdit</extends> + <header>ringcontactlineedit.h</header> + </customwidget> <customwidget> <class>SmartListView</class> <extends>QTreeView</extends> @@ -2053,11 +1993,6 @@ Copy and share it with your friends! <extends>QWidget</extends> <header>currentaccountcombobox.h</header> </customwidget> - <customwidget> - <class>MessageWebView</class> - <extends>QWebEngineView</extends> - <header>messagewebview.h</header> - </customwidget> </customwidgets> <resources> <include location="ressources.qrc"/> diff --git a/conversationitemdelegate.cpp b/conversationitemdelegate.cpp index 9bc78f22ff008a286956e81a243d1941b7ae7cf6..8de9adb74fdc4ab2cce5ed9f93d496b6c24e1549 100644 --- a/conversationitemdelegate.cpp +++ b/conversationitemdelegate.cpp @@ -184,13 +184,13 @@ ConversationItemDelegate::paintRingConversationItem(QPainter* painter, QRect rectName1(rect.left() + leftMargin, rect.top() + topMargin, - rect.width() - leftMargin - infoTextWidth_ - infoTextWidthModifier, + rect.width() - leftMargin - infoTextWidth_ - infoTextWidthModifier - 2, rect.height() / 2 - 2); QRect rectName2(rectName1.left(), - rectName1.top() + rectName1.height(), + rectName1.top() + rectName1.height() - infoText2HeightModifier, rectName1.width(), - rectName1.height() - bottomMargin); + rectName1.height() - bottomMargin + infoText2HeightModifier); QRect rectInfo1(rectName1.left() + rectName1.width(), rect.top() + topMargin, @@ -269,6 +269,7 @@ ConversationItemDelegate::paintRingConversationItem(QPainter* painter, emojiMsgFont.setItalic(false); emojiMsgFont.setBold(false); emojiMsgFont.setPointSize(scalingRatio > 1.0 ? fontSize_ - 2 : fontSize_); + rectInfo2.setTop(rectInfo2.top() - 6); painter->setOpacity(0.7); painter->setFont(emojiMsgFont); } diff --git a/currentaccountcombobox.cpp b/currentaccountcombobox.cpp index 30b515646d978bcf95e4da14ff6b424d158eb538..6cbc2c8a6b89b16db5a4b647ec9666b67262f51b 100644 --- a/currentaccountcombobox.cpp +++ b/currentaccountcombobox.cpp @@ -140,7 +140,7 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e) } if (QWidget* popupWidget = this->findChild<QFrame*>()) { - popupWidget->setStyleSheet("QFrame{border: 0px;border-bottom: 1px solid #f0f0f0;}"); + popupWidget->setStyleSheet("QFrame{border: 0px;border-bottom: 1px solid #f0f0f0;border-right: 1px solid #f0f0f0; }"); } } diff --git a/messagewebview.cpp b/messagewebview.cpp index 48be477e6c660ea63d6ef21d9ac99a3d03eaa053..dd9d3537d412357e785e063ba281c0933f6d44e6 100644 --- a/messagewebview.cpp +++ b/messagewebview.cpp @@ -228,12 +228,24 @@ MessageWebView::setInvitation(bool show, const std::string& contactUri, const st } void -MessageWebView::hideMessages() +MessageWebView::setMessagesVisibility(bool visible) { - QString s = QString::fromLatin1("hideBody();"); + QString s = QString::fromLatin1(visible ? "showMessagesDiv();" : "hideMessagesDiv();"); page()->runJavaScript(s, QWebEngineScript::MainWorld); } +void +MessageWebView::hideEvent(QHideEvent*) +{ + setMessagesVisibility(false); +} + +void +MessageWebView::showEvent(QShowEvent*) +{ + setMessagesVisibility(true); +} + // JS bridging incoming Q_INVOKABLE int PrivateBridging::log(const QString& arg) @@ -242,6 +254,15 @@ PrivateBridging::log(const QString& arg) return 0; } +Q_INVOKABLE int +PrivateBridging::messagesCleared() +{ + if (auto messageView = qobject_cast<MessageWebView*>(this->parent())) { + emit messageView->messagesCleared(); + } + return 0; +} + Q_INVOKABLE int PrivateBridging::deleteInteraction(const QString& arg) { diff --git a/messagewebview.h b/messagewebview.h index 3096cf7d871df2ab56e43589d66885353797c9d4..75c584e8d2c91aebc977f092a3d39416c99d7152 100644 --- a/messagewebview.h +++ b/messagewebview.h @@ -42,6 +42,7 @@ public: Q_INVOKABLE int acceptInvitation(); Q_INVOKABLE int refuseInvitation(); Q_INVOKABLE int blockConversation(); + Q_INVOKABLE int messagesCleared(); }; class MessageWebView : public QWebEngineView @@ -74,10 +75,15 @@ public: void setInvitation(bool show, const std::string& contactUri = "", const std::string& contactId = ""); - void hideMessages(); + void setMessagesVisibility(bool visible); + +protected: + void hideEvent(QHideEvent*); + void showEvent(QShowEvent*); signals: void conversationRemoved(); + void messagesCleared(); private slots: void slotLoadFinished(); diff --git a/photoboothwidget.cpp b/photoboothwidget.cpp index df348b5589713bcffaf19a2b37b0c8b8363404c9..2644d97781507f58053c75f9f17b767ddb4b6bfc 100644 --- a/photoboothwidget.cpp +++ b/photoboothwidget.cpp @@ -29,7 +29,6 @@ #include "utils.h" #include "lrcinstance.h" - PhotoboothWidget::PhotoboothWidget(QWidget *parent) : QWidget(parent), fileName_(""), @@ -91,7 +90,7 @@ PhotoboothWidget::on_importButton_clicked() auto picturesDir = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first(); fileName_ = QFileDialog::getOpenFileName(this, tr("Choose File"), picturesDir, - tr("Image Files (*.jpg, *.jpeg, *png)")); + tr("Image Files (*.jpg, *.jpeg, *.png)")); if (fileName_.isEmpty()) { Video::PreviewManager::instance().startPreview(); return; diff --git a/settingswidget.cpp b/settingswidget.cpp index e8016b1f432914c52676cb4af5348e82c8cf24e7..1a317dfe95648c30217d1a0509ae7a023de4aa8c 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -47,7 +47,6 @@ #include "deleteaccountdialog.h" #include "ui_deleteaccountdialog.h" - // general Settings #include "winsparkle.h" #include "media/recordingmodel.h" @@ -83,12 +82,10 @@ SettingsWidget::SettingsWidget(QWidget* parent) ui->exitSettingsButton->setIconSize(QSize(24, 24)); ui->exitSettingsButton->setIcon(QPixmap(":/images/icons/round-close-24px.svg")); - // display name (aka alias) ui->displayNameLineEdit->setAlignment(Qt::AlignHCenter); ui->displayNameLineEdit->setPlaceholderText(tr("Enter the displayed name")); - setSelected(Button::accountSettingsButton); ui->currentRegisteredID->setReadOnly(true); @@ -106,18 +103,18 @@ SettingsWidget::SettingsWidget(QWidget* parent) ui->currentAccountAvatar->setMask(avatarClickableRegion); QString styleS( - "QPushButton{" - " background-color: rgb(245, 245, 245);" - " border: 0px;" + "QPushButton {" + " background-color: white;" + " border-right: 1px solid #f0f0f0;" "}" - " QPushButton:hover{" - " background-color: rgb(250, 250, 250);" - " border: 0px;" + " QPushButton:hover {" + " background-color: rgb(245, 245, 245);" + " border-right: 1px solid #f0f0f0;" " }" - "QPushButton:checked{" - " background-color: white;" - " border: 0px;" + "QPushButton:checked {" + " background-color: rgb(237, 237, 237);" + " border-right: 1px solid #f0f0f0;" "}" ); @@ -332,7 +329,8 @@ SettingsWidget::avatarClicked() SetAvatarDialog avatarDialog(this); // return new avatar pixmap from setAvatarDialog - connect(&avatarDialog, &SetAvatarDialog::pixmapSignal, [&](const std::string& pixString) { + connect(&avatarDialog, &SetAvatarDialog::pixmapSignal, + [this](const std::string& pixString) { if (!pixString.empty()) { LRCInstance::setCurrAccAvatar(pixString); updateAccountInfoDisplayed(); @@ -734,7 +732,6 @@ SettingsWidget::setConnections() connect(ui->recordPathButton, &QPushButton::clicked, this, &SettingsWidget::openRecordFolderSlot); } - // ************************* General Settings ************************* void SettingsWidget::populateGeneralSettings() @@ -843,7 +840,6 @@ SettingsWidget::openRecordFolderSlot() } } - // ************************* Audio/Visual Settings ************************* void @@ -887,7 +883,6 @@ SettingsWidget::populateAVSettings() showPreview(); } - void SettingsWidget::saveSizeIndex() { diff --git a/settingswidget.ui b/settingswidget.ui index 66df373cd2a09753ee040320e047cbbdf8944d3e..73e30a2a3e2373229b0c3cace11f43e2a85db176 100644 --- a/settingswidget.ui +++ b/settingswidget.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>898</width> - <height>647</height> + <width>896</width> + <height>682</height> </rect> </property> <property name="windowTitle"> @@ -77,7 +77,7 @@ </size> </property> <property name="styleSheet"> - <string notr="true">background: rgb(245, 245,245);</string> + <string notr="true"/> </property> <layout class="QVBoxLayout" name="leftVerticalLayout" stretch="0,0,0,1,0,0,0,5"> <property name="spacing"> @@ -139,7 +139,7 @@ <widget class="QLabel" name="label_10"> <property name="font"> <font> - <pointsize>14</pointsize> + <pointsize>12</pointsize> <underline>false</underline> </font> </property> @@ -241,7 +241,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>12</pointsize> + <pointsize>11</pointsize> + <weight>50</weight> + <bold>false</bold> </font> </property> <property name="mouseTracking"> @@ -283,7 +285,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>12</pointsize> + <pointsize>11</pointsize> + <weight>50</weight> + <bold>false</bold> </font> </property> <property name="mouseTracking"> @@ -325,7 +329,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>12</pointsize> + <pointsize>11</pointsize> + <weight>50</weight> + <bold>false</bold> </font> </property> <property name="mouseTracking"> @@ -415,10 +421,10 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </size> </property> <property name="styleSheet"> - <string notr="true">background: white;</string> + <string notr="true"/> </property> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="generalSettings"> <property name="sizePolicy"> @@ -513,7 +519,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <widget class="QLabel" name="label_4"> <property name="font"> <font> - <pointsize>13</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="text"> @@ -572,6 +578,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <item> <widget class="QCheckBox" name="closeOrMinCheckBox"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="font"> <font> <pointsize>10</pointsize> @@ -609,7 +618,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <item> <layout class="QHBoxLayout" name="horizontalLayout_22"> <property name="leftMargin"> - <number>50</number> + <number>40</number> </property> <property name="topMargin"> <number>0</number> @@ -653,6 +662,12 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <height>30</height> </size> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> + </size> + </property> <property name="styleSheet"> <string notr="true">QPushButton {background: rgb(245, 245, 245); border: 0px; border-radius: 3px; padding: 5px;} QPushButton:hover {background: rgb(237,237, 237); border: 0px; border-radius: 3px;} @@ -660,7 +675,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </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> <property name="iconSize"> <size> @@ -696,7 +711,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <widget class="QLabel" name="label_2"> <property name="font"> <font> - <pointsize>12</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="text"> @@ -725,7 +740,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <item> <layout class="QHBoxLayout" name="horizontalLayout_29"> <property name="leftMargin"> - <number>50</number> + <number>40</number> </property> <property name="topMargin"> <number>5</number> @@ -782,7 +797,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </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> <property name="iconSize"> <size> @@ -797,15 +812,21 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <item> <layout class="QHBoxLayout" name="horizontalLayout_30"> <property name="leftMargin"> - <number>20</number> + <number>40</number> </property> <item> <widget class="QCheckBox" name="alwaysRecordingCheckBox"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="font"> <font> <pointsize>10</pointsize> </font> </property> + <property name="styleSheet"> + <string notr="true">color: rgb(77, 77, 77);</string> + </property> <property name="text"> <string>Always Recording</string> </property> @@ -832,7 +853,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <widget class="QLabel" name="label_6"> <property name="font"> <font> - <pointsize>12</pointsize> + <pointsize>11</pointsize> </font> </property> <property name="text"> @@ -899,6 +920,11 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <height>16777215</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="toolTip"> <string>Interval between update checks in days selector</string> </property> @@ -947,6 +973,12 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <height>30</height> </size> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> + </size> + </property> <property name="font"> <font> <pointsize>9</pointsize> @@ -1087,8 +1119,8 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <rect> <x>0</x> <y>0</y> - <width>691</width> - <height>647</height> + <width>696</width> + <height>682</height> </rect> </property> <property name="styleSheet"> @@ -1282,6 +1314,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> + <pointsize>9</pointsize> <stylestrategy>PreferAntialias</stylestrategy> </font> </property> @@ -1399,9 +1432,8 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>8</pointsize> - <weight>50</weight> - <bold>false</bold> + <pointsize>9</pointsize> + <stylestrategy>PreferDefault</stylestrategy> </font> </property> <property name="layoutDirection"> @@ -1466,7 +1498,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>8</pointsize> + <pointsize>9</pointsize> </font> </property> <property name="text"> @@ -1525,7 +1557,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>8</pointsize> + <pointsize>9</pointsize> <stylestrategy>PreferAntialias</stylestrategy> </font> </property> @@ -1576,7 +1608,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </property> <property name="font"> <font> - <pointsize>8</pointsize> + <pointsize>9</pointsize> </font> </property> <property name="text"> @@ -1876,9 +1908,9 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: </font> </property> <property name="styleSheet"> - <string notr="true">QPushButton {background: rgb(245, 245, 245); border: 0px; border-radius: 3px;} -QPushButton:hover {background: rgb(237,237, 237); border: 0px; border-radius: 3px;} -QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: 3px;}</string> + <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245); +padding: 5px; +</string> </property> <property name="text"> <string>Change Password</string> @@ -1948,8 +1980,15 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <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: #e8f5e9;</string> + <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245); +padding: 5px; +</string> </property> <property name="text"> <string>Export Account</string> @@ -1967,8 +2006,15 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <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:#ffebee;</string> + <string notr="true">border: 0px; border-radius: 3px; background: rgb(245, 245, 245); +padding: 5px; +</string> </property> <property name="text"> <string>Delete Account</string> @@ -2120,6 +2166,11 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius: <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; @@ -2194,15 +2245,20 @@ padding: 5px; <property name="minimumSize"> <size> <width>120</width> - <height>25</height> + <height>30</height> </size> </property> <property name="maximumSize"> <size> <width>180</width> - <height>25</height> + <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="layoutDirection"> <enum>Qt::RightToLeft</enum> </property> @@ -2320,6 +2376,11 @@ padding-left: 15px; <height>30</height> </size> </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> <property name="layoutDirection"> <enum>Qt::RightToLeft</enum> </property> diff --git a/stylesheet.css b/stylesheet.css index 061e308cf3c9a22b4daae02b44e9bd0ec012cd7c..eb623981eb664a54db4ff4375bf79d3c8b0c4b5d 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -32,7 +32,16 @@ QPushButton#refuseButton:pressed, QPushButton#cancelButton:pressed{ background-color: #db3c30; } -QPushButton#btnConversations, QPushButton#btnInvites { +QPushButton { + background-color: rgb(242, 242, 242); + border-style: solid; + border-width: 0px; + border-radius: 15px; + color: rgb(32, 32, 32); +} + +QPushButton#btnConversations, QPushButton#btnInvites, +QPushButton#btnExportAccount, QPushButton#btnDeletAccount { background-color: rgb(242, 242, 242); border-style: solid; border-width: 0px; @@ -41,15 +50,18 @@ QPushButton#btnConversations, QPushButton#btnInvites { color: rgb(32, 32, 32); } -QPushButton#btnConversations:hover, QPushButton#btnInvites:hover { +QPushButton#btnConversations:hover, QPushButton#btnInvites:hover, +QPushButton#btnExportAccount:hover, QPushButton#btnDeletAccount:hover { background-color: rgb(237, 237, 237); } -QPushButton#btnConversations:pressed, QPushButton#btnInvites:pressed { +QPushButton#btnConversations:pressed, QPushButton#btnInvites:pressed, +QPushButton#btnExportAccount:pressed, QPushButton#btnDeletAccount:pressed { background-color: rgb(212, 212, 212); } -QPushButton#btnConversations:checked, QPushButton#btnInvites:checked { +QPushButton#btnConversations:checked, QPushButton#btnInvites:checked, +QPushButton#btnExportAccount:checked, QPushButton#btnDeletAccount:checked { background-color: rgb(237, 237, 237); } @@ -172,6 +184,10 @@ QWidget#messagingHeaderWidget { border-bottom: 2px solid rgb(240, 240, 240); } +QWidget#sidePanelLayoutWidget, QWidget#leftSettingsWidget { + border-right: 2px solid rgb(240, 240, 240); +} + QWidget#messageViewLayoutWidget, QWidget#welcomePage { background-color: rgba(255, 255, 255, 255); } diff --git a/utils.cpp b/utils.cpp index 32b15fe1cc9fa6213a46fd00a85bc9c09c6e2c28..cb80f03dc6600f53ef7e2aeb230ae111b4d12865 100644 --- a/utils.cpp +++ b/utils.cpp @@ -358,6 +358,16 @@ Utils::formatTimeString(const std::time_t& timestamp) } } +const lrc::api::conversation::Info* +Utils::getConversationPtrFromUid(const std::string& uid, const lrc::api::ConversationModel& model) { + auto currentConversation = Utils::getConversationFromUid(LRCInstance::getSelectedConvUid(), model); + auto conversations = model.allFilteredConversations(); + if (currentConversation == conversations.end()) { + return nullptr; + } + return &(conversations[std::distance(model.allFilteredConversations().begin(), currentConversation)]); +} + lrc::api::ConversationModel::ConversationQueue::const_iterator Utils::getConversationFromUid(const std::string& uid, const lrc::api::ConversationModel& model) { return std::find_if(model.allFilteredConversations().begin(), model.allFilteredConversations().end(), diff --git a/utils.h b/utils.h index ce521877b25ce488a76fc8d0b4a2b729e88c2d53..4e4125e53d718b6c18229cf7aa5105c18929906a 100644 --- a/utils.h +++ b/utils.h @@ -71,6 +71,7 @@ namespace Utils std::string secondBestNameForAccount(const lrc::api::account::Info& account); // returns empty string if only infoHash is available lrc::api::profile::Type profileType(const lrc::api::conversation::Info & conv, const lrc::api::ConversationModel & model); std::string formatTimeString(const std::time_t& timestamp); + const lrc::api::conversation::Info * getConversationPtrFromUid(const std::string & uid, const lrc::api::ConversationModel & model); lrc::api::ConversationModel::ConversationQueue::const_iterator getConversationFromUid(const std::string& uid, const lrc::api::ConversationModel& model); lrc::api::ConversationModel::ConversationQueue::const_iterator getConversationFromUri(const std::string& uri, const lrc::api::ConversationModel& model); bool isInteractionGenerated(const lrc::api::interaction::Type& interaction); diff --git a/web/chatview.css b/web/chatview.css index b571d4c17cc2fc86181c0300782e8cf14e3b920c..8883c6eb0bb5829c4b3794236d52d1442ffadb7b 100644 --- a/web/chatview.css +++ b/web/chatview.css @@ -55,14 +55,8 @@ body { padding-bottom: var(--messagebar-size); /* disable selection highlight because it looks very bad */ -webkit-user-select: none; - opacity: 1; - transition: 0.5s opacity; -} - body.fade { - opacity: 0; - transition: none; - } +} ::-webkit-scrollbar-track { background-color: var(--bg-color); @@ -77,7 +71,6 @@ body { background-color: #f0f0f0; } - /** Navbar */ .navbar-wrapper { @@ -335,8 +328,15 @@ a:hover { overflow: hidden; height: auto; padding-top: 0.5em; + opacity: 1; + transition: 0.5s opacity; } + #messages.fade { + opacity: 0; + transition: none; + } + #messages:hover { overflow-y: overlay; } @@ -487,7 +487,6 @@ a:hover { border-radius: 20px 4px 20px 20px; } - .first_of_sequence.message_out .message_wrapper { border-radius: 20px 20px 4px 20px; } diff --git a/web/chatview.js b/web/chatview.js index 8a294883215848b35f2e6b7bf7b6b7bfeef6ee76..c9d42d717289ff16694d703f5a7e6c13bfdd0d51 100644 --- a/web/chatview.js +++ b/web/chatview.js @@ -41,6 +41,7 @@ var isBanned = false var isAccountEnabled = true var isInitialLoading = false var imagesLoadingCounter = 0 +var canLazyLoad = false; /* Set the default target to _self and handle with QWebEnginePage::acceptNavigationRequest */ var linkifyOptions = { @@ -68,6 +69,8 @@ new QWebChannel(qt.webChannelTransport, function(channel) { }); function onScrolled_() { + if (!canLazyLoad) + return; if (messages.scrollTop == 0 && historyBufferIndex != historyBuffer.length) { /* At the top and there's something to print */ printHistoryPart(messages, messages.scrollHeight) @@ -198,7 +201,6 @@ function process_messagebar_keydown(key) { return true } - /** * Disable or enable textarea. * @@ -290,6 +292,9 @@ function clearMessages() while (messages.firstChild) { messages.removeChild(messages.firstChild) } + canLazyLoad = false + + window.jsbridge.messagesCleared() } /** @@ -303,7 +308,6 @@ function escapeHtml(html) return div.innerHTML } - /** * Get the youtube video id from a URL. * @param url @@ -544,7 +548,6 @@ function updateFileInteraction(message_div, message_object, forceTypeToFile = fa var message_id = message_object["id"] var message_text = message_object["text"] - if (isImage(message_text) && message_delivery_status === "finished" && displayLinksEnabled && !forceTypeToFile) { // Replace the old wrapper by the downloaded image var old_wrapper = message_div.querySelector(".internal_mes_wrapper") @@ -1381,6 +1384,8 @@ function on_image_load_finished() { * available in the DOM. */ function check_lazy_loading() { + if (!canLazyLoad) + return; if (messages.scrollHeight < initialScrollBufferFactor * messages.clientHeight && historyBufferIndex !== historyBuffer.length) { /* Not enough messages loaded, print a new batch. Enable isInitialLoading @@ -1408,7 +1413,6 @@ function printHistoryPart(messages_div, fixedAt) if (historyBufferIndex === historyBuffer.length) { return } - /* If first element is a spinner, remove it */ if (messages_div.firstChild && messages_div.firstChild.id === "lazyloading-icon") { messages_div.removeChild(messages_div.firstChild) @@ -1462,10 +1466,17 @@ function printHistoryPart(messages_div, fixedAt) } } -function hideBody() +function hideMessagesDiv() +{ + if (!messages.classList.contains('fade')) { + messages.classList.add('fade'); + } +} + +function showMessagesDiv() { - if (!document.body.classList.contains('fade')) { - document.body.classList.add('fade'); + if (messages.classList.contains('fade')) { + messages.classList.remove('fade'); } } @@ -1481,9 +1492,8 @@ function hideBody() /* exported printHistory */ function printHistory(messages_array, fadein = false) { - if (fadein) { - hideBody() - } + if(fadein) + hideMessagesDiv() historyBuffer = messages_array historyBufferIndex = 0 @@ -1492,9 +1502,10 @@ function printHistory(messages_array, fadein = false) printHistoryPart(messages, 0) isInitialLoading = false - if (fadein) { - document.body.classList.remove('fade'); - } + canLazyLoad = true + + if(fadein) + showMessagesDiv() } /**