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

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

pull/130/head
DenioD 4 years ago
parent
68fdd7ac0b
commit
e97a0b07c2
2 changed files with 68 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/chatmodel.cpp
  2. 99
      src/mainwindow.ui

14
src/chatmodel.cpp
View File

@ -277,8 +277,18 @@ void MainWindow::sendChatButton() {
auto d = new QDialog(this); auto d = new QDialog(this);
auto connD = new Ui_ConnectionDialog(); auto connD = new Ui_ConnectionDialog();
connD->setupUi(d); connD->setupUi(d);
QPixmap logo(":/img/res/logobig.gif"); QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation)); 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->status->setText(tr("Please wait..."));
connD->statusDetail->setText(tr("Your Message will be send")); 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> <normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout_18"> <layout class="QFormLayout" name="formLayout">
<item> <item row="0" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>5</number>
@ -389,7 +389,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1226</width> <width>1226</width>
<height>504</height> <height>488</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="sendToLayout"> <layout class="QVBoxLayout" name="sendToLayout">
@ -1332,17 +1332,17 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>80</y> <y>40</y>
<width>341</width> <width>341</width>
<height>561</height> <height>551</height>
</rect> </rect>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_39"> <widget class="QLabel" name="label_39">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>6</x> <x>0</x>
<y>40</y> <y>0</y>
<width>311</width> <width>311</width>
<height>20</height> <height>20</height>
</rect> </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> <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> </property>
</widget> </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"> <widget class="MemoEdit" name="memoTxtChat">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>340</x>
<y>510</y> <y>410</y>
<width>901</width> <width>921</width>
<height>128</height> <height>128</height>
</rect> </rect>
</property> </property>
@ -1377,8 +1364,8 @@
<widget class="QLabel" name="memoSizeChat"> <widget class="QLabel" name="memoSizeChat">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>1180</x> <x>1200</x>
<y>460</y> <y>540</y>
<width>47</width> <width>47</width>
<height>17</height> <height>17</height>
</rect> </rect>
@ -1393,9 +1380,9 @@
<widget class="QLabel" name="contactNameMemo"> <widget class="QLabel" name="contactNameMemo">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>350</x> <x>450</x>
<y>50</y> <y>20</y>
<width>291</width> <width>161</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -1410,7 +1397,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>340</x>
<y>80</y> <y>40</y>
<width>921</width> <width>921</width>
<height>371</height> <height>371</height>
</rect> </rect>
@ -1432,7 +1419,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>1130</x> <x>1130</x>
<y>650</y> <y>590</y>
<width>114</width> <width>114</width>
<height>25</height> <height>25</height>
</rect> </rect>
@ -1453,21 +1440,21 @@
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>350</x>
<y>460</y> <y>550</y>
<width>67</width> <width>81</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>
<property name="text"> <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> </property>
</widget> </widget>
<widget class="QLabel" name="ContactName"> <widget class="QLabel" name="ContactName">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>350</x>
<y>490</y> <y>580</y>
<width>81</width> <width>81</width>
<height>17</height> <height>17</height>
</rect> </rect>
@ -1480,7 +1467,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>420</x> <x>420</x>
<y>460</y> <y>550</y>
<width>691</width> <width>691</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -1492,8 +1479,8 @@
<widget class="QPushButton" name="safeContactRequest"> <widget class="QPushButton" name="safeContactRequest">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>943</x> <x>50</x>
<y>20</y> <y>600</y>
<width>211</width> <width>211</width>
<height>25</height> <height>25</height>
</rect> </rect>
@ -1515,7 +1502,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>420</x> <x>420</x>
<y>490</y> <y>580</y>
<width>691</width> <width>691</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -1527,8 +1514,8 @@
<widget class="QLabel" name="contactCid"> <widget class="QLabel" name="contactCid">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>820</x> <x>720</x>
<y>60</y> <y>20</y>
<width>331</width> <width>331</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -1540,8 +1527,8 @@
<widget class="QLabel" name="contactNameMemo_2"> <widget class="QLabel" name="contactNameMemo_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>690</x> <x>590</x>
<y>60</y> <y>20</y>
<width>131</width> <width>131</width>
<height>20</height> <height>20</height>
</rect> </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> <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> </property>
</widget> </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>
</widget> </widget>
</item> </item>

Write Preview
Loading…
Cancel
Save