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

merge in the sdl gifs from @csharpee, add check bob to render only verified messages

Browse Source
This commit is contained in:
DenioD
2020-05-01 23:40:14 +02:00
parent 68fdd7ac0b
commit e97a0b07c2
2 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/chatmodel.cpp
View File

@@ -277,8 +277,18 @@ void MainWindow::sendChatButton() {
auto d = new QDialog(this);
auto connD = new Ui_ConnectionDialog();
connD->setupUi(d);
QPixmap logo(":/img/res/logobig.gif");
connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");;
auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") {
movie2->setScaledSize(QSize(512,512));
connD->topIcon->setMovie(movie2);
movie2->start();
} else {
movie1->setScaledSize(QSize(512,512));
connD->topIcon->setMovie(movie1);
movie1->start();
}
connD->status->setText(tr("Please wait..."));
connD->statusDetail->setText(tr("Your Message will be send"));

99
src/mainwindow.ui
View File

@@ -18,8 +18,8 @@
<normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>5</number>
@@ -389,7 +389,7 @@
<x>0</x>
<y>0</y>
<width>1226</width>
<height>504</height>
<height>488</height>
</rect>
</property>
<layout class="QVBoxLayout" name="sendToLayout">
@@ -1332,17 +1332,17 @@
<property name="geometry">
<rect>
<x>0</x>
<y>80</y>
<y>40</y>
<width>341</width>
<height>561</height>
<height>551</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_39">
<property name="geometry">
<rect>
<x>6</x>
<y>40</y>
<x>0</x>
<y>0</y>
<width>311</width>
<height>20</height>
</rect>
@@ -1351,25 +1351,12 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Hushchat Contactlist&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_40">
<property name="geometry">
<rect>
<x>400</x>
<y>410</y>
<width>331</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Memo</string>
</property>
</widget>
<widget class="MemoEdit" name="memoTxtChat">
<property name="geometry">
<rect>
<x>340</x>
<y>510</y>
<width>901</width>
<y>410</y>
<width>921</width>
<height>128</height>
</rect>
</property>
@@ -1377,8 +1364,8 @@
<widget class="QLabel" name="memoSizeChat">
<property name="geometry">
<rect>
<x>1180</x>
<y>460</y>
<x>1200</x>
<y>540</y>
<width>47</width>
<height>17</height>
</rect>
@@ -1393,9 +1380,9 @@
<widget class="QLabel" name="contactNameMemo">
<property name="geometry">
<rect>
<x>350</x>
<y>50</y>
<width>291</width>
<x>450</x>
<y>20</y>
<width>161</width>
<height>20</height>
</rect>
</property>
@@ -1410,7 +1397,7 @@
<property name="geometry">
<rect>
<x>340</x>
<y>80</y>
<y>40</y>
<width>921</width>
<height>371</height>
</rect>
@@ -1432,7 +1419,7 @@
<property name="geometry">
<rect>
<x>1130</x>
<y>650</y>
<y>590</y>
<width>114</width>
<height>25</height>
</rect>
@@ -1453,21 +1440,21 @@
<widget class="QLabel" name="label_42">
<property name="geometry">
<rect>
<x>340</x>
<y>460</y>
<width>67</width>
<x>350</x>
<y>550</y>
<width>81</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send to :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Send To :</string>
</property>
</widget>
<widget class="QLabel" name="ContactName">
<property name="geometry">
<rect>
<x>340</x>
<y>490</y>
<x>350</x>
<y>580</y>
<width>81</width>
<height>17</height>
</rect>
@@ -1480,7 +1467,7 @@
<property name="geometry">
<rect>
<x>420</x>
<y>460</y>
<y>550</y>
<width>691</width>
<height>20</height>
</rect>
@@ -1492,8 +1479,8 @@
<widget class="QPushButton" name="safeContactRequest">
<property name="geometry">
<rect>
<x>943</x>
<y>20</y>
<x>50</x>
<y>600</y>
<width>211</width>
<height>25</height>
</rect>
@@ -1515,7 +1502,7 @@
<property name="geometry">
<rect>
<x>420</x>
<y>490</y>
<y>580</y>
<width>691</width>
<height>20</height>
</rect>
@@ -1527,8 +1514,8 @@
<widget class="QLabel" name="contactCid">
<property name="geometry">
<rect>
<x>820</x>
<y>60</y>
<x>720</x>
<y>20</y>
<width>331</width>
<height>20</height>
</rect>
@@ -1540,8 +1527,8 @@
<widget class="QLabel" name="contactNameMemo_2">
<property name="geometry">
<rect>
<x>690</x>
<y>60</y>
<x>590</x>
<y>20</y>
<width>131</width>
<height>20</height>
</rect>
@@ -1550,6 +1537,32 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Conversation ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox">
<property name="geometry">
<rect>
<x>980</x>
<y>0</y>
<width>271</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Render only authenticated messages</string>
</property>
</widget>
<widget class="QLabel" name="contactNameMemo_3">
<property name="geometry">
<rect>
<x>340</x>
<y>20</y>
<width>111</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Contact Name:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</widget>
</widget>
</item>