Browse Source

minor bugfixes

pull/39/head
Blue 10 months ago
parent
commit
a8698cc94f
5 changed files with 21 additions and 21 deletions
  1. +8
    -0
      CHANGELOG.md
  2. +1
    -1
      core/account.cpp
  3. +4
    -8
      translations/squawk.ru.ts
  4. +1
    -1
      ui/squawk.cpp
  5. +7
    -11
      ui/utils/messageline.cpp

+ 8
- 0
CHANGELOG.md View File

@ -1,5 +1,13 @@
# Changelog
## Squawk 0.1.5 (UNRELEASED)
### Bug fixes
- error with sending attached files to the conference
- error with building on lower versions of QXmpp
- error on the first access to the conference database
- quit now actually quits the app
## Squawk 0.1.4 (Apr 14, 2020)
### New features
- message line now is in the same window with roster (new window dialog is still able to opened on context menu)


+ 1
- 1
core/account.cpp View File

@ -1141,7 +1141,7 @@ void Core::Account::onClientError(QXmppClient::Error err)
case QXmppStanza::Error::UnexpectedRequest:
errorText = "Unexpected request";
break;
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 1, 0)
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 3, 0)
case QXmppStanza::Error::PolicyViolation:
errorText = "Policy violation";
break;


+ 4
- 8
translations/squawk.ru.ts View File

@ -383,10 +383,6 @@ p, li { white-space: pre-wrap; }
<source>Download</source>
<translation>Скачать</translation>
</message>
<message>
<source>Push the button to daownload the file</source>
<translation>Нажмите на кнопку что бы загрузить файл</translation>
</message>
<message>
<source>Error uploading file: %1
You can try again</source>
@ -409,6 +405,10 @@ You can try again</source>
<source>Uploading...</source>
<translation>Загружается...</translation>
</message>
<message>
<source>Push the button to download the file</source>
<translation>Нажмите на кнопку что бы загрузить файл</translation>
</message>
</context>
<context>
<name>Models::Room</name>
@ -548,10 +548,6 @@ You can try again</source>
<source>Add conference</source>
<translation>Присоединиться к беседе</translation>
</message>
<message>
<source>Contact list</source>
<translation>Список контактов</translation>
</message>
<message>
<source>Disconnect</source>
<translation>Отключить</translation>


+ 1
- 1
ui/squawk.cpp View File

@ -54,6 +54,7 @@ Squawk::Squawk(QWidget *parent) :
connect(m_ui->actionAccounts, &QAction::triggered, this, &Squawk::onAccounts);
connect(m_ui->actionAddContact, &QAction::triggered, this, &Squawk::onNewContact);
connect(m_ui->actionAddConference, &QAction::triggered, this, &Squawk::onNewConference);
connect(m_ui->actionQuit, &QAction::triggered, this, &Squawk::close);
connect(m_ui->comboBox, qOverload<int>(&QComboBox::activated), this, &Squawk::onComboboxActivated);
//connect(m_ui->roster, &QTreeView::doubleClicked, this, &Squawk::onRosterItemDoubleClicked);
connect(m_ui->roster, &QTreeView::customContextMenuRequested, this, &Squawk::onRosterContextMenu);
@ -64,7 +65,6 @@ Squawk::Squawk(QWidget *parent) :
connect(contextMenu, &QMenu::aboutToHide, this, &Squawk::onContextAboutToHide);
//m_ui->mainToolBar->addWidget(m_ui->comboBox);
setWindowTitle(tr("Contact list"));
if (testAttribute(Qt::WA_TranslucentBackground)) {
m_ui->roster->viewport()->setAutoFillBackground(false);
}


+ 7
- 11
ui/utils/messageline.cpp View File

@ -369,16 +369,12 @@ void MessageLine::responseLocalFile(const QString& messageId, const QString& pat
if (muItr != uploadPaths.end()) {
uploadPaths.erase(muItr);
}
if (room) {
removeMessage(messageId);
} else {
Shared::Message msg = itr->second->getMessage();
removeMessage(messageId);
msg.setCurrentTime();
message(msg);
itr = messageIndex.find(messageId);
itr->second->showFile(path);
}
Shared::Message msg = itr->second->getMessage();
removeMessage(messageId);
msg.setCurrentTime();
message(msg);
itr = messageIndex.find(messageId);
itr->second->showFile(path);
} else {
itr->second->showFile(path); //then it is already cached file
}
@ -387,7 +383,7 @@ void MessageLine::responseLocalFile(const QString& messageId, const QString& pat
if (uItr == uploading.end()) {
const Shared::Message& msg = itr->second->getMessage();
itr->second->addButton(QIcon::fromTheme("download"), tr("Download"), "<a href=\"" + msg.getOutOfBandUrl() + "\">" + msg.getOutOfBandUrl() + "</a>");
itr->second->showComment(tr("Push the button to daownload the file"));
itr->second->showComment(tr("Push the button to download the file"));
} else {
qDebug() << "An unhandled state for file uploading - empty path";
}


Loading…
Cancel
Save