Fixed directory problem wirh emoticons

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

retroshare-gui/src/RetroShare.pro

@@ -1,16 +1,17 @@
 ######################################################################
 # Automatically generated by qmake (2.00a) Fr 18. Aug 22:48:56 2006
 #######################################################################
-#OBJECTS_DIR = temp/obj
+OBJECTS_DIR = temp/obj
-#RCC_DIR = temp/qrc
+RCC_DIR = temp/qrc
-#UI_DIR  = temp/ui
+UI_DIR  = temp/ui
-#MOC_DIR = temp/moc
+MOC_DIR = temp/moc
 
-CONFIG += qt release
+CONFIG += qt debug
 QT     += network xml
 TEMPLATE = app
 TARGET += 
 
+QMAKE_CXXFLAGS *= -g
 
 DEPENDPATH += . \
             rsiface \
@@ -428,6 +429,20 @@ macx {
     LIBS += -Wl,-search_paths_first
 }
 
+win32-x-g++ {
+	OBJECTS_DIR = win32-x-g++/obj
+	RCC_DIR = win32-x-g++/qrc
+	UI_DIR  = win32-x-g++/ui
+	MOC_DIR = win32-x-g++/moc
+
+	RC_FILE = gui/images/retroshare_win.rc
+
+	LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz
+	LIBS += -lqcheckers -lsmplayer 
+	LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -gdi32
+	LIBS += -lole32 -lwinmm
+ }
+
 
 win32 {
     OBJECTS_DIR = temp/obj

retroshare-gui/src/emoticons/emotes.acs

@@ -1,38 +0,0 @@
-{
-":-)|:)":"emoticons/smile.png";
-":-D|:D":"emoticons/lol.png";
-";-)|;)":"emoticons/wink.png";
-":')":"emoticons/crying.png";
-":-O|:O":"emoticons/surprised.png";
-":-S|:S":"emoticons/wondering.png";
-":-(|:(":"emoticons/sad.png";
-":-*|:-{}":"emoticons/kissing.png";
-":-P|:P":"emoticons/tongue.png";
-"$-)|$)":"emoticons/moneyeyes.png";
-":-@":"emoticons/angry.png";
-"8-)":"emoticons/cool.png";
-"=))|:-j|:-J":"emoticons/rotfl.png";
-"(B)|(b)":"emoticons/beer.png";
-"(@)":"emoticons/cat.png";
-"(P)|(p)":"emoticons/camera.png";
-"(C)|(c)":"emoticons/coffee.png";
-"*JOKINGLY*|:))|:-))":"emoticons/laugh.png";
-"/<B>|/bj|/baijiu":"emoticons/liquor.png";
-"(L)|(l)":"emoticons/love.png";
-"(U)|(u)":"emoticons/love-over.png";
-"(S)":"emoticons/moon.png";
-"(mp)":"emoticons/mobile.png";
-"(pi)":"emoticons/pizza.png";
-":)>-":"emoticons/peace.png";
-"(T)|(t)":"emoticons/phone.png";
-"P)":"emoticons/pirate.png";
-"(~~)":"emoticons/pumpkin.png";
-":X":"emoticons/in-love.png";
-"(ip)":"emoticons/island.png";
-"(^)":"emoticons/cake.png";
-"<:-P|<:-p":"emoticons/party.png";
-"(O)|(o)":"emoticons/clock.png";
-"(um)":"emoticons/umbrella.png";
-"(6)":"emoticons/face-devil-grin48.png";
-
-}

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -373,7 +373,7 @@ void NetworkDialog::insertConnect()
 			{
 				backgrndcolor=Qt::magenta;
 				item -> setIcon(0,(QIcon(IMAGE_TRUSTED)));
-				item -> setText(2,QString("Trusts me"));
+				item -> setText(2,QString("Is trusting you"));
 				for(int k=0;k<8;++k)
 					item -> setToolTip(k,QString::fromStdString(detail.name) + QString(tr(" is trusting you. \nRight-click and select 'make friend' to be able to connect."))) ;
 			}

retroshare-gui/src/gui/PeersDialog.cpp

@@ -996,10 +996,10 @@ void PeersDialog::displayInfoChatMenu(const QPoint& pos)
 void PeersDialog::loadEmoticonsgroupchat()
 {
 	QString sm_codes;
-	#if defined(Q_OS_WIN32)
+	#if defined(Q_OS_WIN32)
-	QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
+	QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
-	#else
+	#else
-	QFile sm_file(QString(":/emoticons/emotes.acs"));
+	QFile sm_file(QString(":/smileys/emotes.acs"));
 	#endif
 	if(!sm_file.open(QIODevice::ReadOnly))
 	{

retroshare-gui/src/gui/SharedFilesDialog.cpp

@@ -161,10 +161,13 @@ void SharedFilesDialog::checkUpdate()
 		/*QMovie *movie = new QMovie(IMAGE_PROGRESS);
         ui.hashLabel->setMovie(movie);
         movie->start();*/
+
+//		ui.hashLabel->setToolTip(QString::fromStdString(rsFiles->currentJobInfo())) ;
 	}
 	else
 	{
 		ui.hashLabel->setPixmap(QPixmap(IMAGE_HASH_DONE));
+		ui.hashLabel->setToolTip("") ;
 	}
 
 	return;

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

@@ -392,7 +392,7 @@ void PopupChatDialog::loadEmoticons()
 	#if defined(Q_OS_WIN32)
 	QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
 	#else
-	QFile sm_file(QString(":/emoticons/emotes.acs"));
+	QFile sm_file(QString(":/smileys/emotes.acs"));
 	#endif
 	if(!sm_file.open(QIODevice::ReadOnly))
 	{

retroshare-gui/src/gui/forums/CreateForumMsg.ui

@@ -13,7 +13,8 @@
    <string>Post Forum Message</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../images.qrc" >:/images/rstray3.png</iconset>
+   <iconset resource="../images.qrc" >
+    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
   <property name="toolButtonStyle" >
    <enum>Qt::ToolButtonTextUnderIcon</enum>
@@ -68,7 +69,7 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>40</width>
             <height>20</height>
@@ -81,6 +82,9 @@
           <property name="text" >
            <string>Sign Message</string>
           </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -107,7 +111,8 @@
   </widget>
   <action name="postmessage_action" >
    <property name="icon" >
-    <iconset resource="../images.qrc" >:/images/mail_send24.png</iconset>
+    <iconset resource="../images.qrc" >
+     <normaloff>:/images/mail_send24.png</normaloff>:/images/mail_send24.png</iconset>
    </property>
    <property name="text" >
     <string>Post Forum Msg</string>
@@ -115,7 +120,8 @@
   </action>
   <action name="close_action" >
    <property name="icon" >
-    <iconset resource="../images.qrc" >:/images/button_cancel.png</iconset>
+    <iconset resource="../images.qrc" >
+     <normaloff>:/images/button_cancel.png</normaloff>:/images/button_cancel.png</iconset>
    </property>
    <property name="text" >
     <string>Close</string>

retroshare-gui/src/gui/images.qrc

@@ -318,7 +318,47 @@
         <file>qss/over/greentop.png</file>
         <file>qss/silver.qss</file>
         <file>qss/silver/silver.png</file>
-        <file>qss/skin2.qss</file>
+		  <file>qss/skin2.qss</file>
-        <file>qss/skin2/background.png</file>
+		  <file>qss/skin2/background.png</file>
-    </qresource>
+		  <file>smileys/angry.png</file>
+		  <file>smileys/beer.png</file>
+		  <file>smileys/cake.png</file>
+		  <file>smileys/camera.png</file>
+		  <file>smileys/cat.png</file>
+		  <file>smileys/clock.png</file>
+		  <file>smileys/cloudy.png</file>
+		  <file>smileys/coffee.png</file>
+		  <file>smileys/cool.png</file>
+		  <file>smileys/crying.png</file>
+		  <file>smileys/face-devil-grin48.png</file>
+		  <file>smileys/in-love.png</file>
+		  <file>smileys/island.png</file>
+		  <file>smileys/kissing.png</file>
+		  <file>smileys/laugh.png</file>
+		  <file>smileys/liquor.png</file>
+		  <file>smileys/lol.png</file>
+		  <file>smileys/love-over.png</file>
+		  <file>smileys/love.png</file>
+		  <file>smileys/mobile.png</file>
+		  <file>smileys/moneyeyes.png</file>
+		  <file>smileys/moon.png</file>
+		  <file>smileys/party.png</file>
+		  <file>smileys/peace.png</file>
+		  <file>smileys/phone.png</file>
+		  <file>smileys/pirate.png</file>
+		  <file>smileys/pizza.png</file>
+		  <file>smileys/pouty.png</file>
+		  <file>smileys/pumpkin.png</file>
+		  <file>smileys/rain.png</file>
+		  <file>smileys/rotfl.png</file>
+		  <file>smileys/sad.png</file>
+		  <file>smileys/smile.png</file>
+		  <file>smileys/surprised.png</file>
+		  <file>smileys/thunder.png</file>
+		  <file>smileys/tongue.png</file>
+		  <file>smileys/umbrella.png</file>
+		  <file>smileys/wink.png</file>
+		  <file>smileys/wondering.png</file>
+		  <file>smileys/emotes.acs</file>
+	  </qresource>
 </RCC>

retroshare-gui/src/gui/smileys/emotes.acs

@@ -0,0 +1,38 @@
+{
+":-)|:)":"smileys/smile.png";
+":-D|:D":"smileys/lol.png";
+";-)|;)":"smileys/wink.png";
+":')":"smileys/crying.png";
+":-O|:O":"smileys/surprised.png";
+":-S|:S":"smileys/wondering.png";
+":-(|:(":"smileys/sad.png";
+":-*|:-{}":"smileys/kissing.png";
+":-P|:P":"smileys/tongue.png";
+"$-)|$)":"smileys/moneyeyes.png";
+":-@":"smileys/angry.png";
+"8-)":"smileys/cool.png";
+"=))|:-j|:-J":"smileys/rotfl.png";
+"(B)|(b)":"smileys/beer.png";
+"(@)":"smileys/cat.png";
+"(P)|(p)":"smileys/camera.png";
+"(C)|(c)":"smileys/coffee.png";
+"*JOKINGLY*|:))|:-))":"smileys/laugh.png";
+"/<B>|/bj|/baijiu":"smileys/liquor.png";
+"(L)|(l)":"smileys/love.png";
+"(U)|(u)":"smileys/love-over.png";
+"(S)":"smileys/moon.png";
+"(mp)":"smileys/mobile.png";
+"(pi)":"smileys/pizza.png";
+":)>-":"smileys/peace.png";
+"(T)|(t)":"smileys/phone.png";
+"P)":"smileys/pirate.png";
+"(~~)":"smileys/pumpkin.png";
+":X":"smileys/in-love.png";
+"(ip)":"smileys/island.png";
+"(^)":"smileys/cake.png";
+"<:-P|<:-p":"smileys/party.png";
+"(O)|(o)":"smileys/clock.png";
+"(um)":"smileys/umbrella.png";
+"(6)":"smileys/face-devil-grin48.png";
+
+}

retroshare-gui/src/lang/retroshare_fr.ts

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="fr">
+<defaultcodec></defaultcodec>
 <context>
     <name></name>
     <message>
@@ -1498,17 +1499,17 @@ Do you want to save message ?</source>
     <message>
         <location filename="../gui/Preferences/ConfirmQuitDialog.ui" line="27"/>
         <source>Exit RetroShare</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitter RetroShare</translation>
     </message>
     <message>
         <location filename="../gui/Preferences/ConfirmQuitDialog.ui" line="130"/>
         <source>You are about to exit the RetroShare application and therefore stop all transfers. &lt;br&gt;&lt;br&gt;Are you sure you want to stop and exit RetroShare?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vous êtes sur le point de quitter RetroShare. Cela stoppe tous les transfers en cours.&lt;br&gt;&lt;br&gt;Etes vous sûrs de vouloir quitter ?</translation>
     </message>
     <message>
         <location filename="../gui/Preferences/ConfirmQuitDialog.ui" line="168"/>
         <source>Do not show this message again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ne plus afficher ce message.</translation>
     </message>
 </context>
 <context>
@@ -4100,12 +4101,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/MessengerWindow.cpp" line="138"/>
         <source>Send Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer</translation>
     </message>
     <message>
         <location filename="../gui/MessengerWindow.cpp" line="156"/>
         <source>Remove Friend</source>
-        <translation type="unfinished">Enlever un ami</translation>
+        <translation>Supprimer</translation>
     </message>
 </context>
 <context>

retroshare-gui/src/rsiface/rsfiles.h

@@ -139,9 +139,6 @@ virtual int SearchBoolExp(Expression * exp, std::list<FileDetail> &results) = 0;
 virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath) = 0;
 virtual void ForceDirectoryCheck() = 0;
 virtual bool InDirectoryCheck() = 0;
-virtual void setFileHashingCallback( void(*cb)(const std::string&)) = 0;
-
-
 
 /***
  * Directory Control