DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #4 from DenioD/chat

Browse Source 
Chat
This commit is contained in:
Strider
2020-05-03 20:13:06 +02:00
committed by GitHub
parent 92014e65c0 4da6eddae2
commit 0a59af94df
4 changed files with 88 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/chatmodel.cpp
View File

@@ -8,6 +8,7 @@
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "addressbook.h" #include "addressbook.h"
#include "ui_memodialog.h" #include "ui_memodialog.h"
#include "ui_contactrequest.h"
#include "addressbook.h" #include "addressbook.h"
#include <QUuid> #include <QUuid>
#include <bits/stdc++.h> #include <bits/stdc++.h>
@@ -122,7 +123,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
{ {
QStandardItem* Items = new QStandardItem(c.second.toChatLine()); QStandardItem* Items = new QStandardItem(c.second.toChatLine());
Items->setData("Incoming", Qt::UserRole +1); Items->setData("Outgoing", Qt::UserRole +1);
chat->appendRow(Items); chat->appendRow(Items);
ui->listChat->setModel(chat); ui->listChat->setModel(chat);
@@ -141,7 +142,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
{ {
QStandardItem* Items1 = new QStandardItem(c.second.toChatLine()); QStandardItem* Items1 = new QStandardItem(c.second.toChatLine());
Items1->setData("Outgoing", Qt::UserRole +1); Items1->setData("Incoming", Qt::UserRole +1);
chat->appendRow(Items1); chat->appendRow(Items1);
} }
@@ -423,6 +424,15 @@ Tx MainWindow::createTxForSafeContactRequest() {
//////////////////De-activated for now/////////////////// //////////////////De-activated for now///////////////////
void MainWindow::safeContactRequest() { void MainWindow::safeContactRequest() {
// Ui_ContactRequest contactRequest;
// QDialog dialog(this);
// contactRequest.setupUi(&dialog);
// Settings::saveRestore(&dialog);
// memoDialog.memoTxt->setLenDisplayLabel(memoDialog.memoSize);
// memoDialog.memoTxt->setAcceptButton(memoDialog.buttonBox->button(QDialogButtonBox::Ok));
////////////////////////////Todo: Check if its a zaddr////////// ////////////////////////////Todo: Check if its a zaddr//////////
// Create a Tx from the values on the send tab. Note that this Tx object // Create a Tx from the values on the send tab. Note that this Tx object

4
src/contactmodel.cpp
View File

@@ -15,7 +15,7 @@ void ContactModel::renderContactList(QListView* view)
QStandardItem* Items1 = new QStandardItem(QIcon("res/sdlogo.png"),c.getName()); QStandardItem* Items1 = new QStandardItem(QIcon("res/sdlogo.png"),c.getName());
contact->appendRow(Items1); contact->appendRow(Items1);
view->setModel(contact); view->setModel(contact);
view->setIconSize(QSize(80,100)); view->setIconSize(QSize(60,70));
view->setUniformItemSizes(true); view->setUniformItemSizes(true);
view->setDragDropMode(QAbstractItemView::DropOnly);; view->setDragDropMode(QAbstractItemView::DropOnly);;
} }
@@ -24,7 +24,7 @@ void ContactModel::renderContactList(QListView* view)
QStandardItem* Items1 = new QStandardItem(QIcon("res/sdlogo2.png"),c.getName()); QStandardItem* Items1 = new QStandardItem(QIcon("res/sdlogo2.png"),c.getName());
contact->appendRow(Items1); contact->appendRow(Items1);
view->setModel(contact); view->setModel(contact);
view->setIconSize(QSize(80,100)); view->setIconSize(QSize(60,70));
view->setUniformItemSizes(true); view->setUniformItemSizes(true);
view->setDragDropMode(QAbstractItemView::DropOnly);; view->setDragDropMode(QAbstractItemView::DropOnly);;

2
src/contactmodel.h
View File

@@ -1,3 +1,5 @@
// Copyright 2019-2020 The Hush developers
// GPLv3
#ifndef CONTACTMODEL_H #ifndef CONTACTMODEL_H
#define CONTACTMODEL_H #define CONTACTMODEL_H

72
src/contactrequest.ui Normal file
View File

@@ -0,0 +1,72 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Dialog</class>
<widget class="QDialog" name="Dialog" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle" >
<string>Dialog</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="geometry" >
<rect>
<x>30</x>
<y>240</y>
<width>341</width>
<height>32</height>
</rect>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel" >
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>