From 5be6caca68250720f4dbb826a6324801be0c98c1 Mon Sep 17 00:00:00 2001 From: krepa098 Date: Mon, 26 Jan 2015 11:09:21 +0100 Subject: [PATCH] [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent This does not enable HiDPI support! issue #975 --- qtox.pro | 3 + res.qrc | 27 ++-- src/chatlog/chatmessage.cpp | 8 +- src/chatlog/content/filetransferwidget.cpp | 59 ++++--- src/chatlog/content/filetransferwidget.h | 4 + src/chatlog/content/filetransferwidget.ui | 28 +++- src/chatlog/content/image.cpp | 4 +- src/chatlog/content/image.h | 4 +- src/chatlog/content/notificationicon.cpp | 4 +- src/chatlog/content/notificationicon.h | 3 +- src/chatlog/content/spinner.cpp | 4 +- src/chatlog/content/spinner.h | 3 +- ui/chatArea/error.png | Bin 508 -> 0 bytes ui/chatArea/error.svg | 62 +++++++ ui/chatArea/info.png | Bin 521 -> 0 bytes ui/chatArea/info.svg | 62 +++++++ ui/chatArea/spinner.png | Bin 1044 -> 0 bytes ui/chatArea/spinner.svg | 45 ++++++ ui/chatArea/symbols.svg | 110 +++++++++---- ui/chatArea/typing.png | Bin 302 -> 0 bytes ui/chatArea/typing.svg | 61 +++++++ ui/fileTransferInstance/arrow_white.svg | 23 +++ ui/fileTransferInstance/arrow_white_2x.png | Bin 214 -> 0 bytes ui/fileTransferInstance/background_green.png | Bin 495 -> 0 bytes ui/fileTransferInstance/background_grey.png | Bin 487 -> 0 bytes ui/fileTransferInstance/background_red.png | Bin 493 -> 0 bytes ui/fileTransferInstance/background_yellow.png | Bin 495 -> 0 bytes ui/fileTransferInstance/browse.svg | 153 +++++++++++------- ui/fileTransferInstance/browse_path.png | Bin 462 -> 0 bytes .../{red.css => filetransferWidget.css} | 13 +- ui/fileTransferInstance/green.css | 28 ---- ui/fileTransferInstance/grey.css | 28 ---- ui/fileTransferInstance/no.svg | 23 +++ ui/fileTransferInstance/no_2x.png | Bin 265 -> 0 bytes ui/fileTransferInstance/pause.svg | 33 ++++ ui/fileTransferInstance/pause_2x.png | Bin 129 -> 0 bytes ui/fileTransferInstance/yellow.css | 28 ---- ui/fileTransferInstance/yes.svg | 22 +++ ui/fileTransferInstance/yes_2x.png | Bin 267 -> 0 bytes 39 files changed, 608 insertions(+), 234 deletions(-) delete mode 100644 ui/chatArea/error.png create mode 100644 ui/chatArea/error.svg delete mode 100644 ui/chatArea/info.png create mode 100644 ui/chatArea/info.svg delete mode 100644 ui/chatArea/spinner.png create mode 100644 ui/chatArea/spinner.svg delete mode 100644 ui/chatArea/typing.png create mode 100644 ui/chatArea/typing.svg create mode 100644 ui/fileTransferInstance/arrow_white.svg delete mode 100644 ui/fileTransferInstance/arrow_white_2x.png delete mode 100644 ui/fileTransferInstance/background_green.png delete mode 100644 ui/fileTransferInstance/background_grey.png delete mode 100644 ui/fileTransferInstance/background_red.png delete mode 100644 ui/fileTransferInstance/background_yellow.png delete mode 100644 ui/fileTransferInstance/browse_path.png rename ui/fileTransferInstance/{red.css => filetransferWidget.css} (50%) delete mode 100644 ui/fileTransferInstance/green.css delete mode 100644 ui/fileTransferInstance/grey.css create mode 100644 ui/fileTransferInstance/no.svg delete mode 100644 ui/fileTransferInstance/no_2x.png create mode 100644 ui/fileTransferInstance/pause.svg delete mode 100644 ui/fileTransferInstance/pause_2x.png delete mode 100644 ui/fileTransferInstance/yellow.css create mode 100644 ui/fileTransferInstance/yes.svg delete mode 100644 ui/fileTransferInstance/yes_2x.png diff --git a/qtox.pro b/qtox.pro index 11eb6817f..b0187ff85 100644 --- a/qtox.pro +++ b/qtox.pro @@ -278,3 +278,6 @@ contains(DEFINES, QTOX_PLATFORM_EXT) { src/platform/timer_x11.cpp } +DISTFILES += \ + ui/fileTransferInstance/background_green.svg + diff --git a/res.qrc b/res.qrc index eff10c320..de2986aa8 100644 --- a/res.qrc +++ b/res.qrc @@ -149,9 +149,6 @@ ui/chatArea/chatArea.css ui/chatArea/chatHead.css ui/chatArea/innerStyle.css - ui/chatArea/spinner.png - ui/chatArea/info.png - ui/chatArea/error.png ui/chatArea/scrollBarDownArrow.png ui/chatArea/scrollBarDownArrowHover.png ui/chatArea/scrollBarDownArrowPressed.png @@ -212,19 +209,6 @@ ui/videoButton/videoButtonYellow.png ui/videoButton/videoButtonYellowHover.png ui/videoButton/videoButtonYellowPressed.png - ui/fileTransferInstance/red.css - ui/fileTransferInstance/green.css - ui/fileTransferInstance/grey.css - ui/fileTransferInstance/yellow.css - ui/fileTransferInstance/background_red.png - ui/fileTransferInstance/background_yellow.png - ui/fileTransferInstance/background_green.png - ui/fileTransferInstance/background_grey.png - ui/fileTransferInstance/pause_2x.png - ui/fileTransferInstance/no_2x.png - ui/fileTransferInstance/yes_2x.png - ui/fileTransferInstance/arrow_white_2x.png - ui/fileTransferInstance/browse_path.png ui/volButton/volButton.png ui/volButton/volButtonHover.png ui/volButton/volButtonPressed.png @@ -232,6 +216,15 @@ ui/window/applicationIcon.png ui/window/statusPanel.css ui/window/window.css - ui/chatArea/typing.png + ui/chatArea/info.svg + ui/chatArea/spinner.svg + ui/chatArea/typing.svg + ui/chatArea/error.svg + ui/fileTransferInstance/no.svg + ui/fileTransferInstance/pause.svg + ui/fileTransferInstance/yes.svg + ui/fileTransferInstance/arrow_white.svg + ui/fileTransferInstance/browse.svg + ui/fileTransferInstance/filetransferWidget.css diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp index 977abcc55..175157d90 100644 --- a/src/chatlog/chatmessage.cpp +++ b/src/chatlog/chatmessage.cpp @@ -60,7 +60,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt msg->addColumn(new Text(isAction ? "
*
" : sender, isMe ? Style::getFont(Style::BigBold) : Style::getFont(Style::Big), isAction ? false : true, sender), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); msg->addColumn(new Text(text, Style::getFont(Style::Big), false, isAction ? QString("*%1 %2*").arg(sender, rawMessage) : rawMessage), ColumnFormat(1.0, ColumnFormat::VariableSize)); - msg->addColumn(new Spinner(":/ui/chatArea/spinner.png", QSizeF(16, 16), 8.0), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); + msg->addColumn(new Spinner(":/ui/chatArea/spinner.svg", QSizeF(16, 16), 8.0), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); if(!date.isNull()) msg->markAsSent(date); @@ -76,9 +76,9 @@ ChatMessage::Ptr ChatMessage::createChatInfoMessage(const QString &rawMessage, S QString img; switch(type) { - case INFO: img = ":/ui/chatArea/info.png"; break; - case ERROR: img = ":/ui/chatArea/error.png"; break; - case TYPING: img = ":/ui/chatArea/typing.png"; break; + case INFO: img = ":/ui/chatArea/info.svg"; break; + case ERROR: img = ":/ui/chatArea/error.svg"; break; + case TYPING: img = ":/ui/chatArea/typing.svg"; break; } msg->addColumn(new Image(QSizeF(18, 18), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index f52b18a26..4fc8b3c89 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include FileTransferWidget::FileTransferWidget(QWidget *parent, ToxFile file) @@ -45,8 +46,7 @@ FileTransferWidget::FileTransferWidget(QWidget *parent, ToxFile file) ui->progressLabel->setText("0kiB/s"); ui->etaLabel->setText(""); - setStyleSheet(Style::getStylesheet(":/ui/fileTransferInstance/grey.css")); - Style::repolish(this); + setColor(Style::getColor(Style::LightGrey), false); connect(Core::getInstance(), &Core::fileTransferInfo, this, &FileTransferWidget::onFileTransferInfo); connect(Core::getInstance(), &Core::fileTransferAccepted, this, &FileTransferWidget::onFileTransferAccepted); @@ -60,7 +60,7 @@ FileTransferWidget::FileTransferWidget(QWidget *parent, ToxFile file) if(fileInfo.direction == ToxFile::SENDING) showPreview(fileInfo.filePath); - setFixedHeight(90); + setFixedHeight(80); } FileTransferWidget::~FileTransferWidget() @@ -106,6 +106,17 @@ void FileTransferWidget::acceptTransfer(const QString &filepath) Core::getInstance()->acceptFileRecvRequest(fileInfo.friendId, fileInfo.fileNum, filepath); } +void FileTransferWidget::setColor(const QColor &c, bool whiteFont) +{ + color = c; + setProperty("fontColor", whiteFont ? "white" : "black"); + + setStyleSheet(Style::getStylesheet(":/ui/fileTransferInstance/filetransferWidget.css")); + Style::repolish(this); + + update(); +} + bool FileTransferWidget::isFilePathWritable(const QString &filepath) { QFile tmp(filepath); @@ -114,6 +125,20 @@ bool FileTransferWidget::isFilePathWritable(const QString &filepath) return writable; } +void FileTransferWidget::paintEvent(QPaintEvent *) +{ + // required by Hi-DPI support as border-image doesn't work. + QPainter painter(this); + painter.setRenderHint(QPainter::Antialiasing); + painter.setBrush(QBrush(color)); + painter.setPen(Qt::NoPen); + + qreal s = static_cast(geometry().height()) / static_cast(geometry().width()); + int r = 15; + + painter.drawRoundRect(geometry(), r * s, r); +} + void FileTransferWidget::onFileTransferInfo(ToxFile file) { QTime now = QTime::currentTime(); @@ -176,8 +201,7 @@ void FileTransferWidget::onFileTransferAccepted(ToxFile file) fileInfo = file; - setStyleSheet(Style::getStylesheet(":/ui/fileTransferInstance/yellow.css")); - Style::repolish(this); + setColor(Style::getColor(Style::Yellow), false); setupButtons(); } @@ -189,8 +213,7 @@ void FileTransferWidget::onFileTransferCancelled(ToxFile file) fileInfo = file; - setStyleSheet(Style::getStylesheet(":/ui/fileTransferInstance/red.css")); - Style::repolish(this); + setColor(Style::getColor(Style::Red), true); setupButtons(); hideWidgets(); @@ -213,8 +236,7 @@ void FileTransferWidget::onFileTransferPaused(ToxFile file) for(size_t i=0; ibottomButton->setIcon(QIcon(":/ui/fileTransferInstance/browse_path.png")); + ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/browse.svg")); ui->bottomButton->setObjectName("browse"); ui->bottomButton->show(); } @@ -273,32 +294,32 @@ void FileTransferWidget::setupButtons() switch(fileInfo.status) { case ToxFile::TRANSMITTING: - ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no_2x.png")); + ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->topButton->setObjectName("cancel"); - ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause_2x.png")); + ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg")); ui->bottomButton->setObjectName("pause"); break; case ToxFile::PAUSED: - ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no_2x.png")); + ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->topButton->setObjectName("cancel"); - ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/arrow_white_2x.png")); + ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/arrow_white.svg")); ui->bottomButton->setObjectName("resume"); break; case ToxFile::STOPPED: case ToxFile::BROKEN: //TODO: ? - ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no_2x.png")); + ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->topButton->setObjectName("cancel"); if(fileInfo.direction == ToxFile::SENDING) { - ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause_2x.png")); + ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg")); ui->bottomButton->setObjectName("pause"); } else { - ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/yes_2x.png")); + ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/yes.svg")); ui->bottomButton->setObjectName("accept"); } break; diff --git a/src/chatlog/content/filetransferwidget.h b/src/chatlog/content/filetransferwidget.h index 2777de809..3f00f281f 100644 --- a/src/chatlog/content/filetransferwidget.h +++ b/src/chatlog/content/filetransferwidget.h @@ -52,9 +52,12 @@ protected: void handleButton(QPushButton* btn); void showPreview(const QString& filename); void acceptTransfer(const QString& filepath); + void setColor(const QColor& c, bool whiteFont); bool isFilePathWritable(const QString& filepath); + virtual void paintEvent(QPaintEvent*); + private slots: void on_topButton_clicked(); void on_bottomButton_clicked(); @@ -64,6 +67,7 @@ private: ToxFile fileInfo; QTime lastTick; qint64 lastBytesSent = 0; + QColor color; static const uint8_t TRANSFER_ROLLING_AVG_COUNT = 4; uint8_t meanIndex = 0; diff --git a/src/chatlog/content/filetransferwidget.ui b/src/chatlog/content/filetransferwidget.ui index 868adf74e..eb4163cd8 100644 --- a/src/chatlog/content/filetransferwidget.ui +++ b/src/chatlog/content/filetransferwidget.ui @@ -14,6 +14,21 @@ Form + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + @@ -35,11 +50,20 @@ 0 - + 6 + + 5 + + + 5 + - 6 + 2 + + + 5 diff --git a/src/chatlog/content/image.cpp b/src/chatlog/content/image.cpp index bbea866a7..fb2a44d49 100644 --- a/src/chatlog/content/image.cpp +++ b/src/chatlog/content/image.cpp @@ -21,7 +21,7 @@ Image::Image(QSizeF Size, const QString& filename) : size(Size) { - pmap.load(filename); + icon.addFile(filename); } QRectF Image::boundingRect() const @@ -43,7 +43,7 @@ void Image::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWi { painter->setRenderHint(QPainter::SmoothPixmapTransform); painter->translate(-size.width() / 2.0, -size.height() / 2.0); - painter->drawPixmap(0, 0, size.width(), size.height(), pmap); + painter->drawPixmap(0, 0, size.width(), size.height(), icon.pixmap(size.toSize())); Q_UNUSED(option) Q_UNUSED(widget) diff --git a/src/chatlog/content/image.h b/src/chatlog/content/image.h index 020c00b29..6afe486bc 100644 --- a/src/chatlog/content/image.h +++ b/src/chatlog/content/image.h @@ -19,6 +19,8 @@ #include "../chatlinecontent.h" +#include + class Image : public ChatLineContent { public: @@ -32,7 +34,7 @@ public: private: QSizeF size; - QPixmap pmap; + QIcon icon; }; diff --git a/src/chatlog/content/notificationicon.cpp b/src/chatlog/content/notificationicon.cpp index b57caacde..5ca23099a 100644 --- a/src/chatlog/content/notificationicon.cpp +++ b/src/chatlog/content/notificationicon.cpp @@ -22,7 +22,7 @@ NotificationIcon::NotificationIcon(QSizeF Size) : size(Size) { - pmap.load(":/ui/chatArea/typing.png"); + icon.addFile(":/ui/chatArea/typing.svg"); updateTimer = new QTimer(this); updateTimer->setInterval(1000/60); @@ -44,7 +44,7 @@ void NotificationIcon::paint(QPainter *painter, const QStyleOptionGraphicsItem * painter->translate(-size.width() / 2.0, -size.height() / 2.0); painter->fillRect(QRect(0, 0, size.width(), size.height()), grad); - painter->drawPixmap(0, 0, size.width(), size.height(), pmap); + painter->drawPixmap(0, 0, size.width(), size.height(), icon.pixmap(size.toSize() * painter->device()->devicePixelRatio())); Q_UNUSED(option) Q_UNUSED(widget) diff --git a/src/chatlog/content/notificationicon.h b/src/chatlog/content/notificationicon.h index a68b87c5c..79ff083bd 100644 --- a/src/chatlog/content/notificationicon.h +++ b/src/chatlog/content/notificationicon.h @@ -20,6 +20,7 @@ #include "../chatlinecontent.h" #include +#include class QTimer; @@ -40,7 +41,7 @@ private slots: private: QSizeF size; - QPixmap pmap; + QIcon icon; QLinearGradient grad; QTimer* updateTimer = nullptr; diff --git a/src/chatlog/content/spinner.cpp b/src/chatlog/content/spinner.cpp index 7d912fdfb..e32bcf02c 100644 --- a/src/chatlog/content/spinner.cpp +++ b/src/chatlog/content/spinner.cpp @@ -23,7 +23,7 @@ Spinner::Spinner(const QString &img, QSizeF Size, qreal speed) : size(Size) , rotSpeed(speed) { - pmap.load(img); + icon.addFile(img); timer.setInterval(33); // 30Hz timer.setSingleShot(false); @@ -52,7 +52,7 @@ void Spinner::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, Q painter->translate(-size.width() / 2.0, -size.height() / 2.0); painter->setTransform(rotMat, true); painter->setRenderHint(QPainter::SmoothPixmapTransform); - painter->drawPixmap(0, 0, size.width(), size.height(), pmap); + painter->drawPixmap(0, 0, size.width(), size.height(), icon.pixmap(size.toSize() * painter->device()->devicePixelRatio())); Q_UNUSED(option) Q_UNUSED(widget) diff --git a/src/chatlog/content/spinner.h b/src/chatlog/content/spinner.h index 894a10761..e51401eb7 100644 --- a/src/chatlog/content/spinner.h +++ b/src/chatlog/content/spinner.h @@ -21,6 +21,7 @@ #include #include +#include class Spinner : public QObject, public ChatLineContent { @@ -40,7 +41,7 @@ private slots: private: QSizeF size; - QPixmap pmap; + QIcon icon; qreal rot = 0.0; qreal rotSpeed; QTimer timer; diff --git a/ui/chatArea/error.png b/ui/chatArea/error.png deleted file mode 100644 index e7ee3deeab5280785d48e8bb288ebc120f59fae0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmVlJ`WWZ=40M9RM_ yb419dQe;!9FvLfsJaFCWg!%8^NLYXU*uDTLVW#*W$5?Ct0000 + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/ui/chatArea/info.png b/ui/chatArea/info.png deleted file mode 100644 index 07755967a3b5630592874e1458955a46883c5e67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmV+k0`~ohP)zdP#1i}grfPfls32%Tz!H+}vh*DrXTD&&}yFiwqNS0I1J@?GHGjm2% z6&pSs&yOG`qc9F2P)38wMz&P9@g*+w@$AD}>97loS$BY%I^?&ewyRd5+;V+-9EIb2jXP=m zXmjxS6o7Z@(|7|tkDRH)KHUaR4Jd7hY8ls(1gP4r93bcRz=CE+iVd0$iRr@I#h{>4fog{(6xJfD!!3dO- ziU^bq8dMV7(V$|&?9>v-)HbrEx&cs!JmCL_h#&UeXKmr+{c=1afgf=7?H2$qU-e?# z_}%Er=FCnJ9%QX?(OkRD&V6W&Yv_O7XLS;VHd=W8ZzPU?{n-8hVRxIavd$lz00000 LNkvXXu0mjf0JYtC diff --git a/ui/chatArea/info.svg b/ui/chatArea/info.svg new file mode 100644 index 000000000..c6eb5b0e4 --- /dev/null +++ b/ui/chatArea/info.svg @@ -0,0 +1,62 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/ui/chatArea/spinner.png b/ui/chatArea/spinner.png deleted file mode 100644 index 22a1d8b2ee9eb49dbb9b1701ea73deabe642ab3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1044 zcmV+v1nc{WP)Gc$|L)Rbo4Kq{5Gtz0foh{!X*wkGNZBJ!4qWU|@pFKq*4GMU)o;^Hyj z72xJ3jO+EUs!o>6<>Rxnvr8=jjE;_OFPF<70Q=i8uGeqY+J4{nzi$d4l}g=FsZ>4# z?%4$Ms;+i)bnKg&n)<0Bfa|(90bc+QHYj#YM9!+}8Q?5%tE%>i$S$C-!MO!%?LOc4 zFE#=w0EZ(A6jk-5rKP3!3WdV8umsn2p9IE%MsQrJA`YGc zju>MuMa0+1^SooK`g%n8HDgR>9e{|4>$>x*x+~mV1o6V*JSZhOPx2it0RREzgJEAXaK0vWpTwtX;)dTFg z(Ew|$*z>$uRXtJ{4^;J$d_F(lu0cAT?pj`6J}Dx%*Y2z8l|&-3x3&|W2sz&&B6I0< zx~pA)QmOQ+i0lRKs$C*-Vq#*VvIfxG+xsDKKBUHdrBW$ssx_47dHt-6=6V%@H=%AE zyRLf}D1;Rgk-5&!&KD;qCyULPCzHwNL}Uht*T+=#jeI^oz5!qr;#1(Uh`N_VWH6V@ zos2Rb85!AWtvw1n8PF~K>FQH_4&2fJqE-EEt$o7x{V!`bov_SoHhT`(!^%x(GqemG zsyB}W05HZ}s8lKs18)PiO=AV#2X-1`PK6~jbv5%m?*Uak4jd%<`>uCZ{a8fCjWORe z%4-Uss-dBw-grEIsP1yQ4fvIs%c + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/ui/chatArea/symbols.svg b/ui/chatArea/symbols.svg index 2d56a1657..68ef8e4b6 100644 --- a/ui/chatArea/symbols.svg +++ b/ui/chatArea/symbols.svg @@ -7,10 +7,34 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.2" width="744.09448" height="1052.3622" - id="svg2"> + id="svg2" + inkscape:version="0.48.5 r10040" + sodipodi:docname="symbols.svg"> + ! + id="info" + inkscape:export-xdpi="11.328032" + inkscape:export-ydpi="11.328032"> - i + + + + + @@ -97,25 +133,37 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Aller;-inkscape-font-specification:Aller">i + id="error" + inkscape:export-xdpi="5.6643357" + inkscape:export-ydpi="5.6643357"> - i + + + + + gcyqV(DCY@~pSR(rZQ zhFJ8zy<(r`;e` zaN*D~d7d{l<=?j(2j{RBF1Fe(W#c2KR&ILJ{m9CM+e+esyZ1j?BODiy*rPA=q2~b0 z{U1j(ZtA?x^trY(?~&~4CS61Q8|)@;zjRM(|G!~*&o;KVWeJT^!8rv-q^l~<)=d6g sI!`_Q!ax5yrA5(u$|g=#3x6qoQ|w6AD?Wh_KxZ>}y85}Sb4q9e06xfV%>V!Z diff --git a/ui/chatArea/typing.svg b/ui/chatArea/typing.svg new file mode 100644 index 000000000..35c3e1d5b --- /dev/null +++ b/ui/chatArea/typing.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/ui/fileTransferInstance/arrow_white.svg b/ui/fileTransferInstance/arrow_white.svg new file mode 100644 index 000000000..ee2e9fdcd --- /dev/null +++ b/ui/fileTransferInstance/arrow_white.svg @@ -0,0 +1,23 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/ui/fileTransferInstance/arrow_white_2x.png b/ui/fileTransferInstance/arrow_white_2x.png deleted file mode 100644 index 646dd5ad8f0eb32b03b0bec218dce78ccb119712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq*#ibJVQ8upoSx*1IXtr@Q5r1 zsyPC}j8nDwq=AAJo-U3d8WX2p3gkWHAmDnDoohk^i;4oHriTNQ(1eB-FHOFJf*%>% za-=fK^FRH2ruJD)SeRdC!rCL#>%X5|1o(*Wj`E#?e}RcfD)Et8&+}31xA=`yQ%P zZd+#}pWrP~c&%XR&L>9uTdta~Y-Llp#TxLhx5%tV>z@BxLtNt=*sXF)LF_T-k2zORO~cYgooUkP zbSux?Z~m{*#?-?q!EGRxpmQLiVIxB_tAqNq+hxWy*b_qPu_~szqm}~02vOiTYm0vXE9NmA2DWo~s;J`5pB-vFc*);~9w(_a@h<|BT5v;C@a0 z=GCbB`|J35N^f6zy4rfK-)t3oZ@1Di?$m34 zKYiYlgI~8^JN(7;&e4SJUovZN`7#TyPxUBz9@S>g&SLcH>Fic(V5Bg3y85}Sb4q9e E0HL0>9RL6T diff --git a/ui/fileTransferInstance/background_red.png b/ui/fileTransferInstance/background_red.png deleted file mode 100644 index 0ac0429541c61f35fd217b8ec096f15925562cf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^-as6}!3HExojbJzNU;<xPHLSr@;v!@r;4SzrRvLTwe=G5I&Fz3HfF|6u2HL; zpLwAAn%d3vzyCdd`s+Zz_TE@KvHQ2*s-3((=dw-5_DNN4nYY$0k$X04o7T#BTi@tu zHqYN5tQT=+JjT?+D#2|amY{PWqG2OL@<0m&1c~cs-&(pPZ^gAO#h$TG*JduCv}AU5 z7yHGjuZw<^z4Lq*v-{oe!#_;#98cK3Wo7LvUuNa?sUDw>Z{^wlPRRJ@w$o(=z^GyH MboFyt=akR{07r_y#sB~S diff --git a/ui/fileTransferInstance/background_yellow.png b/ui/fileTransferInstance/background_yellow.png deleted file mode 100644 index 1ba362293bd38ab3f3d16d1175c498ded3a6e936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^-as6}!3HExojbJzNU;<lp#TxLhx5%tV>#wYiU|a^=`r2TnieE~TIrO+DW(~ZB0W@BR=8X`vyzkN z`Q*->#Yeoa)J|Ua`jYiK@zW}+RX(d+R#EMLKIh4lClgYPv&(M(JG$icE}8G$&sF3- z@3~2Rn6}mP+UB(HpGzteR=obD_kQyG_0v-)oi|**Q+U1V*PcroLOpHInC8RCAV8If-xN94VJ?{prO + width="12" + height="12" + id="svg2"> - + id="defs4"> + + + + + + + + + + + + + + + + @@ -48,39 +87,33 @@ - - - + transform="translate(0,-2092.7244)" + id="layer1"> + + + + + + + + diff --git a/ui/fileTransferInstance/browse_path.png b/ui/fileTransferInstance/browse_path.png deleted file mode 100644 index 5fe4251a61cced23c94f46cc7f40e85a5be13585..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)X1^@s6FWx?200004b3#c}2nYxW zd^!M!40?wSrUy- zq9W0`0val%WPLR{63IqMVmp;k$fGc_^3NP|#!SSoI`e+~p7YK*IZ#vTZ*^PkuG^an z=u$WQuO0PA+mPPExKjseUt5r$>R}1wO@GvZDxb&zO#)-Z=LoP;toMPvVtpAA=bsrQ z1)X{~$!eY6t_Iv%y-h%szr8I`t==AW85rz{uSdjfN&OA*b~Z<4hUyTo*b)9m;>u1W zOhO$|r&Cv2ohUQR9$%dS{sPy)DR8fDsr|VIl@qDs>SLmIx6O&xfZjxIzL@qy<$``S z%x8nltZNK9smLF<1zG~061km-IBNwI5m&$*aP= + + +image/svg+xml \ No newline at end of file diff --git a/ui/fileTransferInstance/no_2x.png b/ui/fileTransferInstance/no_2x.png deleted file mode 100644 index 86c05eb5a378e1a9c6f906843e7fd7434076db6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8)t)YnAr-ggT)oKKYQVu7@Q9`Fk%w&WM45wvB~7P{6QqKk zeDZkbKXtOnQm?(`mrPD--fY{dvpQw^hPAyjM7yNYjFVdQ&MBb@0D!(`cmMzZ diff --git a/ui/fileTransferInstance/pause.svg b/ui/fileTransferInstance/pause.svg new file mode 100644 index 000000000..b02c4dd53 --- /dev/null +++ b/ui/fileTransferInstance/pause.svg @@ -0,0 +1,33 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/ui/fileTransferInstance/pause_2x.png b/ui/fileTransferInstance/pause_2x.png deleted file mode 100644 index 6ee39a91e3cd34fe44f599dd3f7791f6aa733426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRp!3HFQtmCqPlw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlB4tk($B>F!Nq_iRcxE(AWHfgOJa3V8U + + +image/svg+xml \ No newline at end of file diff --git a/ui/fileTransferInstance/yes_2x.png b/ui/fileTransferInstance/yes_2x.png deleted file mode 100644 index a4de224446c623e7d85d4f2b6eba5a98c90edb97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)i!3HEJJLv8MQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jiq?9%IEGZ*+H&P0Z?gdp%Y{vh${QSS_vV?nz2NAX5P0K2 zsfrJC)*X>}oxA*u_JSSkf;%T>U(uPh