Commit 37ccc1c3 authored by Isa's avatar Isa Committed by Andreas Traczyk

ui: move settings button to combobox

Change-Id: I8d09e0db39073e46fea4aee432913fb758e904e8
Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 912242e7
......@@ -8,4 +8,7 @@ x86/
.qmake.stash
debug/
release/
qrencode-win32/
\ No newline at end of file
qrencode-win32/
*.dll
.gitignore
*.ps1
......@@ -81,8 +81,9 @@ SOURCES += main.cpp\
accountlistmodel.cpp \
messagemodel.cpp \
invitebuttonswidget.cpp \
wizardwidget.cpp \
currentaccountcombobox.cpp
wizardwidget.cpp \
currentaccountcombobox.cpp \
conversationfilterbutton.cpp
HEADERS += mainwindow.h \
callwidget.h \
......@@ -127,8 +128,10 @@ HEADERS += mainwindow.h \
accountlistmodel.h \
messagemodel.h \
invitebuttonswidget.h \
wizardwidget.h \
currentaccountcombobox.h
wizardwidget.h \
currentaccountcombobox.h \
conversationfilterbutton.h
contains(DEFINES, URI_PROTOCOL) {
HEADERS += shmclient.h
......@@ -155,7 +158,7 @@ FORMS += mainwindow.ui \
bannedcontactswidget.ui \
photoboothwidget.ui \
invitebuttonswidget.ui \
wizardwidget.ui
wizardwidget.ui
win32: LIBS += -lole32 -luuid -lshlwapi -lgdi32
LIBS += -lqrencode
......
......@@ -4,6 +4,7 @@
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
......@@ -120,7 +121,7 @@ CallWidget::CallWidget(QWidget* parent) :
setupOutOfCallIM();
// connections
connect(ui->settingsButton, &QPushButton::clicked,
connect(ui->currentAccountComboBox, &CurrentAccountComboBox::settingsButtonClicked,
this, &CallWidget::settingsButtonClicked);
connect(ui->videoWidget, SIGNAL(setChatVisibility(bool)),
......@@ -168,8 +169,19 @@ CallWidget::CallWidget(QWidget* parent) :
connect(ui->btnVideoCall, &QPushButton::clicked,
this, &CallWidget::on_sendContactRequestButton_clicked);
// connect conversation filter buttons to act as radio buttons
connect(ui->buttonInvites, &ConversationFilterButton::clicked, ui->buttonConversations, &ConversationFilterButton::setUnselected);
connect(ui->buttonConversations, &ConversationFilterButton::clicked, ui->buttonInvites, &ConversationFilterButton::setUnselected);
connect(ui->currentAccountComboBox, QOverload<int>::of(&CurrentAccountComboBox::currentIndexChanged),
[this] {
ui->buttonConversations->setSelected();
ui->buttonInvites->setUnselected();
});
// set first view to welcome view
ui->stackedWidget->setCurrentWidget(ui->welcomePage);
ui->buttonConversations->setSelected();
}
CallWidget::~CallWidget()
......@@ -598,8 +610,8 @@ void CallWidget::slotShowIncomingCallView(const std::string& accountId,
}
ui->videoWidget->pushRenderer(convInfo.callId);
ui->instantMessagingWidget->setupCallMessaging(convInfo.callId, messageModel_.get());
// TODO:(new lrc) in call chat
//ui->instantMessagingWidget->setMediaText(actualCall_);
disconnect(selectedCallChanged_);
selectedCallChanged_ = connect(
......@@ -622,23 +634,6 @@ void CallWidget::slotShowChatView(const std::string& accountId,
showConversationView();
}
void
CallWidget::currentAccountChanged(const QModelIndex &current)
{
if (!current.isValid()) {
ui->selectBar->hide();
ui->ringIdLabel->setText("");
return;
}
if (ui->selectBar->isHidden()){
ui->selectBar->show();
}
auto accountId = current.data(static_cast<int>(AccountListModel::Role::ID)).value<QString>().toStdString();
setSelectedAccount(accountId);
}
void
CallWidget::setSelectedAccount(const std::string& accountId)
{
......@@ -683,7 +678,6 @@ void CallWidget::updateConversationsFilterWidget()
LRCInstance::getCurrentConversationModel()->setFilter(currentTypeFilter_);
}
ui->conversationsFilterWidget->setVisible(invites);
ui->missingButtonsDummyWidget->setVisible(!invites);
}
void CallWidget::setConversationFilter(const QString & filter)
......@@ -745,9 +739,7 @@ void
CallWidget::on_sendIMButton_clicked()
{
auto msg = ui->imMessageEdit->text();
if (msg.trimmed().isEmpty()) {
return;
}
if (msg.trimmed().isEmpty()) return;
ui->imMessageEdit->clear();
try {
LRCInstance::getCurrentConversationModel()->sendMessage(selectedConvUid(), msg.toStdString());
......@@ -867,32 +859,37 @@ CallWidget::connectConversationModel()
updateConversationsFilterWidget();
selectSmartlistItem(selectedConvUid());
ui->smartList->update();
});
}
);
modelUpdatedConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::conversationUpdated,
[this](const std::string& convUid) {
Q_UNUSED(convUid);
ui->smartList->update();
});
}
);
filterChangedConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::filterChanged,
[this]() {
updateSmartList();
updateConversationsFilterWidget();
ui->smartList->update();
});
}
);
newConversationConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::newConversation,
[this](const std::string& convUid) {
updateSmartList();
updateConversationForNewContact(convUid);
ui->conversationsFilterWidget->update();
});
}
);
conversationRemovedConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::conversationRemoved,
[this]() {
backToWelcomePage();
});
}
);
conversationClearedConnection = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::conversationCleared,
[this](const std::string& convUid) {
......@@ -903,7 +900,8 @@ CallWidget::connectConversationModel()
return;
}
backToWelcomePage();
});
}
);
interactionStatusUpdatedConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::interactionStatusUpdated,
[this](const std::string& convUid) {
......@@ -911,12 +909,14 @@ CallWidget::connectConversationModel()
return;
}
updateConversationView(convUid);
});
}
);
newInteractionConnection_ = QObject::connect(
currentConversationModel, &lrc::api::ConversationModel::newInteraction,
[this](const std::string& convUid, uint64_t interactionId, const lrc::api::interaction::Info& interaction) {
onIncomingMessage(convUid, interactionId, interaction);
});
}
);
currentConversationModel->setFilter("");
// clear search field
ui->ringContactLineEdit->setText("");
......
......@@ -4,6 +4,7 @@
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
......@@ -103,7 +104,6 @@ private slots:
void contactReqListCurrentChanged(const QModelIndex &currentIdx, const QModelIndex &previousIdx);
void slotAccountMessageReceived(const QMap<QString,QString> message,ContactMethod* cm, media::Media::Direction dir);
void onIncomingMessage(const std::string & convUid, uint64_t interactionId, const lrc::api::interaction::Info & interaction);
void currentAccountChanged(const QModelIndex &current);
private:
void placeCall();
......@@ -167,6 +167,4 @@ private:
QMetaObject::Connection conversationClearedConnection;
QMetaObject::Connection selectedCallChanged_;
QMetaObject::Connection smartlistSelectionConnection_;
};
......@@ -93,7 +93,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0">
<property name="spacing">
<number>0</number>
</property>
......@@ -291,7 +291,7 @@
<number>10</number>
</property>
<item>
<widget class="QPushButton" name="buttonConversations">
<widget class="ConversationFilterButton" name="buttonConversations">
<property name="toolTip">
<string>Show conversations</string>
</property>
......@@ -301,11 +301,11 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonInvites">
<widget class="ConversationFilterButton" name="buttonInvites" native="true">
<property name="toolTip">
<string>Show invites</string>
</property>
<property name="text">
<property name="text" stdset="0">
<string>Invites</string>
</property>
</widget>
......@@ -338,6 +338,35 @@
</layout>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="topMargin">
<number>6</number>
</property>
<item>
<widget class="SmartListView" name="smartList">
<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>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
......
/***************************************************************************
* Copyright (C) 2018 by Savoir-faire Linux *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#include "conversationfilterbutton.h"
#include <QPainter>
ConversationFilterButton::ConversationFilterButton()
{
setCheckable(false);
connect(this, &ConversationFilterButton::pressed, this, &ConversationFilterButton::setSelected);
}
ConversationFilterButton::ConversationFilterButton(QWidget* widget)
{
Q_UNUSED(widget)
setCheckable(false);
connect(this, &ConversationFilterButton::pressed, this, &ConversationFilterButton::setSelected);
}
ConversationFilterButton::~ConversationFilterButton()
{
}
void
ConversationFilterButton::paintEvent(QPaintEvent * e)
{
QPushButton::paintEvent(e);
QPainter painter(this);
if (selected_) {
this->setStyleSheet("background-color: rgb(250, 250, 250)");
} else {
this->setStyleSheet("background-color: rgb(237, 237, 237)");
}
painter.end();
}
void
ConversationFilterButton::setSelected()
{
selected_ = true;
}
void
ConversationFilterButton::setUnselected()
{
selected_ = false;
update();
}
/***************************************************************************
* Copyright (C) 2018 by Savoir-faire Linux *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#pragma once
#include <QPushButton>
namespace Ui{
class ConvesationFilterButton;
}
class ConversationFilterButton : public QPushButton
{
Q_OBJECT
ConversationFilterButton(const ConversationFilterButton& cpy);
public:
ConversationFilterButton();
ConversationFilterButton(QWidget * widget);
~ConversationFilterButton();
public slots:
void setSelected();
void setUnselected();
private:
void paintEvent(QPaintEvent* e);
bool selected_ = false;
};
......@@ -36,6 +36,9 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
{
Q_UNUSED(parent);
setMouseTracking(true);
gearLabel_.setMouseTracking(true);
accountListUpdate();
accountItemDelegate_ = new AccountItemDelegate();
this->setItemDelegate(accountItemDelegate_);
......@@ -56,6 +59,10 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
this->setCurrentIndex(std::distance(accountList.begin(), it));
}
});
gearPixmap_.load(":/images/icons/round-settings-24px.svg");
gearLabel_.setParent(this);
gearLabel_.setStyleSheet("background: transparent;");
}
CurrentAccountComboBox::~CurrentAccountComboBox()
......@@ -68,7 +75,12 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
{
Q_UNUSED(e);
QPoint p(2, 2);
gearPoint_.setX(this->width() - gearSize_ - 2 * gearBorder_);
gearPoint_.setY(this->height() / 2 - gearLabel_.height() / 2 - gearBorder_);
gearLabel_.setGeometry(gearPoint_.x() - 3, gearPoint_.y(), gearSize_ + 2 * gearBorder_, gearSize_ + 2 * gearBorder_);
gearLabel_.setMargin(gearBorder_);
QPoint p(12, 2);
QPainter painter(this);
painter.setRenderHints((QPainter::Antialiasing | QPainter::TextAntialiasing), true);
......@@ -99,7 +111,7 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
if (accountStatus == lrc::api::account::Status::REGISTERED) {
// paint the presence indicator circle
QPainterPath outerCircle, innerCircle;
QPointF presenceCenter(40.0, 40.0);
QPointF presenceCenter(40.0 + p.x(), 40.0);
qreal outerCircleRadius = cellHeight_/6.5;
qreal innerCircleRadius = outerCircleRadius - 1;
outerCircle.addEllipse(presenceCenter, outerCircleRadius, outerCircleRadius);
......@@ -109,15 +121,13 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
}
// write primary and secondary account identifiers to combobox label
const int elidConst = 80; // [screen awareness]
QString primaryAccountID = QString::fromStdString(Utils::bestNameForAccount(LRCInstance::getCurrentAccountInfo()));
painter.setPen(Qt::black);
primaryAccountID = fontMetricPrimary.elidedText(primaryAccountID, Qt::ElideRight, comboBoxRect.width() - elidConst);
primaryAccountID = fontMetricPrimary.elidedText(primaryAccountID, Qt::ElideRight, comboBoxRect.width() - elidConst - gearSize_*!popupPresent);
painter.drawText(comboBoxRect, Qt::AlignLeft, primaryAccountID);
QString secondaryAccountID = QString::fromStdString(Utils::secondBestNameForAccount(LRCInstance::getCurrentAccountInfo()));
secondaryAccountID = fontMetricSecondary.elidedText(secondaryAccountID, Qt::ElideRight, comboBoxRect.width() - elidConst - 2); // [screen awareness]
secondaryAccountID = fontMetricSecondary.elidedText(secondaryAccountID, Qt::ElideRight, comboBoxRect.width() - elidConst - 2 - gearSize_ *!popupPresent); // [screen awareness]
if (secondaryAccountID.length()) { // if secondary accound id exists
painter.setFont(fontSecondary);
......@@ -131,7 +141,7 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
else {
this->setEnabled(true);
}
painter.end();
gearLabel_.setPixmap(gearPixmap_);
}
// import account background account pixmap and scale pixmap to fit in label
......@@ -155,3 +165,52 @@ CurrentAccountComboBox::accountListUpdate()
accountListModel_.reset(new AccountListModel());
this->setModel(accountListModel_.get());
}
// if gearLabel is clicked
void
CurrentAccountComboBox::mousePressEvent(QMouseEvent* mouseEvent)
{
if (!gearLabel_.frameGeometry().contains(mouseEvent->localPos().toPoint())) {
QComboBox::mousePressEvent(mouseEvent);
}
else {
emit settingsButtonClicked();
}
}
// if gear label is hovered over
void
CurrentAccountComboBox::mouseMoveEvent(QMouseEvent* mouseEvent)
{
if (gearLabel_.frameGeometry().contains(mouseEvent->x(), mouseEvent->y())) {
QComboBox::mouseMoveEvent(mouseEvent);
gearLabel_.setStyleSheet("background: rgb(237, 237, 237); border-width: 0px; border-radius: 8px;");
return;
}
gearLabel_.setStyleSheet("background: transparent;");
}
void
CurrentAccountComboBox::showPopup()
{
gearPixmap_.load("");
popupPresent = true;
QComboBox::showPopup();
}
void
CurrentAccountComboBox::hidePopup()
{
gearPixmap_.load(":/images/icons/round-settings-24px.svg");
popupPresent = false;
QComboBox::hidePopup();
}
void
CurrentAccountComboBox::leaveEvent(QEvent* event)
{
gearLabel_.setStyleSheet("background: transparent;");
QComboBox::leaveEvent(event);
}
\ No newline at end of file
......@@ -18,6 +18,7 @@
**************************************************************************/
#pragma once
#include <QComboBox>
#include <QLabel>
#include "accountlistmodel.h"
#include "accountitemdelegate.h"
......@@ -35,15 +36,32 @@ public:
~CurrentAccountComboBox();
void accountListUpdate();
void setCurrentIndex(int index);
signals:
void settingsButtonClicked();
private:
void paintEvent(QPaintEvent* e);
void importLabelPhoto(int index);
void mousePressEvent(QMouseEvent* mouseEvent);
void mouseMoveEvent(QMouseEvent* event);
void leaveEvent(QEvent * event);
void showPopup();
void hidePopup();
AccountItemDelegate* accountItemDelegate_;
std::unique_ptr<AccountListModel> accountListModel_;
QPixmap currentAccountAvatarImage_;
int cellHeight_ = 48; // [screen awareness]
int cellHeight_ = 50; // [screen awareness]
const int elidConst = 35; // [screen awareness]
const int gearBorder_ = 4;
const int gearSize_ = 24;
bool popupPresent = false;
QPoint gearPoint_;
QPixmap gearPixmap_;
QLabel gearLabel_;
};
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/></svg>
\ No newline at end of file
......@@ -44,11 +44,12 @@
<file>images/icons/ic_person_add_black_24dp_2x.png</file>
<file>images/waiting.gif</file>
<file>images/default_avatar_overlay.svg</file>
<file>images/icons/ic_clear_24px.svg</file>
<file>images/icons/ic_block_24px.svg</file>
<file>images/icons/ic_phone_24px.svg</file>
<file>images/icons/ic_video_call_24px.svg</file>
<file>images/icons/ic_arrow_back_24px.svg</file>
<file>images/icons/ic_send_24px.svg</file>
<file>images/icons/ic_clear_24px.svg</file>
<file>images/icons/ic_block_24px.svg</file>
<file>images/icons/ic_phone_24px.svg</file>
<file>images/icons/ic_video_call_24px.svg</file>
<file>images/icons/ic_arrow_back_24px.svg</file>
<file>images/icons/ic_send_24px.svg</file>
<file>images/icons/round-settings-24px.svg</file>
</qresource>
</RCC>
This diff is collapsed.
......@@ -10,7 +10,7 @@
<ProjectGuid>{0F6318E4-4C06-384E-BCA8-F344DA187957}</ProjectGuid>
<RootNamespace>Ring</RootNamespace>
<Keyword>Qt4VSv1.0</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
......@@ -117,6 +117,7 @@
</QtUic>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="conversationfilterbutton.cpp" />
<ClCompile Include="currentaccountcombobox.cpp" />
<ClCompile Include="aboutdialog.cpp" />
<ClCompile Include="accountdetails.cpp" />
......@@ -231,6 +232,10 @@
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\.;.\GeneratedFiles;.;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\lrc\src;$(ProjectDir)..\client-windows\winsparkle\include;$(ProjectDir)..\client-windows\qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>
<Define Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;NIGHTLY_VERSION=20180706;ENABLE_AUTOUPDATE;QT_NO_DEBUG;NDEBUG</Define>
</QtMoc>
<QtMoc Include="conversationfilterbutton.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\.;.\GeneratedFiles;.;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\lrc\src;$(ProjectDir)..\client-windows\winsparkle\include;$(ProjectDir)..\client-windows\qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>
<Define Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;NIGHTLY_VERSION=20180706;ENABLE_AUTOUPDATE;QT_NO_DEBUG;NDEBUG</Define>
</QtMoc>
<ClInclude Include="lrcinstance.h" />
<QtMoc Include="messagemodel.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\.;.\GeneratedFiles;.;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\lrc\src;$(ProjectDir)..\client-windows\winsparkle\include;$(ProjectDir)..\client-windows\qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>
......
......@@ -186,6 +186,9 @@
<ClCompile Include="currentaccountcombobox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="conversationfilterbutton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<QtMoc Include="aboutdialog.h">
......@@ -320,6 +323,9 @@
<QtMoc Include="currentaccountcombobox.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="conversationfilterbutton.h">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="debug\moc_predefs.h.cbt">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment