forked from blue/squawk
duck taped annoying scroll problem, started with local archive
This commit is contained in:
parent
fad72d8db2
commit
e04f7db7c2
71
core/archive.cpp
Normal file
71
core/archive.cpp
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
/*
|
||||||
|
* <one line to give the program's name and a brief idea of what it does.>
|
||||||
|
* Copyright (C) 2019 Yury Gubich <blue@macaw.me>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "archive.h"
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <QStandardPaths>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
Core::Archive::Archive(const QString& p_jid, QObject* parent):
|
||||||
|
QObject(parent),
|
||||||
|
jid(p_jid),
|
||||||
|
opened(false),
|
||||||
|
environment(lmdb::env::create()),
|
||||||
|
dbi(0)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Core::Archive::~Archive()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void Core::Archive::open(const QString& account)
|
||||||
|
{
|
||||||
|
if (!opened) {
|
||||||
|
QString path(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
|
||||||
|
path += "/" + account;
|
||||||
|
int state1 = mkdir(path.toStdString().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
|
||||||
|
if (state1 != 0 && errno != EEXIST) {
|
||||||
|
qDebug() << "Failed to create account " << account << " database folder";
|
||||||
|
throw 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
path += "/" + jid;
|
||||||
|
|
||||||
|
int state2 = mkdir(path.toStdString().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
|
||||||
|
if (state2 != 0 && errno != EEXIST) {
|
||||||
|
qDebug() << "Failed to create " << jid.toStdString().c_str() << " database folder in account" << account;
|
||||||
|
throw 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
environment.set_mapsize(1UL * 1024UL * 1024UL * 1024UL);
|
||||||
|
environment.set_max_dbs(10);
|
||||||
|
environment.open(path.toStdString().c_str(), 0, 0664);
|
||||||
|
|
||||||
|
lmdb::txn wTrans = lmdb::txn::begin(environment);
|
||||||
|
dbi = lmdb::dbi::open(wTrans, "main", MDB_CREATE);
|
||||||
|
wTrans.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Core::Archive::addElement(const Shared::Message& message)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
57
core/archive.h
Normal file
57
core/archive.h
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* <one line to give the program's name and a brief idea of what it does.>
|
||||||
|
* Copyright (C) 2019 Yury Gubich <blue@macaw.me>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CORE_ARCHIVE_H
|
||||||
|
#define CORE_ARCHIVE_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include "../global.h"
|
||||||
|
#include "lmdb++.h"
|
||||||
|
|
||||||
|
namespace Core {
|
||||||
|
|
||||||
|
class Archive : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
Archive(const QString& jid, QObject* parent);
|
||||||
|
~Archive();
|
||||||
|
|
||||||
|
void open(const QString& account);
|
||||||
|
|
||||||
|
QString addElement(const Shared::Message& message);
|
||||||
|
Shared::Message getElement(const QString& id) const;
|
||||||
|
Shared::Message oldest() const;
|
||||||
|
Shared::Message newest() const;
|
||||||
|
void removeElement(const QString& id);
|
||||||
|
void clear();
|
||||||
|
void modifyElement(const QString& id, const Shared::Message& newValue);
|
||||||
|
unsigned int size() const;
|
||||||
|
|
||||||
|
public:
|
||||||
|
const QString jid;
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool opened;
|
||||||
|
lmdb::env environment;
|
||||||
|
lmdb::dbi dbi;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // CORE_ARCHIVE_H
|
1913
core/lmdb++.h
Normal file
1913
core/lmdb++.h
Normal file
File diff suppressed because it is too large
Load Diff
2
main.cpp
2
main.cpp
@ -54,6 +54,8 @@ int main(int argc, char *argv[])
|
|||||||
QObject::connect(squawk, SIGNAL(stateChanged(int)), &w, SLOT(stateChanged(int)));
|
QObject::connect(squawk, SIGNAL(stateChanged(int)), &w, SLOT(stateChanged(int)));
|
||||||
QObject::connect(squawk, SIGNAL(accountMessage(const QString&, const Shared::Message&)), &w, SLOT(accountMessage(const QString&, const Shared::Message&)));
|
QObject::connect(squawk, SIGNAL(accountMessage(const QString&, const Shared::Message&)), &w, SLOT(accountMessage(const QString&, const Shared::Message&)));
|
||||||
|
|
||||||
|
//qDebug() << QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
|
||||||
|
|
||||||
coreThread->start();
|
coreThread->start();
|
||||||
|
|
||||||
int result = app.exec();
|
int result = app.exec();
|
||||||
|
@ -29,7 +29,8 @@ Conversation::Conversation(Models::Contact* p_contact, QWidget* parent):
|
|||||||
ker(),
|
ker(),
|
||||||
activePalResource(),
|
activePalResource(),
|
||||||
thread(),
|
thread(),
|
||||||
scroll(nothing)
|
scroll(down),
|
||||||
|
manualSliderChange(false)
|
||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
m_ui->splitter->setSizes({300, 0});
|
m_ui->splitter->setSizes({300, 0});
|
||||||
@ -54,9 +55,11 @@ Conversation::Conversation(Models::Contact* p_contact, QWidget* parent):
|
|||||||
line->setMyName(p_contact->getAccountName());
|
line->setMyName(p_contact->getAccountName());
|
||||||
connect(line, SIGNAL(resize(int)), this, SLOT(onMessagesResize(int)));
|
connect(line, SIGNAL(resize(int)), this, SLOT(onMessagesResize(int)));
|
||||||
|
|
||||||
|
QScrollBar* vs = m_ui->scrollArea->verticalScrollBar();
|
||||||
m_ui->scrollArea->setWidget(line);
|
m_ui->scrollArea->setWidget(line);
|
||||||
m_ui->scrollArea->verticalScrollBar()->setBackgroundRole(QPalette::Base);
|
vs->setBackgroundRole(QPalette::Base);
|
||||||
m_ui->scrollArea->verticalScrollBar()->setAutoFillBackground(true);;
|
vs->setAutoFillBackground(true);
|
||||||
|
connect(vs, SIGNAL(valueChanged(int)), this, SLOT(onSliderValueChanged(int)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Conversation::~Conversation()
|
Conversation::~Conversation()
|
||||||
@ -118,13 +121,6 @@ void Conversation::addMessage(const Shared::Message& data)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (scroll == nothing) {
|
|
||||||
if (pos == max) {
|
|
||||||
scroll = down;
|
|
||||||
} else if (place != MessageLine::end) { //todo make some better handling of that situation
|
|
||||||
scroll = keep;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!data.getOutgoing()) {
|
if (!data.getOutgoing()) {
|
||||||
const QString& res = data.getPenPalResource();
|
const QString& res = data.getPenPalResource();
|
||||||
if (res.size() > 0) {
|
if (res.size() > 0) {
|
||||||
@ -194,16 +190,24 @@ void Conversation::onEnterPressed()
|
|||||||
|
|
||||||
void Conversation::onMessagesResize(int amount)
|
void Conversation::onMessagesResize(int amount)
|
||||||
{
|
{
|
||||||
|
manualSliderChange = true;
|
||||||
switch (scroll) {
|
switch (scroll) {
|
||||||
case down:
|
case down:
|
||||||
m_ui->scrollArea->verticalScrollBar()->setValue(m_ui->scrollArea->verticalScrollBar()->maximum());
|
m_ui->scrollArea->verticalScrollBar()->setValue(m_ui->scrollArea->verticalScrollBar()->maximum());
|
||||||
break;
|
break;
|
||||||
case keep:
|
|
||||||
m_ui->scrollArea->verticalScrollBar()->setValue(m_ui->scrollArea->verticalScrollBar()->value() - amount);
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
scroll = nothing;
|
manualSliderChange = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Conversation::onSliderValueChanged(int value)
|
||||||
|
{
|
||||||
|
if (!manualSliderChange) {
|
||||||
|
if (value == m_ui->scrollArea->verticalScrollBar()->maximum()) {
|
||||||
|
scroll = down;
|
||||||
|
} else {
|
||||||
|
scroll = nothing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -69,6 +69,7 @@ protected slots:
|
|||||||
void onContactChanged(Models::Item* item, int row, int col);
|
void onContactChanged(Models::Item* item, int row, int col);
|
||||||
void onEnterPressed();
|
void onEnterPressed();
|
||||||
void onMessagesResize(int amount);
|
void onMessagesResize(int amount);
|
||||||
|
void onSliderValueChanged(int value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum Scroll {
|
enum Scroll {
|
||||||
@ -83,6 +84,7 @@ private:
|
|||||||
QString activePalResource;
|
QString activePalResource;
|
||||||
QString thread;
|
QString thread;
|
||||||
Scroll scroll;
|
Scroll scroll;
|
||||||
|
bool manualSliderChange;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CONVERSATION_H
|
#endif // CONVERSATION_H
|
||||||
|
Loading…
Reference in New Issue
Block a user