/
+
##Documentation:
diff --git a/audio/ToxicIncomingCall.pcm b/audio/ToxicIncomingCall.pcm
new file mode 100644
index 000000000..8239c74cf
Binary files /dev/null and b/audio/ToxicIncomingCall.pcm differ
diff --git a/bootstrap.sh b/bootstrap.sh
index 9c67a7af9..95a11febe 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -103,7 +103,7 @@ rm -rf ${BASE_DIR}/${TOX_CORE_DIR}
# afterwards install libsodium to INSTALL_DIR
# skip the installation if TOX_ONLY is true
if [[ $TOX_ONLY = "false" ]]; then
- git clone git://github.com/jedisct1/libsodium.git ${BASE_DIR}/${SODIUM_DIR}
+ git clone git://github.com/jedisct1/libsodium.git ${BASE_DIR}/${SODIUM_DIR} --depth 1
pushd ${BASE_DIR}/${SODIUM_DIR}
git checkout tags/$SODIUM_VER
./autogen.sh
@@ -116,7 +116,7 @@ if [[ $TOX_ONLY = "false" ]]; then
make -j2 check
- if [[ $GLOBAL = "false" ]]; then
+ if [[ $GLOBAL = "false" || $EUID -eq 0 ]]; then
make install
else
sudo make install
@@ -128,7 +128,7 @@ fi
# clone current master of libtoxcore
# make sure to compile with libsodium we just installed to INSTALL_DIR
# afterwards install libtoxcore to INSTALL_DIR
-git clone https://github.com/irungentoo/toxcore.git ${BASE_DIR}/${TOX_CORE_DIR}
+git clone https://github.com/irungentoo/toxcore.git ${BASE_DIR}/${TOX_CORE_DIR} --depth 1
pushd ${BASE_DIR}/${TOX_CORE_DIR}
./autogen.sh
if [[ $GLOBAL = "false" ]]; then
@@ -139,7 +139,7 @@ fi
make -j2
-if [[ $GLOBAL = "false" ]]; then
+if [[ $GLOBAL = "false" || $EUID -eq 0 ]]; then
make install
else
sudo make install
diff --git a/core.cpp b/core.cpp
index 4f0fb83c3..6b899ab8b 100644
--- a/core.cpp
+++ b/core.cpp
@@ -15,9 +15,9 @@
*/
#include "core.h"
-#include "cdata.h"
-#include "cstring.h"
-#include "settings.h"
+#include "misc/cdata.h"
+#include "misc/cstring.h"
+#include "misc/settings.h"
#include "widget/widget.h"
#include " + filename + "
" + size + "
"; + QString content = "" + filenameElided + "
" + size + "
"; return wrapIntoForm(content, type, imgAStr, imgBStr); } @@ -352,29 +377,89 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage QString imgBstr = "" + filename + "
"; - content += "" + getHumanReadableSize(lastBytesSent) + " / " + size + " (" + speed + " ETA: " + eta + ")
\n"; + QString progrBar = "" + filenameElided + "
"; + content += "| " + size + " | "; + content += "" + speed + " | "; + content += "ETA: " + eta + " | "; + content += "
| "; + content += progrBar; + content += " | ||
| \n"; + res += "\n"; + res += " | \n"; res += insertMiniature(type); - res += "\n"; + res += " | \n";
res += " ";
res += content;
res += " \n";
res += " | \n";
res += "\n"; - res += "\n"; + res += "\n"; res += " | \n"; res += "
" + toHtmlChars(name) + "
");
- else
- return QString("" + toHtmlChars(name) + "
");
-}
-
-QString ChatAction::getDate()
-{
- QString res = "" + date + "
";
- return res;
-}
-
-MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
- ChatAction(me, author, date),
- message(message)
-{
-}
-
-void MessageAction::setTextCursor(QTextCursor cursor)
-{
- // When this function is called, we're supposed to only update ourselve when needed
- // Nobody should ask us to do anything with our content, we're on our own
- // Except we never udpate on our own, so we can safely free our resources
-
- (void) cursor;
- message.clear();
- message.squeeze();
- name.clear();
- name.squeeze();
- date.clear();
- date.squeeze();
-}
-
-QString MessageAction::getMessage()
-{
- QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
-
- // detect urls
- QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
- int offset = 0;
- while ((offset = exp.indexIn(message_, offset)) != -1)
- {
- QString url = exp.cap();
-
- // add scheme if not specified
- if (exp.cap(1) == "www.")
- url.prepend("http://");
-
- QString htmledUrl = QString("%1").arg(url);
- message_.replace(offset, exp.cap().length(), htmledUrl);
-
- offset += htmledUrl.length();
- }
-
- // detect text quotes
- QStringList messageLines = message_.split("\n");
- message_ = "";
- for (QString& s : messageLines)
- {
- if (QRegExp("^[ ]*>.*").exactMatch(s))
- message_ += "" + s.right(s.length()-4) + "
"; - else - message_ += s + "
"; - } - message_ = message_.left(message_.length()-4); - - return QString(""); -} - -FileTransferAction::FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me) : - ChatAction(me, author, date) -{ - w = widget; - - connect(w, &FileTransferInstance::stateUpdated, this, &FileTransferAction::updateHtml); -} - -FileTransferAction::~FileTransferAction() -{ -} - -QString FileTransferAction::getMessage() -{ - QString widgetHtml; - if (w != nullptr) - widgetHtml = w->getHtmlImage(); - else - widgetHtml = "
EMPTY CONTENT
";
- return widgetHtml;
-}
-
-void FileTransferAction::setTextCursor(QTextCursor cursor)
-{
- cur = cursor;
- cur.setKeepPositionOnInsert(true);
- int end=cur.selectionEnd();
- cur.setPosition(cur.position());
- cur.setPosition(end, QTextCursor::KeepAnchor);
-}
-
-void FileTransferAction::updateHtml()
-{
- if (cur.isNull())
- return;
-
- int pos = cur.selectionStart();
- cur.removeSelectedText();
- cur.setKeepPositionOnInsert(false);
- cur.insertHtml(getMessage());
- cur.setKeepPositionOnInsert(true);
- int end = cur.position();
- cur.setPosition(pos);
- cur.setPosition(end, QTextCursor::KeepAnchor);
-
- // Free our ressources if we'll never need to update again
- if (w->getState() == FileTransferInstance::TransfState::tsCanceled
- || w->getState() == FileTransferInstance::TransfState::tsFinished)
- {
- name.clear();
- name.squeeze();
- date.clear();
- date.squeeze();
- cur = QTextCursor();
- }
-}
diff --git a/widget/tool/chatactions/actionaction.cpp b/widget/tool/chatactions/actionaction.cpp
new file mode 100644
index 000000000..8533b7cd8
--- /dev/null
+++ b/widget/tool/chatactions/actionaction.cpp
@@ -0,0 +1,68 @@
+/*
+ Copyright (C) 2014 by Project Tox *
");
+}
+
+QString ActionAction::getMessage()
+{
+ QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
+
+ // detect urls
+ QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
+ int offset = 0;
+ while ((offset = exp.indexIn(message_, offset)) != -1)
+ {
+ QString url = exp.cap();
+
+ // add scheme if not specified
+ if (exp.cap(1) == "www.")
+ url.prepend("http://");
+
+ QString htmledUrl = QString("%1").arg(url);
+ message_.replace(offset, exp.cap().length(), htmledUrl);
+
+ offset += htmledUrl.length();
+ }
+
+ return QString("%1 %2
").arg(name).arg(message_);
+}
diff --git a/widget/tool/chatactions/actionaction.h b/widget/tool/chatactions/actionaction.h
new file mode 100644
index 000000000..ec4e5f4a8
--- /dev/null
+++ b/widget/tool/chatactions/actionaction.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2014 by Project Tox %2
").arg("name_me").arg(toHtmlChars(name));
+ else
+ return QString("%2
").arg("name").arg(toHtmlChars(name));
+}
+
+QString ChatAction::getDate()
+{
+ if (isMe)
+ return QString("" + toHtmlChars(date) + "
");
+ else
+ return QString("" + toHtmlChars(date) + "
");
+}
diff --git a/widget/tool/chataction.h b/widget/tool/chatactions/chataction.h
similarity index 58%
rename from widget/tool/chataction.h
rename to widget/tool/chatactions/chataction.h
index a324a41c6..5c3eed650 100644
--- a/widget/tool/chataction.h
+++ b/widget/tool/chatactions/chataction.h
@@ -21,13 +21,14 @@
#include EMPTY CONTENT
";
+ return widgetHtml;
+}
+
+void FileTransferAction::setup(QTextCursor cursor, QTextEdit *textEdit)
+{
+ cur = cursor;
+ cur.setKeepPositionOnInsert(true);
+ int end=cur.selectionEnd();
+ cur.setPosition(cur.position());
+ cur.setPosition(end, QTextCursor::KeepAnchor);
+
+ edit = textEdit;
+}
+
+void FileTransferAction::updateHtml()
+{
+ if (cur.isNull() || !edit)
+ return;
+
+ // save old slider value
+ int vSliderVal = edit->verticalScrollBar()->value();
+
+ // update content
+ int pos = cur.selectionStart();
+ cur.removeSelectedText();
+ cur.setKeepPositionOnInsert(false);
+ cur.insertHtml(getMessage());
+ cur.setKeepPositionOnInsert(true);
+ int end = cur.position();
+ cur.setPosition(pos);
+ cur.setPosition(end, QTextCursor::KeepAnchor);
+
+ // restore old slider value
+ edit->verticalScrollBar()->setValue(vSliderVal);
+
+ // Free our ressources if we'll never need to update again
+ if (w->getState() == FileTransferInstance::TransfState::tsCanceled
+ || w->getState() == FileTransferInstance::TransfState::tsFinished)
+ {
+ name.clear();
+ name.squeeze();
+ date.clear();
+ date.squeeze();
+ cur = QTextCursor();
+ }
+}
diff --git a/widget/tool/chatactions/filetransferaction.h b/widget/tool/chatactions/filetransferaction.h
new file mode 100644
index 000000000..31982cd45
--- /dev/null
+++ b/widget/tool/chatactions/filetransferaction.h
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 2014 by Project Tox "; + else + message_ += s + "
"; + } + message_ = message_.left(message_.length()-4); + + if (isMe) + return QString(""); + else + return QString(""); +} diff --git a/widget/tool/chatactions/messageaction.h b/widget/tool/chatactions/messageaction.h new file mode 100644 index 000000000..65f8e6465 --- /dev/null +++ b/widget/tool/chatactions/messageaction.h @@ -0,0 +1,34 @@ +/* + Copyright (C) 2014 by Project Tox
" + message + " |