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 e7ee3deea..000000000
Binary files a/ui/chatArea/error.png and /dev/null differ
diff --git a/ui/chatArea/error.svg b/ui/chatArea/error.svg
new file mode 100644
index 000000000..4a28a42fa
--- /dev/null
+++ b/ui/chatArea/error.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/ui/chatArea/info.png b/ui/chatArea/info.png
deleted file mode 100644
index 07755967a..000000000
Binary files a/ui/chatArea/info.png and /dev/null differ
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 @@
+
+
+
+
diff --git a/ui/chatArea/spinner.png b/ui/chatArea/spinner.png
deleted file mode 100644
index 22a1d8b2e..000000000
Binary files a/ui/chatArea/spinner.png and /dev/null differ
diff --git a/ui/chatArea/spinner.svg b/ui/chatArea/spinner.svg
new file mode 100644
index 000000000..c5b6d1241
--- /dev/null
+++ b/ui/chatArea/spinner.svg
@@ -0,0 +1,45 @@
+
+
+
+
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
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
\ 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 646dd5ad8..000000000
Binary files a/ui/fileTransferInstance/arrow_white_2x.png and /dev/null differ
diff --git a/ui/fileTransferInstance/background_green.png b/ui/fileTransferInstance/background_green.png
deleted file mode 100644
index 07c072b7b..000000000
Binary files a/ui/fileTransferInstance/background_green.png and /dev/null differ
diff --git a/ui/fileTransferInstance/background_grey.png b/ui/fileTransferInstance/background_grey.png
deleted file mode 100644
index 5392a414a..000000000
Binary files a/ui/fileTransferInstance/background_grey.png and /dev/null differ
diff --git a/ui/fileTransferInstance/background_red.png b/ui/fileTransferInstance/background_red.png
deleted file mode 100644
index 0ac042954..000000000
Binary files a/ui/fileTransferInstance/background_red.png and /dev/null differ
diff --git a/ui/fileTransferInstance/background_yellow.png b/ui/fileTransferInstance/background_yellow.png
deleted file mode 100644
index 1ba362293..000000000
Binary files a/ui/fileTransferInstance/background_yellow.png and /dev/null differ
diff --git a/ui/fileTransferInstance/browse.svg b/ui/fileTransferInstance/browse.svg
index e545118aa..4123ec52c 100644
--- a/ui/fileTransferInstance/browse.svg
+++ b/ui/fileTransferInstance/browse.svg
@@ -7,34 +7,73 @@
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"
- width="26"
- height="25"
- id="svg2"
version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="browse.svg">
+ 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 5fe4251a6..000000000
Binary files a/ui/fileTransferInstance/browse_path.png and /dev/null differ
diff --git a/ui/fileTransferInstance/red.css b/ui/fileTransferInstance/filetransferWidget.css
similarity index 50%
rename from ui/fileTransferInstance/red.css
rename to ui/fileTransferInstance/filetransferWidget.css
index a50c94a59..60ff2bcbe 100644
--- a/ui/fileTransferInstance/red.css
+++ b/ui/fileTransferInstance/filetransferWidget.css
@@ -1,13 +1,10 @@
-QFrame {
- border-image: url(:/ui/fileTransferInstance/background_red.png);
- border-left:25; padding-left:-25;
- border-top:28; padding-top:-28;
- border-right:25; padding-right:-25;
- border-bottom:28; padding-bottom:-28;
+[fontColor="white"] QLabel {
+ color:white;
+ font:@medium;
}
-QLabel {
- color:white;
+[fontColor="black"] QLabel {
+ color:black;
font:@medium;
}
diff --git a/ui/fileTransferInstance/green.css b/ui/fileTransferInstance/green.css
deleted file mode 100644
index f7aa6464d..000000000
--- a/ui/fileTransferInstance/green.css
+++ /dev/null
@@ -1,28 +0,0 @@
-QFrame {
- border-image: url(:/ui/fileTransferInstance/background_green.png);
- border-left:25; padding-left:-25;
- border-top:28; padding-top:-28;
- border-right:25; padding-right:-25;
- border-bottom:28; padding-bottom:-28;
-}
-
-QLabel {
- color:white;
- font:@medium;
-}
-
-QPushButton {
- margin:0;
-}
-
-QProgressBar {
- border: 2px solid black;
- border-radius: 0px;
- color: white;
- background-color:white;
-}
-
-QProgressBar::chunk {
- background-color: black;
- width: 20px;
-}
\ No newline at end of file
diff --git a/ui/fileTransferInstance/grey.css b/ui/fileTransferInstance/grey.css
deleted file mode 100644
index fbfe9f81f..000000000
--- a/ui/fileTransferInstance/grey.css
+++ /dev/null
@@ -1,28 +0,0 @@
-QFrame {
- border-image: url(:/ui/fileTransferInstance/background_grey.png);
- border-left:25; padding-left:-25;
- border-top:28; padding-top:-28;
- border-right:25; padding-right:-25;
- border-bottom:28; padding-bottom:-28;
-}
-
-QLabel {
- color:black;
- font:@medium;
-}
-
-QPushButton {
- margin:0;
-}
-
-QProgressBar {
- border: 2px solid black;
- border-radius: 0px;
- color: white;
- background-color:white;
-}
-
-QProgressBar::chunk {
- background-color: black;
- width: 20px;
-}
\ No newline at end of file
diff --git a/ui/fileTransferInstance/no.svg b/ui/fileTransferInstance/no.svg
new file mode 100644
index 000000000..a90227ea6
--- /dev/null
+++ b/ui/fileTransferInstance/no.svg
@@ -0,0 +1,23 @@
+
+
+
+
\ 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 86c05eb5a..000000000
Binary files a/ui/fileTransferInstance/no_2x.png and /dev/null differ
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 @@
+
+
+
+
\ 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 6ee39a91e..000000000
Binary files a/ui/fileTransferInstance/pause_2x.png and /dev/null differ
diff --git a/ui/fileTransferInstance/yellow.css b/ui/fileTransferInstance/yellow.css
deleted file mode 100644
index a460e35ef..000000000
--- a/ui/fileTransferInstance/yellow.css
+++ /dev/null
@@ -1,28 +0,0 @@
-QFrame {
- border-image: url(:/ui/fileTransferInstance/background_yellow.png);
- border-left:25; padding-left:-25;
- border-top:28; padding-top:-28;
- border-right:25; padding-right:-25;
- border-bottom:28; padding-bottom:-28;
-}
-
-QLabel {
- color:black;
- font:@medium;
-}
-
-QPushButton {
- margin:0;
-}
-
-QProgressBar {
- border: 2px solid black;
- border-radius: 0px;
- color: white;
- background-color:white;
-}
-
-QProgressBar::chunk {
- background-color: black;
- width: 20px;
-}
\ No newline at end of file
diff --git a/ui/fileTransferInstance/yes.svg b/ui/fileTransferInstance/yes.svg
new file mode 100644
index 000000000..def828488
--- /dev/null
+++ b/ui/fileTransferInstance/yes.svg
@@ -0,0 +1,22 @@
+
+
+
+
\ 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 a4de22444..000000000
Binary files a/ui/fileTransferInstance/yes_2x.png and /dev/null differ