improved display of turtle routing info, corrected some minor compilation issues

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2248 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/rsserver/p3blog.cc

@@ -23,7 +23,7 @@
  *
  */
 
-#include "../rsserver/p3Blog.h"
+#include <rsserver/p3blog.h>
 
 RsQblog* rsQblog =  NULL;
 

libretroshare/src/rsserver/rsinit.cc

@@ -1708,7 +1708,7 @@ RsTurtle *rsTurtle = NULL ;
 #include "rsserver/p3msgs.h"
 #include "rsserver/p3discovery.h"
 #include "rsserver/p3photo.h"
-#include "rsserver/p3Blog.h"
+#include "rsserver/p3blog.h"
 #include "rsiface/rsgame.h"
 
 #include "pqi/p3notify.h" // HACK - moved to pqi for compilation order.

libretroshare/src/turtle/p3turtle.cc

@@ -1717,7 +1717,7 @@ static std::string printNumber(uint64_t num,bool hex=false)
 	{
 		char tmp[100] ;
 
-		if(num < (1<<32))
+		if(num < (((uint64_t)1)<<32))
 			sprintf(tmp,"%08x", uint32_t(num)) ;
 		else
 			sprintf(tmp,"%08x%08x", uint32_t(num >> 32),uint32_t(num & ( (1<<32)-1 ))) ;

retroshare-gui/src/gui/SharedFilesDialog.cpp

@@ -853,5 +853,7 @@ void SharedFilesDialog::indicatorChanged(int index)
 
   ui.remoteDirTreeView->update(ui.remoteDirTreeView->rootIndex());
   ui.localDirTreeView->update(ui.localDirTreeView->rootIndex()) ;
+
+  updateDisplay() ;
 }
 

retroshare-gui/src/gui/TurtleRouterDialog.cpp

@@ -23,6 +23,9 @@ TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)
 
 void TurtleRouterDialog::showCtxMenu(const QPoint& point)
 {
+	if(_hashes_TW->currentItem() == NULL)
+		return ;
+
 	std::cerr << "execing context menu" << std::endl ;
 	// create context menus.
 	QMenu contextMnu( this );

retroshare-gui/src/gui/settings/TransferPage.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>435</width>
+    <width>604</width>
     <height>340</height>
    </rect>
   </property>
@@ -94,7 +94,7 @@
             </item>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="3" column="0" colspan="2">
            <widget class="QCheckBox" name="checkBox">
             <property name="text">
              <string>Show Cache Transfers</string>
@@ -148,8 +148,8 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transfering data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;-qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are browsable from your direct friends.&lt;/li&gt;
+&lt;ul style=&quot;-qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files can be downloaded by anybody through anonymous tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>