hush
/
SilentDragonLite
9
1
Fork 4
Code Issues 38 Pull Requests Projects Releases 8 Wiki Activity
Browse Source

fix windows icons

pull/130/head
DenioD 4 years ago
parent
1a36a7f3c4
commit
eae77fb8aa
4 changed files with 148 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      application.qrc
  2. 4
      src/Model/ChatItem.cpp
  3. 2
      src/chatmodel.cpp
  4. 213
      src/requestContactDialog.ui

5
application.qrc
View File

@ -38,9 +38,8 @@
<file>res/message-icon.svg</file>
<file>res/lock.svg</file>
<file>res/lock.png</file>
<file>res/lock_green.svg</file>
<file>res/lock_blue.svg</file>
<file>res/unlocked.svg</file>
<file>res/lock_green.png</file>
<file>res/unlocked.png</file>
<file>res/getAddrWhite.png</file>
<file>res/send-white.png</file>
<file>res/requestWhite.png</file>

4
src/Model/ChatItem.cpp
View File

@ -137,10 +137,10 @@ QString ChatItem::toChatLine()
myDateTime.setTime_t(_timestamp);
if (_confirmations == 0){
lock = "<b> <img src=':/icons/res/unlocked.svg'><b>";
lock = "<b> <img src=':/icons/res/unlocked.png'><b>";
}else{
lock = "<b> <img src=':/icons/res/lock_green.svg'><b>";
lock = "<b> <img src=':/icons/res/lock_green.png'><b>";
}

2
src/chatmodel.cpp
View File

@ -126,6 +126,7 @@ void MainWindow::renderContactRequest(){
requestContact.requestMemo->show();
requestContact.requestCID->setText(c.second.getCid());
requestContact.requestCID->setVisible(false);
requestContact.requestZaddr->setText(c.second.getRequestZaddr());
requestContact.requestMyAddr->setText(c.second.getAddress());
}else{}
@ -152,6 +153,7 @@ void MainWindow::renderContactRequest(){
requestContact.requestMemo->show();
requestContact.requestCID->setText(c.second.getCid());
requestContact.requestCID->setVisible(false);
requestContact.requestZaddr->setText(c.second.getRequestZaddr());
requestContact.requestMyAddr->setText(c.second.getAddress());
}else{}

213
src/requestContactDialog.ui
View File

@ -6,38 +6,28 @@
<rect>
<x>0</x>
<y>0</y>
<width>1025</width>
<height>562</height>
<width>812</width>
<height>495</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>812</width>
<height>495</height>
</size>
</property>
<property name="windowTitle">
<string>Incoming contact request</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="1">
<widget class="QLabel" name="label_7">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>My Zaddr :</string>
</property>
</widget>
</item>
<item row="3" column="0" rowspan="7">
<widget class="QListView" name="requestContactOld">
<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>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&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>
<item row="0" column="1" colspan="4">
<item row="0" column="3" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&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>
@ -46,6 +36,12 @@
</item>
<item row="1" column="0">
<widget class="QListView" name="requestContact">
<property name="minimumSize">
<size>
<width>256</width>
<height>231</height>
</size>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
@ -60,18 +56,14 @@
</property>
</widget>
</item>
<item row="6" column="2" colspan="3">
<widget class="QLineEdit" name="requestMyAddr"/>
</item>
<item row="7" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Give a Nickname:</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="4">
<item row="1" column="1" colspan="6">
<widget class="QListView" name="requestMemo">
<property name="minimumSize">
<size>
<width>521</width>
<height>231</height>
</size>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
@ -98,22 +90,112 @@
</property>
</widget>
</item>
<item row="2" column="1" rowspan="2" colspan="4">
<widget class="QLabel" name="label_4">
<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 align=&quot;center&quot;&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>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&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="0" column="0">
<widget class="QLabel" name="label">
<item row="3" column="0" rowspan="6" colspan="2">
<widget class="QListView" name="requestContactOld">
<property name="minimumSize">
<size>
<width>256</width>
<height>192</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="3" column="2" colspan="2">
<widget class="QLabel" name="label_8">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&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>
<string>Request from :</string>
</property>
</widget>
</item>
<item row="8" column="3">
<item row="3" 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>
<item row="4" column="2">
<widget class="QLabel" name="label_7">
<property name="text">
<string>My Zaddr :</string>
</property>
</widget>
</item>
<item row="4" 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>
<item row="5" column="2" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Give a Nickname:</string>
</property>
</widget>
</item>
<item row="5" column="4" colspan="2">
<widget class="QLineEdit" name="requestLabel"/>
</item>
<item row="6" column="2" colspan="3">
<widget class="QLabel" name="label_6">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Choose a avatar for your contact :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="7" column="2" colspan="2">
<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>Stag</string>
@ -246,21 +328,14 @@
</item>
</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 align=&quot;center&quot;&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="7" column="2" colspan="2">
<widget class="QLineEdit" name="requestLabel"/>
</item>
<item row="4" column="2" colspan="3">
<widget class="QLineEdit" name="requestZaddr"/>
</item>
<item row="9" column="3">
<item row="7" column="5" rowspan="2">
<widget class="QPushButton" name="cancel">
<property name="maximumSize">
<size>
<width>80</width>
<height>25</height>
</size>
</property>
<property name="baseSize">
<size>
<width>100</width>
@ -278,8 +353,14 @@
</property>
</widget>
</item>
<item row="9" column="4">
<item row="7" column="6" rowspan="2">
<widget class="QPushButton" name="pushButton">
<property name="maximumSize">
<size>
<width>153</width>
<height>25</height>
</size>
</property>
<property name="text">
<string>Add this new Contact</string>
</property>
@ -288,27 +369,17 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Request from :</string>
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<widget class="QLabel" name="label_6">
<item row="8" column="3" colspan="2">
<widget class="QLabel" name="requestCID">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Choose a avatar for your contact :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string/>
</property>
</widget>
</item>
<item row="5" column="2" colspan="3">
<widget class="QLineEdit" name="requestCID"/>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_9">
<item row="2" column="2" colspan="5">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Cid :</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&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>

Write Preview
Loading…
Cancel
Save