pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Invert accept and reject FT buttons 

People were clicking reject by accident after the chat scrolled up. Now they'll click accept by accident, which can easily be cancelled
pull/1664/head
tux3 10 years ago
parent
1bdb84825d
commit
2fc5f781c9
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 21 additions and 21 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. 42
      src/chatlog/content/filetransferwidget.cpp

42
src/chatlog/content/filetransferwidget.cpp
Unescape View File

@ -401,46 +401,46 @@ void FileTransferWidget::setupButtons()
switch(fileInfo.status) switch(fileInfo.status)
{ {
case ToxFile::TRANSMITTING: case ToxFile::TRANSMITTING:
ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg"));
ui->topButton->setObjectName("cancel"); ui->bottomButton->setObjectName("cancel");
ui->topButton->setToolTip(tr("Cancel transfer")); ui->bottomButton->setToolTip(tr("Cancel transfer"));
ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg")); ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg"));
ui->bottomButton->setObjectName("pause"); ui->topButton->setObjectName("pause");
ui->bottomButton->setToolTip(tr("Pause transfer")); ui->topButton->setToolTip(tr("Pause transfer"));
setButtonColor(Style::getColor(Style::Green)); setButtonColor(Style::getColor(Style::Green));
break; break;
case ToxFile::PAUSED: case ToxFile::PAUSED:
ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg"));
ui->topButton->setObjectName("cancel"); ui->bottomButton->setObjectName("cancel");
ui->topButton->setToolTip(tr("Cancel transfer")); ui->bottomButton->setToolTip(tr("Cancel transfer"));
ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/arrow_white.svg")); ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/arrow_white.svg"));
ui->bottomButton->setObjectName("resume"); ui->topButton->setObjectName("resume");
ui->bottomButton->setToolTip(tr("Resume transfer")); ui->topButton->setToolTip(tr("Resume transfer"));
setButtonColor(Style::getColor(Style::LightGrey)); setButtonColor(Style::getColor(Style::LightGrey));
break; break;
case ToxFile::STOPPED: case ToxFile::STOPPED:
case ToxFile::BROKEN: //TODO: ? case ToxFile::BROKEN: //TODO: ?
ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg")); ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/no.svg"));
ui->topButton->setObjectName("cancel"); ui->bottomButton->setObjectName("cancel");
ui->topButton->setToolTip(tr("Cancel transfer")); ui->bottomButton->setToolTip(tr("Cancel transfer"));
if (fileInfo.direction == ToxFile::SENDING) if (fileInfo.direction == ToxFile::SENDING)
{ {
ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg")); ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/pause.svg"));
ui->bottomButton->setObjectName("pause"); ui->topButton->setObjectName("pause");
ui->bottomButton->setToolTip(tr("Pause transfer")); ui->topButton->setToolTip(tr("Pause transfer"));
} }
else else
{ {
ui->bottomButton->setIcon(QIcon(":/ui/fileTransferInstance/yes.svg")); ui->topButton->setIcon(QIcon(":/ui/fileTransferInstance/yes.svg"));
ui->bottomButton->setObjectName("accept"); ui->topButton->setObjectName("accept");
ui->bottomButton->setToolTip(tr("Accept transfer")); ui->topButton->setToolTip(tr("Accept transfer"));
} }
break; break;
} }

Write Preview
Loading…
Cancel
Save