Merge pull request #195 from MyHush/dev

merge dev branch to master
2020-09-13 10:10:49 +02:00
parent 3607611246 45765bb0ab
commit 847b9b07b0
9 changed files with 601 additions and 513 deletions
--- a/lib/Cargo.lock
+++ b/lib/Cargo.lock
@@ -1192,7 +1192,7 @@ dependencies = [
 "blake3 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167)",
+ "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=1d678e4280975a532cdff58f55b2b129c033c9f8)",
 ]

 [[package]]
@@ -1655,7 +1655,7 @@ dependencies = [
 [[package]]
 name = "silentdragonlitelib"
 version = "0.1.0"
-source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167#7c65e566c44268954654d9ff3e1c26b1e1d16167"
+source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=1d678e4280975a532cdff58f55b2b129c033c9f8#1d678e4280975a532cdff58f55b2b129c033c9f8"
 dependencies = [
 "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bellman 0.1.0 (git+https://github.com/MyHush/librustzcash.git?rev=1a0204113d487cdaaf183c2967010e5214ff9e37)",
@@ -2671,7 +2671,7 @@ dependencies = [
 "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
 "checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
-"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167)" = "<none>"
+"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=1d678e4280975a532cdff58f55b2b129c033c9f8)" = "<none>"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -12,4 +12,4 @@ crate-type = ["staticlib"]
 libc = "0.2.58"
 lazy_static = "1.4.0"
 blake3 = "0.3.4"
-silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "7c65e566c44268954654d9ff3e1c26b1e1d16167" }
+silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "1d678e4280975a532cdff58f55b2b129c033c9f8" }
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -91,7 +91,7 @@ QString ChatModel::Addressbylabel(QString address)

    return QString("0xdeadbeef");
 }
-     
+  
 void MainWindow::renderContactRequest(){

        Ui_requestDialog requestContact;
@@ -109,58 +109,63 @@ void MainWindow::renderContactRequest(){

         QPixmap unknownWhite(icon);
         QIcon addnewAddrIcon(unknownWhite);
-       
-        
-       

-       QStandardItemModel* contactRequest = new QStandardItemModel();
+               

+         ///////// Tableview for incoming contact request
+        int requestsize = DataStore::getChatDataStore()->getAllNewContactRequests().size();  
+        requestContact.requestContact->setRowCount(requestsize);    
+        requestContact.requestContact->setColumnCount(2);
+        QStringList request_TableHeader;
+        request_TableHeader<<"Address"<<"Date";
+        requestContact.requestContact->setHorizontalHeaderLabels(request_TableHeader);
+        requestContact.requestContact->setShowGrid(false);
+        requestContact.requestContact->setEditTriggers(QAbstractItemView::NoEditTriggers);
+        requestContact.requestContact->setSelectionBehavior(QAbstractItemView::SelectRows);
+        requestContact.requestContact->setSelectionMode(QAbstractItemView::SingleSelection);
+        requestContact.requestContact->setColumnWidth(0,205);
        

-            for (auto &c : DataStore::getChatDataStore()->getAllNewContactRequests())
+        int i=0;
+        
+        for (auto &c : DataStore::getChatDataStore()->getAllNewContactRequests())
+            
+        {

-            {
+        int timestamp =  c.second.getTimestamp();
+        QDateTime myDateTime;
+        myDateTime.setTime_t(timestamp);
+        QString timestamphtml = myDateTime.toString("yyyy-MM-dd");

-                QStandardItem* Items = new QStandardItem(QString(c.second.getRequestZaddr()));
-                contactRequest->appendRow(Items);
-                requestContact.requestContact->setModel(contactRequest);  
-                Items->setData(QIcon(addnewAddrIcon),Qt::DecorationRole);
-                requestContact.requestContact->setIconSize(QSize(40,50));
-                requestContact.requestContact->setUniformItemSizes(true);
-                requestContact.requestContact->show();
-                requestContact.zaddrnew->setVisible(false);
-                requestContact.zaddrnew->setText(c.second.getRequestZaddr());
+        requestContact.requestContact->setItem(i, 0, new QTableWidgetItem(c.second.getRequestZaddr()));
+        requestContact.requestContact->setItem(i, 1, new QTableWidgetItem(timestamphtml));
+        requestContact.zaddrnew->setVisible(false);
+        requestContact.zaddrnew->setText(c.second.getRequestZaddr());
+        requestContact.requestContact->sortByColumn(1, Qt::DescendingOrder);
              
-
-           
-            }
+        i++;
+         
+        }


-            QStandardItemModel* contactRequestOld = new QStandardItemModel();
+        QStandardItemModel* contactRequestOld = new QStandardItemModel();

-              for (auto &c : DataStore::getChatDataStore()->getAllOldContactRequests())
+            for (auto &c : DataStore::getChatDataStore()->getAllOldContactRequests())
            {
                QStandardItem* Items = new QStandardItem(c.second.getContact());
                contactRequestOld->appendRow(Items);
                requestContact.requestContactOld->setModel(contactRequestOld);
                requestContact.zaddrold->setVisible(false);
                requestContact.zaddrold->setText(c.second.getRequestZaddr());
-                
-      
+                    
            }

-       
-
        QObject::connect(requestContact.requestContact, &QTableView::clicked, [&] () {

        for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){
        QModelIndex index = requestContact.requestContact->currentIndex();
        QString label_contact = index.data(Qt::DisplayRole).toString();
        QStandardItemModel* contactMemo = new QStandardItemModel();
-
-
-
-    
           
        if  ((c.second.isOutgoing() == false) && (label_contact == c.second.getRequestZaddr() && (c.second.getMemo().startsWith("{") == false)))
        
@@ -184,8 +189,6 @@ void MainWindow::renderContactRequest(){
            
   });

-  
-
   QObject::connect(requestContact.requestContactOld, &QTableView::clicked, [&] () {

    for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){
@@ -210,9 +213,7 @@ void MainWindow::renderContactRequest(){
            }else{

            }
-        }
-    
-    
+        }  
            
   });
   
@@ -247,8 +248,6 @@ void MainWindow::renderContactRequest(){
            );
            return;
        } 
-
-
                AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar);
                  rpc->refreshContacts(
                  ui->listContactWidget);
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -108,22 +108,6 @@ void Controller::setConnection(Connection* c)
        ui->listChat->verticalScrollBar()->maximum());
 }

-std::string Controller::encryptDecrypt(std::string toEncrypt) 
-{ 
-
-    int radomInteger = rand() % 1000000000 +100000;
-    
-     
-    char key = radomInteger;
-    std::string output = toEncrypt;
-    
-    for (int i = 0; i < toEncrypt.size(); i++)
-        output[i] = toEncrypt[i] ^ key;
-    
-    return output;
-
-}
-
 // Build the RPC JSON Parameters for this tx
 void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
 {   
@@ -153,43 +137,28 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
    }

    DataStore::getSietchDataStore()->clear(); // clears the datastore
-
-    const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
-
-    int sizerandomString = rand() % 120 +10;
+    
+    const QString possibleCharacters("0123456789abcdef");
+    int sizerandomString = 512;
    const int randomStringLength = sizerandomString;

-    QString randomString;
-    QRandomGenerator *gen = QRandomGenerator::system();
+      for(uint8_t i = 0; i < 8; i++)
+    {
+
+        QString randomString;
+
+        QRandomGenerator *gen = QRandomGenerator::system();
+
    for(int i=0; i<randomStringLength; ++i)
    {
-       // int index = qrand() % possibleCharacters.length();
+
       int index = gen->bounded(0, possibleCharacters.length() - 1);
       QChar nextChar = possibleCharacters.at(index);
       randomString.append(nextChar);
    }
-  
-   for(uint8_t i = 0; i < 8; i++)
-    {
-        int length = randomString.length(); 
-        int randomSize = rand() % 120 +10;
-        char *randomHash = NULL;
-        randomHash = new char[length+1];
-        strncpy(randomHash, randomString.toLocal8Bit(), length +1);  
-        #define MESSAGE ((const unsigned char *) randomHash)
-        #define MESSAGE_LEN length
-        #define MESSAGE_LEN1 length + randomSize
-    
-        unsigned char hash[crypto_secretstream_xchacha20poly1305_ABYTES];

-        crypto_generichash(hash, sizeof hash,
-                   MESSAGE, MESSAGE_LEN1,
-                   NULL, 0);
+    dust.at(i)["memo"] = randomString.toStdString();

-        std::string decryptedMemo(reinterpret_cast<char*>(hash),MESSAGE_LEN1);
-        std::string encrypt = this->encryptDecrypt(decryptedMemo);
-        QString randomHashafter1 = QByteArray(reinterpret_cast<const char*>(encrypt.c_str()),encrypt.size()).toHex();
-        dust.at(i)["memo"] = randomHashafter1.toStdString();
    }

    for(auto &it: dust)
--- a/src/controller.h
+++ b/src/controller.h
@@ -45,8 +45,7 @@ public:
    int getLag();   
    void setLag(int lag);
    int _lag;
-    std::string encryptDecrypt(std::string);
-    
+   
    void checkForUpdate(bool silent = true);
    void refreshZECPrice();
    void refreshEURPrice();
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1334,12 +1334,13 @@ void MainWindow::setupTransactionsTab() {
    });

    // Set up context menu on transactions tab
+    ui->listChat->setContextMenuPolicy(Qt::ActionsContextMenu); 
+    contextMenuChat->setObjectName("contextMenuChat");
+    QString style = "QMenu{background-color: rgb(0, 0, 255);}";   
    auto theme = Settings::getInstance()->get_theme_name();
    if (theme == "Dark" || theme == "Midnight") {
-    ui->listChat->setStyleSheet("background-image: url(:/icons/res/SDLogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat");
-     }
-    if (theme == "Default") {ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat");}
-   
+    ui->listChat->setStyleSheet("QListView{background-image: url(:/icons/res/SDLogo.png) ;background-position: center center ;background-repeat: no-repeat;} QMenu::item:selected { border-color: darkblue; background: rgba(100, 100, 100, 150);}");}
+    if (theme == "Default") {ui->listChat->setStyleSheet("QListView{background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;} QMenu::item:selected { border-color: darkblue; background: rgba(100, 100, 100, 150);}");}
    ui->listChat->setResizeMode(QListView::Adjust);
    ui->listChat->setWordWrap(true);
    ui->listChat->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
@@ -1495,17 +1496,14 @@ void MainWindow::setupchatTab() {

    ui->contactNameMemo->setText("");   

-    /////Copy Chatmessages
+    /////Setup Actions

-     QMenu* contextMenuChat;
-     QAction* copymessage;
-     
+     QAction* copymessage;   
     QAction* viewexplorer;
     QAction* copytxid;
     QAction* copylink;
     QAction* openlink;
-     contextMenuChat = new QMenu(ui->listChat);
-     ui->listChat->setContextMenuPolicy(Qt::ActionsContextMenu); 
+     
     copymessage = new QAction("Copy message to clipboard",contextMenuChat);
     viewexplorer = new QAction("View on block explorer",contextMenuChat);
     copytxid = new QAction("Copy txid to clipboard ",contextMenuChat);
@@ -1514,14 +1512,12 @@ void MainWindow::setupchatTab() {
    
 QObject::connect(ui->listContactWidget, &QTableView::clicked, [=] () {

-     
-    
-     //contextMenuChat->autoFillBackground(false);
     ui->listChat->addAction(copymessage);
     ui->listChat->addAction(viewexplorer);
     ui->listChat->addAction(copytxid);
     ui->listChat->addAction(copylink);
     ui->listChat->addAction(openlink);
+    

 });

--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -139,6 +139,7 @@ private:
    void setupStatusBar();
    
    void clearSendForm();
+    QMenu* contextMenuChat = new QMenu();
    

    Tx   createTxFromSendPage();
--- a/src/requestContactDialog.ui
+++ b/src/requestContactDialog.ui
@@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>850</width>
+    <width>764</width>
    <height>495</height>
   </rect>
  </property>
@@ -18,438 +18,562 @@
  </property>
  <property name="minimumSize">
   <size>
-    <width>850</width>
+    <width>600</width>
+    <height>495</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>764</width>
    <height>495</height>
   </size>
  </property>
  <property name="windowTitle">
   <string>Incoming Contact Request</string>
  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Memo of the request&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
+  <widget class="QLabel" name="label_3">
+   <property name="geometry">
+    <rect>
+     <x>360</x>
+     <y>10</y>
+     <width>151</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Memo of the request&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QListView" name="requestMemo">
+   <property name="geometry">
+    <rect>
+     <x>355</x>
+     <y>32</y>
+     <width>400</width>
+     <height>231</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>400</width>
+     <height>231</height>
+    </size>
+   </property>
+   <property name="verticalScrollBarPolicy">
+    <enum>Qt::ScrollBarAlwaysOff</enum>
+   </property>
+   <property name="horizontalScrollBarPolicy">
+    <enum>Qt::ScrollBarAlwaysOff</enum>
+   </property>
+   <property name="sizeAdjustPolicy">
+    <enum>QAbstractScrollArea::AdjustToContents</enum>
+   </property>
+   <property name="editTriggers">
+    <set>QAbstractItemView::NoEditTriggers</set>
+   </property>
+   <property name="resizeMode">
+    <enum>QListView::Adjust</enum>
+   </property>
+   <property name="modelColumn">
+    <number>0</number>
+   </property>
+   <property name="uniformItemSizes">
+    <bool>false</bool>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>161</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Open requests from:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QListView" name="requestContactOld">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>294</y>
+     <width>162</width>
+     <height>192</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>150</width>
+     <height>190</height>
+    </size>
+   </property>
+   <property name="mouseTracking">
+    <bool>true</bool>
+   </property>
+   <property name="editTriggers">
+    <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+   </property>
+   <property name="alternatingRowColors">
+    <bool>false</bool>
+   </property>
+   <property name="selectionMode">
+    <enum>QAbstractItemView::SingleSelection</enum>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="requestZaddr">
+   <property name="geometry">
+    <rect>
+     <x>299</x>
+     <y>328</y>
+     <width>450</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>450</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>351</width>
+     <height>25</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_8">
+   <property name="geometry">
+    <rect>
+     <x>177</x>
+     <y>343</y>
+     <width>97</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>Request from:</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="requestLabel">
+   <property name="geometry">
+    <rect>
+     <x>299</x>
+     <y>399</y>
+     <width>142</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="maxLength">
+    <number>25</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="zaddrnew">
+   <property name="geometry">
+    <rect>
+     <x>480</x>
+     <y>461</y>
+     <width>16</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>628</x>
+     <y>461</y>
+     <width>127</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Add New Contact</string>
+   </property>
+   <property name="autoDefault">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="requestCID">
+   <property name="geometry">
+    <rect>
+     <x>417</x>
+     <y>461</y>
+     <width>16</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_6">
+   <property name="geometry">
+    <rect>
+     <x>177</x>
+     <y>430</y>
+     <width>233</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose an avatar for your contact:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_7">
+   <property name="geometry">
+    <rect>
+     <x>177</x>
+     <y>368</y>
+     <width>68</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>My Zaddr:</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="zaddrold">
+   <property name="geometry">
+    <rect>
+     <x>340</x>
+     <y>461</y>
+     <width>16</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string notr="true"/>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="cancel">
+   <property name="geometry">
+    <rect>
+     <x>542</x>
+     <y>461</y>
+     <width>80</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="baseSize">
+    <size>
+     <width>100</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="text">
+    <string>Cancel</string>
+   </property>
+   <property name="autoDefault">
+    <bool>false</bool>
+   </property>
+   <property name="flat">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="comboBoxAvatar">
+   <property name="geometry">
+    <rect>
+     <x>417</x>
+     <y>430</y>
+     <width>106</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>106</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>106</width>
+     <height>25</height>
+    </size>
+   </property>
+   <item>
+    <property name="text">
+     <string>SDLogo</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/SDLogo.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="1" column="1" colspan="6">
-    <widget class="QListView" name="requestMemo">
-     <property name="minimumSize">
-      <size>
-       <width>500</width>
-       <height>231</height>
-      </size>
-     </property>
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="resizeMode">
-      <enum>QListView::Adjust</enum>
-     </property>
-     <property name="modelColumn">
-      <number>0</number>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>false</bool>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Duke</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Duke.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Open requests&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Denio</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Denio.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="3" column="0" rowspan="8">
-    <widget class="QListView" name="requestContactOld">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>225</width>
-       <height>190</height>
-      </size>
-     </property>
-     <property name="mouseTracking">
-      <bool>true</bool>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Berg</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Berg.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="4" column="4" colspan="3">
-    <widget class="QLineEdit" name="requestZaddr">
-     <property name="minimumSize">
-      <size>
-       <width>351</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>351</width>
-       <height>25</height>
-      </size>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Sharpee</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Sharpee.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="4" column="1" colspan="3">
-    <widget class="QLabel" name="label_8">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Request from:</string>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Elsa</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normalon>:/icons/res/Elsa.png</normalon>
+     </iconset>
+    </property>
   </item>
-   <item row="6" column="4" colspan="2">
-    <widget class="QLineEdit" name="requestLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maxLength">
-      <number>25</number>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Yoda</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Yoda.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="10" column="3">
-    <widget class="QLabel" name="zaddrnew">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Garfield</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Garfield.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="10" column="6">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Add New Contact</string>
-     </property>
-     <property name="autoDefault">
-      <bool>false</bool>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Snoopy</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Snoopy.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="10" column="2">
-    <widget class="QLabel" name="requestCID">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Popey</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Popey.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="7" column="1" colspan="3">
-    <widget class="QLabel" name="label_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose an avatar for your contact:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Pinguin</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Pinguin.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="QLabel" name="label_7">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>My Zaddr:</string>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Mickey</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Mickey.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="10" column="1">
-    <widget class="QLabel" name="zaddrold">
-     <property name="text">
-      <string notr="true"/>
-     </property>
-    </widget>
+   <item>
+    <property name="text">
+     <string>Stag</string>
+    </property>
+    <property name="icon">
+     <iconset>
+      <activeon>:/icons/res/Stag.png</activeon>
+     </iconset>
+    </property>
   </item>
-   <item row="10" column="5">
-    <widget class="QPushButton" name="cancel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="baseSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Cancel</string>
-     </property>
-     <property name="autoDefault">
-      <bool>false</bool>
-     </property>
-     <property name="flat">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="4">
-    <widget class="QComboBox" name="comboBoxAvatar">
-     <property name="minimumSize">
-      <size>
-       <width>106</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>106</width>
-       <height>25</height>
-      </size>
-     </property>
-     <item>
-      <property name="text">
-       <string>SDLogo</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/SDLogo.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Duke</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Duke.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Denio</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Denio.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Berg</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Berg.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Sharpee</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Sharpee.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Elsa</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <normalon>:/icons/res/Elsa.png</normalon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Yoda</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Yoda.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Garfield</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Garfield.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Snoopy</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Snoopy.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Popey</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Popey.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Pinguin</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Pinguin.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Mickey</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Mickey.png</activeon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Stag</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <activeon>:/icons/res/Stag.png</activeon>
-       </iconset>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QListView" name="requestContact">
-     <property name="minimumSize">
-      <size>
-       <width>225</width>
-       <height>231</height>
-      </size>
-     </property>
-     <property name="mouseTracking">
-      <bool>true</bool>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Recently closed requests&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" colspan="3">
-    <widget class="QLabel" name="label_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Details of the request&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="3">
-    <widget class="QLabel" name="label_5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Give a Nickname:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="4" colspan="3">
-    <widget class="QLineEdit" name="requestMyAddr">
-     <property name="minimumSize">
-      <size>
-       <width>351</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>351</width>
-       <height>25</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>271</y>
+     <width>179</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Recently closed requests&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_4">
+   <property name="geometry">
+    <rect>
+     <x>177</x>
+     <y>294</y>
+     <width>157</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Details of the request&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_5">
+   <property name="geometry">
+    <rect>
+     <x>177</x>
+     <y>399</y>
+     <width>116</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>Give a Nickname:</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="requestMyAddr">
+   <property name="geometry">
+    <rect>
+     <x>299</x>
+     <y>368</y>
+     <width>450</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>450</width>
+     <height>25</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>351</width>
+     <height>25</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QTableWidget" name="requestContact">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>32</y>
+     <width>321</width>
+     <height>231</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>150</width>
+     <height>231</height>
+    </size>
+   </property>
+   <property name="mouseTracking">
+    <bool>true</bool>
+   </property>
+   <property name="editTriggers">
+    <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+   </property>
+   <property name="alternatingRowColors">
+    <bool>false</bool>
+   </property>
+   <property name="selectionMode">
+    <enum>QAbstractItemView::SingleSelection</enum>
+   </property>
+  </widget>
 </widget>
 <resources/>
 <connections>
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.3.9"
+#define APP_VERSION "1.4.0"