fixed merge with upstream/master

build_scripts/Windows-msys2/build/pack.bat

@@ -148,7 +148,6 @@ echo copy stylesheets
 xcopy /S "%SourcePath%\retroshare-gui\src\gui\qss\chat" "%RsDeployPath%\stylesheets" %Quite%
 rmdir /S /Q "%RsDeployPath%\stylesheets\compact" %Quite%
 rmdir /S /Q "%RsDeployPath%\stylesheets\standard" %Quite%
-rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite%
 
 echo copy sounds
 xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite%

build_scripts/Windows/build/pack.bat

@@ -139,7 +139,6 @@ echo copy stylesheets
 xcopy /S "%SourcePath%\retroshare-gui\src\gui\qss\chat" "%RsDeployPath%\stylesheets" %Quite%
 rmdir /S /Q "%RsDeployPath%\stylesheets\compact" %Quite%
 rmdir /S /Q "%RsDeployPath%\stylesheets\standard" %Quite%
-rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite%
 
 echo copy sounds
 xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite%

libretroshare/src/util/rsthreads.cc

@@ -43,11 +43,13 @@ int RS_pthread_setname_np(pthread_t /*__target_thread*/, const char *__buf) {
 	return pthread_setname_np(__buf);
 }
 #else
+#ifndef __WIN64__
 int __attribute__((weak)) pthread_setname_np(pthread_t __target_thread, const char *__buf) ;
+#endif //__WIN64__
 int RS_pthread_setname_np(pthread_t __target_thread, const char *__buf) {
 	return pthread_setname_np(__target_thread, __buf);
 }
-#endif
+#endif //__APPLE__
 
 
 /*******

plugins/Common/retroshare_plugin.pri

@@ -102,6 +102,8 @@ win32 {
 	for(lib, LIB_DIR):LIBS += -L"$$lib"
 	for(bin, BIN_DIR):LIBS += -L"$$bin"
 	LIBS += -lpthread
+
+	QMAKE_LFLAGS += -Wl,--end-group
 }
 
 macx {

retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp

@@ -88,6 +88,7 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
 	ui.toolButton_Show->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/down-arrow.png")));
 	ui.toolButton_Hide->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png")));
 	ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/search.png")));
+	ui.pushButton_History->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/history-clock-white.png")));
 
 	ui.checkBox_OldHistory->setChecked(false);
 	mOldHistoryEnabled = false;
@@ -294,12 +295,12 @@ void WikiEditDialog::historyToggle()
 	if (ui.groupBox_History->isHidden())
 	{
 		ui.groupBox_History->show();
-		ui.pushButton_History->setText(tr("Hide Edit History"));
+		ui.pushButton_History->setToolTip(tr("Hide Edit History"));
 	}
 	else
 	{
 		ui.groupBox_History->hide();
-		ui.pushButton_History->setText(tr("Show Edit History"));
+		ui.pushButton_History->setToolTip(tr("Show Edit History"));
 	}
 }
 
@@ -409,7 +410,7 @@ void WikiEditDialog::setPreviousPage(RsWikiSnapshot &page)
 void WikiEditDialog::setNewPage()
 {
 	mNewPage = true;
-        mRepublishMode = false;
+	mRepublishMode = false;
 	mHistoryLoaded = false;
 	ui.lineEdit_Page->setText("");
 	ui.lineEdit_PrevVersion->setText("");
@@ -418,14 +419,14 @@ void WikiEditDialog::setNewPage()
 	redrawPage();
 	ui.treeWidget_History->clear();
 	ui.groupBox_History->hide();
-	ui.pushButton_History->setText(tr("Show Edit History"));
+	ui.pushButton_History->setToolTip(tr("Show Edit History"));
 
-    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png"));
+	ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png"));
 	ui.headerFrame->setHeaderText(tr("Create New Wiki Page"));
 	setWindowTitle(tr("Create New Wiki Page"));
 
 	/* No need for for REQUIRED ID */
-        ui.comboBox_IdChooser->loadIds(0, RsGxsId());
+	ui.comboBox_IdChooser->loadIds(0, RsGxsId());
 
 	textReset();
 }

retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui

@@ -14,10 +14,19 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <property name="verticalSpacing">
+   <property name="leftMargin">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
     <number>0</number>
    </property>
    <item row="0" column="0">
@@ -112,6 +121,9 @@
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
              <layout class="QVBoxLayout" name="verticalLayout">
+              <property name="topMargin">
+               <number>6</number>
+              </property>
               <item>
                <widget class="QToolButton" name="toolButton_Show">
                 <property name="text">
@@ -246,7 +258,7 @@
             <item>
              <widget class="QPushButton" name="pushButton_History">
               <property name="text">
-               <string>Show Edit History</string>
+               <string>History</string>
               </property>
              </widget>
             </item>

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -403,7 +403,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
 					continue;
 
 				QString name;
-				if (chatId.isLobbyId() || chatId.isDistantChatId())
+				if (chatId.isLobbyId() || chatId.isDistantChatId() || chatId.isPeerId())
 				{
 					RsIdentityDetails details;
 

retroshare-gui/src/gui/common/RSTextBrowser.cpp

@@ -51,6 +51,14 @@ RSTextBrowser::RSTextBrowser(QWidget *parent) :
 	connect(this, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
 }
 
+void RSTextBrowser::append(const QString &text)
+{
+	//In Win RSTextBrowser don't recognize file:///
+	QString fileText = text;
+	QTextBrowser::append(fileText.replace("file:///","file://"));
+
+}
+
 void RSTextBrowser::linkClicked(const QUrl &url)
 {
 	if (!mLinkClickActive) {
@@ -128,14 +136,22 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name)
 
 	// case 2: always trust the image if it comes from local Config or Data directories.
 
-	if(type == QTextDocument::ImageResource) {
+	if(type == QTextDocument::ImageResource)
+	{
 		QFileInfo fi = QFileInfo(name.path());
-		if(fi.exists() && fi.isFile()) {
+		if(fi.exists() && fi.isFile())
+		{
 			QString cpath = fi.canonicalFilePath();
-			if (cpath.startsWith(QDir(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())).canonicalPath(),Qt::CaseInsensitive)
-					|| cpath.startsWith(QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str())).canonicalPath(),Qt::CaseInsensitive))
-				return QTextBrowser::loadResource(type, name);
-		}}
+			QStringList autPath = { QDir(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())).canonicalPath()
+			                      , QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str())).canonicalPath()
+			                      , QDir(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())+"/stylesheets/").canonicalPath() //May be link
+			                      , QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str())+"/stylesheets/").canonicalPath() //May be link
+			                      };
+			for(auto& it : autPath)
+				if (!it.isEmpty() && cpath.startsWith(it, Qt::CaseInsensitive))
+					return QPixmap(fi.absoluteFilePath());
+		}
+	}
 
 	// case 3: only display if the user allows it. Data resources can be bad (svg bombs) but we filter them out globally at the network layer.
 	//         It would be good to add here a home-made resource loader that only loads images and not svg crap, just in case.
@@ -285,10 +301,10 @@ QString RSTextBrowser::anchorForPosition(const QPoint &pos) const
 		rx.setMinimal(true);
 		QString sel = cursor.selection().toHtml();
 		QStringList anchors;
-		int pos=0;
-		while ((pos = rx.indexIn(sel,pos)) != -1) {
+		int posX=0;
+		while ((posX = rx.indexIn(sel,posX)) != -1) {
 			anchors << rx.cap(1);
-			pos += rx.matchedLength();
+			posX += rx.matchedLength();
 		}
 		if (!anchors.isEmpty()){
 			anchor = anchors.at(0);

retroshare-gui/src/gui/common/RSTextBrowser.h

@@ -39,6 +39,8 @@ class RSTextBrowser : public QTextBrowser
 public:
 	explicit RSTextBrowser(QWidget *parent = 0);
 
+	void append(const QString &text);
+
 	void setPlaceholderText(const QString &text);
 	void setImageBlockWidget(RSImageBlockWidget *widget);
 	void resetImagesStatus(bool load);

retroshare-gui/src/gui/icons.qrc

@@ -93,6 +93,7 @@
         <file>icons/png/forums.png</file>
         <file>icons/png/fullscreen_arrows.png</file>
         <file>icons/png/highlight.png</file>
+        <file>icons/png/history-clock-white.png</file>
         <file>icons/png/help.png</file>
         <file>icons/png/home.png</file>
         <file>icons/png/info.png</file>

retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp

@@ -44,12 +44,8 @@
 #define ROLE_PLAINTEXT Qt::UserRole + 1
 
 ImHistoryBrowserCreateItemsThread::ImHistoryBrowserCreateItemsThread(ImHistoryBrowser *parent, const ChatId& peerId)
-    : QThread(parent)
-{
-    m_chatId = peerId;
-    m_historyBrowser = parent;
-    stopped = false;
-}
+    : QThread(parent), m_historyBrowser(parent), m_chatId(peerId), stopped(false)
+{}
 
 ImHistoryBrowserCreateItemsThread::~ImHistoryBrowserCreateItemsThread()
 {
@@ -285,10 +281,12 @@ void ImHistoryBrowser::fillItem(QListWidgetItem *itemWidget, HistoryMsg& msg)
     QString name;
     if (m_chatId.isLobbyId() || m_chatId.isDistantChatId()) {
         RsIdentityDetails details;
-        if (rsIdentity->getIdDetails(RsGxsId(msg.peerName), details))
+        if (rsIdentity->getIdDetails(RsGxsId(msg.peerId), details))
             name = QString::fromUtf8(details.mNickname.c_str());
-        else
+        else if(!msg.peerName.empty())
             name = QString::fromUtf8(msg.peerName.c_str());
+        else
+            name = QString::fromUtf8(msg.peerId.toStdString().c_str());
     } else {
         name = QString::fromUtf8(msg.peerName.c_str());
     }

retroshare-gui/src/gui/qss/chat/Bubble/history/hincoming.htm

@@ -2,25 +2,26 @@
 %css-style%
 </style>
 
+
 <table width="100%" ><tr><td align="right">
 
 <table class='bubble-grey' cellspacing='0' cellpadding='0'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TL.png"></td>
+    <td class='bubble-greyTL'></td>
     <td class='bubble-greyTC'></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TR.png"></td>
+    <td class='bubble-greyTR'></td>
   </tr>
   <tr>
     <td class='bubble-greyCL'></td>
     <td class='bubble-greyCC'>
       %message%
     </td>
-    <td  class='bubble-greyCR'></td>
+    <td class='bubble-greyCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BL.png"></td>
+    <td class='bubble-greyBL' width="15"></td>
     <td class='bubble-greyBC' align='right'><img src="%style-dir%/img/bubble-grey/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BR.png"></td>
+    <td class='bubble-greyBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/history/houtgoing.htm

@@ -7,21 +7,21 @@
 
 <table class='bubble-grey' cellspacing='0' cellpadding='0' style='float:left;'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TL.png"></td>
+    <td class='bubble-greyTL'></td>
     <td class='bubble-greyTC'></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TR.png"></td>
+    <td class='bubble-greyTR'></td>
   </tr>
   <tr>
     <td class='bubble-greyCL'></td>
     <td class='bubble-greyCC'>
       %message%
     </td>
-    <td  class='bubble-greyCR'></td>
+    <td class='bubble-greyCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BL.png"></td>
+    <td class='bubble-greyBL' width="15"></td>
     <td class='bubble-greyBC'><img src="%style-dir%/img/bubble-grey/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BR.png"></td>
+    <td class='bubble-greyBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/history/images.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cd 'img/bubble-orange/'
-for file in *.png;
-do
-	convert $file -set option:modulate:colorspace hsb -modulate 100,50,100 -colorspace Gray ../bubble-grey/$file
-	convert $file -set option:modulate:colorspace hsb -modulate 110,80,80 ../bubble-red/$file
-done
-
-
-
-	#echo "hello ${file} - "
-	#convert $file -set option:modulate:colorspace hsb -modulate 100,20,100 ../bubble-grey/$file

retroshare-gui/src/gui/qss/chat/Bubble/history/incoming.htm

@@ -7,21 +7,21 @@
 
 <table class='bubble-blue' cellspacing='0' cellpadding='0'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-blue/bubble_TL.png"></td>
+    <td class='bubble-blueTL'></td>
     <td class='bubble-blueTC'></td>
-    <td><img src="%style-dir%/img/bubble-blue/bubble_TR.png"></td>
+    <td class='bubble-blueTR'></td>
   </tr>
   <tr>
     <td class='bubble-blueCL'></td>
     <td class='bubble-blueCC'>
       %message%
     </td>
-    <td  class='bubble-blueCR'></td>
+    <td class='bubble-blueCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-blue/bubble_BL.png"></td>
+    <td class='bubble-blueBL' width="15"></td>
     <td class='bubble-blueBC' align='right'><img src="%style-dir%/img/bubble-blue/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-blue/bubble_BR.png"></td>
+    <td class='bubble-blueBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/history/main.css

@@ -37,39 +37,59 @@ color: #FF0000;
 }
 
 .bubble-orange { float: right; }
-.bubble-orangeTC { background-image: url(%style-dir%/img/bubble-orange/bubble_TC.png); }
+.bubble-orangeTL { background-image: url(%style-dir%/img/bubble-orange/bubble_TL.png); font-size: 9px; }
+.bubble-orangeTC { background-image: url(%style-dir%/img/bubble-orange/bubble_TC.png); font-size: 9px; }
+.bubble-orangeTR { background-image: url(%style-dir%/img/bubble-orange/bubble_TR.png); font-size: 9px; }
+.bubble-orangeCL { background-image: url(%style-dir%/img/bubble-orange/bubble_CL.png); }
 .bubble-orangeCC { background-image: url(%style-dir%/img/bubble-orange/bubble_CC.png); }
 .bubble-orangeCR { background-image: url(%style-dir%/img/bubble-orange/bubble_CR.png); }
-.bubble-orangeCL { background-image: url(%style-dir%/img/bubble-orange/bubble_CL.png); }
-.bubble-orangeBC { background-image: url(%style-dir%/img/bubble-orange/bubble_BC.png); }
+.bubble-orangeBL { background-image: url(%style-dir%/img/bubble-orange/bubble_BL.png); font-size: 9px; }
+.bubble-orangeBC { background-image: url(%style-dir%/img/bubble-orange/bubble_BC.png); font-size: 9px; }
+.bubble-orangeBR { background-image: url(%style-dir%/img/bubble-orange/bubble_BR.png); font-size: 9px; }
 
 .bubble-grey { float: right; color: #666; }
-.bubble-greyTC { background-image: url(%style-dir%/img/bubble-grey/bubble_TC.png); }
+.bubble-greyTL { background-image: url(%style-dir%/img/bubble-grey/bubble_TL.png); font-size: 9px; }
+.bubble-greyTC { background-image: url(%style-dir%/img/bubble-grey/bubble_TC.png); font-size: 9px; }
+.bubble-greyTR { background-image: url(%style-dir%/img/bubble-grey/bubble_TR.png); font-size: 9px; }
+.bubble-greyCL { background-image: url(%style-dir%/img/bubble-grey/bubble_CL.png); }
 .bubble-greyCC { background-image: url(%style-dir%/img/bubble-grey/bubble_CC.png); }
 .bubble-greyCR { background-image: url(%style-dir%/img/bubble-grey/bubble_CR.png); }
-.bubble-greyCL { background-image: url(%style-dir%/img/bubble-grey/bubble_CL.png); }
-.bubble-greyBC { background-image: url(%style-dir%/img/bubble-grey/bubble_BC.png); }
+.bubble-greyBL { background-image: url(%style-dir%/img/bubble-grey/bubble_BL.png); font-size: 9px; }
+.bubble-greyBC { background-image: url(%style-dir%/img/bubble-grey/bubble_BC.png); font-size: 9px; }
+.bubble-greyBR { background-image: url(%style-dir%/img/bubble-grey/bubble_BR.png); font-size: 9px; }
 
 .bubble-red { float: right; color: #B33; }
-.bubble-redTC { background-image: url(%style-dir%/img/bubble-red/bubble_TC.png); }
+.bubble-redTL { background-image: url(%style-dir%/img/bubble-red/bubble_TL.png); font-size: 9px; }
+.bubble-redTC { background-image: url(%style-dir%/img/bubble-red/bubble_TC.png); font-size: 9px; }
+.bubble-redTR { background-image: url(%style-dir%/img/bubble-red/bubble_TR.png); font-size: 9px; }
+.bubble-redCL { background-image: url(%style-dir%/img/bubble-red/bubble_CL.png); }
 .bubble-redCC { background-image: url(%style-dir%/img/bubble-red/bubble_CC.png); }
 .bubble-redCR { background-image: url(%style-dir%/img/bubble-red/bubble_CR.png); }
-.bubble-redCL { background-image: url(%style-dir%/img/bubble-red/bubble_CL.png); }
-.bubble-redBC { background-image: url(%style-dir%/img/bubble-red/bubble_BC.png); }
+.bubble-redBL { background-image: url(%style-dir%/img/bubble-red/bubble_BL.png); font-size: 9px; }
+.bubble-redBC { background-image: url(%style-dir%/img/bubble-red/bubble_BC.png); font-size: 9px; }
+.bubble-redBR { background-image: url(%style-dir%/img/bubble-red/bubble_BR.png); font-size: 9px; }
 
-.bubble-green { float: right;}
-.bubble-greenTC { background-image: url(%style-dir%/img/bubble-green/bubble_TC.png); }
+.bubble-green { float: right; }
+.bubble-greenTL { background-image: url(%style-dir%/img/bubble-green/bubble_TL.png); font-size: 9px;}
+.bubble-greenTC { background-image: url(%style-dir%/img/bubble-green/bubble_TC.png); font-size: 9px; }
+.bubble-greenTR { background-image: url(%style-dir%/img/bubble-green/bubble_TR.png); font-size: 9px;}
+.bubble-greenCL { background-image: url(%style-dir%/img/bubble-green/bubble_CL.png); }
 .bubble-greenCC { background-image: url(%style-dir%/img/bubble-green/bubble_CC.png); }
 .bubble-greenCR { background-image: url(%style-dir%/img/bubble-green/bubble_CR.png); }
-.bubble-greenCL { background-image: url(%style-dir%/img/bubble-green/bubble_CL.png); }
-.bubble-greenBC { background-image: url(%style-dir%/img/bubble-green/bubble_BC.png); }
+.bubble-greenBL { background-image: url(%style-dir%/img/bubble-green/bubble_BL.png); font-size: 9px; }
+.bubble-greenBC { background-image: url(%style-dir%/img/bubble-green/bubble_BC.png); font-size: 9px; }
+.bubble-greenBR { background-image: url(%style-dir%/img/bubble-green/bubble_BR.png); font-size: 9px; }
 
 .bubble-blue { float: right;}
-.bubble-blueTC { background-image: url(%style-dir%/img/bubble-blue/bubble_TC.png); }
+.bubble-blueTL { background-image: url(%style-dir%/img/bubble-blue/bubble_TL.png); font-size: 9px; }
+.bubble-blueTC { background-image: url(%style-dir%/img/bubble-blue/bubble_TC.png); font-size: 9px; }
+.bubble-blueTR { background-image: url(%style-dir%/img/bubble-blue/bubble_TR.png); font-size: 9px; }
+.bubble-blueCL { background-image: url(%style-dir%/img/bubble-blue/bubble_CL.png); }
 .bubble-blueCC { background-image: url(%style-dir%/img/bubble-blue/bubble_CC.png); }
 .bubble-blueCR { background-image: url(%style-dir%/img/bubble-blue/bubble_CR.png); }
-.bubble-blueCL { background-image: url(%style-dir%/img/bubble-blue/bubble_CL.png); }
-.bubble-blueBC { background-image: url(%style-dir%/img/bubble-blue/bubble_BC.png); }
+.bubble-blueBL { background-image: url(%style-dir%/img/bubble-blue/bubble_BL.png); font-size: 9px; }
+.bubble-blueBC { background-image: url(%style-dir%/img/bubble-blue/bubble_BC.png); font-size: 9px; }
+.bubble-blueBR { background-image: url(%style-dir%/img/bubble-blue/bubble_BR.png); font-size: 9px; }
 
 .bubbleFooter { background-color: none; width:100%; }
 

retroshare-gui/src/gui/qss/chat/Bubble/history/ooutgoing.htm

@@ -7,9 +7,9 @@
 
 <table class='bubble-red' cellspacing='0' cellpadding='0' style='float:left;'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-red/bubble_TL.png"></td>
+    <td class='bubble-redTL'></td>
     <td class='bubble-redTC'></td>
-    <td><img src="%style-dir%/img/bubble-red/bubble_TR.png"></td>
+    <td class='bubble-redTR'></td>
   </tr>
   <tr>
     <td class='bubble-redCL'></td>
@@ -19,9 +19,9 @@
     <td  class='bubble-redCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-red/bubble_BL.png"></td>
+    <td class='bubble-redBL' width="15"></td>
     <td class='bubble-redBC'><img src="%style-dir%/img/bubble-red/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-red/bubble_BR.png"></td>
+    <td class='bubble-redBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/history/outgoing.htm

@@ -7,9 +7,9 @@
 
 <table class='bubble-green' cellspacing='0' cellpadding='0' style='float:left;'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-green/bubble_TL.png"></td>
+    <td class='bubble-greenTL'></td>
     <td class='bubble-greenTC'></td>
-    <td><img src="%style-dir%/img/bubble-green/bubble_TR.png"></td>
+    <td class='bubble-greenTR'></td>
   </tr>
   <tr>
     <td class='bubble-greenCL'></td>
@@ -19,9 +19,9 @@
     <td  class='bubble-greenCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-green/bubble_BL.png"></td>
+    <td class='bubble-greenBL' width="15"></td>
     <td class='bubble-greenBC'><img src="%style-dir%/img/bubble-green/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-green/bubble_BR.png"></td>
+    <td class='bubble-greenBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/history/system.htm

@@ -3,21 +3,24 @@
 </style>
 
 
+<table width="100%" ><tr><td align="left">
+
 <table class='bubble-red' width="100%" cellspacing='0' cellpadding='0'>
   <tr>
-    <td width="1%"><img src="%style-dir%/img/bubble-red/bubble_TL.png"></td>
+    <td class='bubble-redTL' width="15"></td>
     <td class='bubble-redTC' width="100%"></td>
-    <td width="1%"><img src="%style-dir%/img/bubble-red/bubble_TR.png"></td>
+    <td class='bubble-redTR' width="16"></td>
   </tr>
   <tr>
-    <td class='bubble-redCL' width="1%"></td>
+    <td class='bubble-redCL' width="15"></td>
     <td class='bubble-redCC' width="100%" align="center"> %name% %time% - %message%</td>
-    <td class='bubble-redCR' width="1%"></td>
+    <td class='bubble-redCR' width="16"></td>
   </tr>
   <tr>
-    <td width="1%"><img src="%style-dir%/img/bubble-red/bubble_BL.png"></td>
+    <td class='bubble-redBL' width="15"></td>
     <td class='bubble-redBC' width="100%"></td>
-    <td width="1%"><img src="%style-dir%/img/bubble-red/bubble_BR.png"></td>
+    <td class='bubble-redBR' width="16"></td>
   </tr>
 </table>
 
+</td></tr></table>

retroshare-gui/src/gui/qss/chat/Bubble/private/hincoming.htm

@@ -2,13 +2,14 @@
 %css-style%
 </style>
 
+
 <table width="100%" ><tr><td align="right">
 
 <table class='bubble-grey' cellspacing='0' cellpadding='0'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TL.png"></td>
+    <td class='bubble-greyTL'></td>
     <td class='bubble-greyTC'></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TR.png"></td>
+    <td class='bubble-greyTR'></td>
   </tr>
   <tr>
     <td class='bubble-greyCL'></td>
@@ -18,9 +19,9 @@
     <td  class='bubble-greyCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BL.png"></td>
+    <td class='bubble-greyBL' width="15"></td>
     <td class='bubble-greyBC' align='right'><img src="%style-dir%/img/bubble-grey/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BR.png"></td>
+    <td class='bubble-greyBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/private/houtgoing.htm

@@ -7,9 +7,9 @@
 
 <table class='bubble-grey' cellspacing='0' cellpadding='0' style='float:left;'>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TL.png"></td>
+    <td class='bubble-greyTL'></td>
     <td class='bubble-greyTC'></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_TR.png"></td>
+    <td class='bubble-greyTR'></td>
   </tr>
   <tr>
     <td class='bubble-greyCL'></td>
@@ -19,9 +19,9 @@
     <td  class='bubble-greyCR'></td>
   </tr>
   <tr>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BL.png"></td>
+    <td class='bubble-greyBL' width="15"></td>
     <td class='bubble-greyBC'><img src="%style-dir%/img/bubble-grey/bubble_tick.png"></td>
-    <td><img src="%style-dir%/img/bubble-grey/bubble_BR.png"></td>
+    <td class='bubble-greyBR' width="16"></td>
   </tr>
 </table>
 

retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cd 'img/bubble-orange/'
-for file in *.png;
-do
-	convert $file -set option:modulate:colorspace hsb -modulate 100,50,100 -colorspace Gray ../bubble-grey/$file
-	convert $file -set option:modulate:colorspace hsb -modulate 110,80,80 ../bubble-red/$file
-done
-
-
-
-	#echo "hello ${file} - "
-	#convert $file -set option:modulate:colorspace hsb -modulate 100,20,100 ../bubble-grey/$file