Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-02 19:31:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added required libgpgme and libgpg-error to installer script

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2193 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-02-04 21:21:56 +00:00
parent c2fdbe177d
commit 3b1fe9db02
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -281,7 +281,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
contextMnu.addAction( chatAct); contextMnu.addAction( chatAct);
contextMnu.addAction( msgAct); contextMnu.addAction( msgAct);
contextMnu.addAction( configurefriendAct); contextMnu.addAction( configurefriendAct);
contextMnu.addAction( profileviewAct); //contextMnu.addAction( profileviewAct);
if (c->type() != 0) { if (c->type() != 0) {
//this is a SSL key //this is a SSL key
contextMnu.addAction( connectfriendAct); contextMnu.addAction( connectfriendAct);

BIN
retroshare-gui/src/gui/images/splash.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 303 KiB

BIN
retroshare-gui/src/gui/images/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 182 KiB

29
retroshare-gui/src/retroshare.nsi
View File

@ -2,7 +2,7 @@
; Define your application name ; Define your application name
!define APPNAME "RetroShare" !define APPNAME "RetroShare"
!define VERSION "0.4.13c" !define VERSION "0.5.0"
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
; Main Install settings ; Main Install settings
@ -186,14 +186,15 @@ Section $(sec_main) sec_main
; Set Section Files and Shortcuts ; Set Section Files and Shortcuts
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
File /r "release\RetroShare.exe" File /r "release\RetroShare.exe"
File /r "D:\Qt\2009.02\mingw\bin\mingwm10.dll" File /r "D:\Qt\2009.03\mingw\bin\mingwm10.dll"
File /r "D:\Qt\2009.02\qt\bin\QtCore4.dll" File /r "D:\Qt\2009.03\qt\bin\QtCore4.dll"
File /r "D:\Qt\2009.02\qt\bin\QtGui4.dll" File /r "D:\Qt\2009.03\qt\bin\QtGui4.dll"
File /r "D:\Qt\2009.02\qt\bin\QtNetwork4.dll" File /r "D:\Qt\2009.03\qt\bin\QtNetwork4.dll"
File /r "D:\Qt\2009.02\qt\bin\QtXml4.dll" File /r "D:\Qt\2009.03\qt\bin\QtXml4.dll"
File /r "D:\Qt\2009.02\qt\bin\QtScript4.dll" File /r "D:\Qt\2009.03\qt\bin\QtScript4.dll"
File /r "pthreadGCE2.dll" File /r "release\pthreadGC2d.dll"
File /r "pthreadGC2d.dll" File /r "release\libgpg-error-0.dll"
File /r "release\libgpgme-11.dll"
File /r "changelog.txt" File /r "changelog.txt"
@ -209,6 +210,10 @@ Section $(sec_data) sec_data
SetOutPath "$APPDATA\RetroShare\" SetOutPath "$APPDATA\RetroShare\"
;File /r "data\*" ;File /r "data\*"
; Set Section Plugins
SetOutPath "$APPDATA\RetroShare\plugins\"
;File /r "plugins\"
; We're not ready for external skins... ; We're not ready for external skins...
; Set Section qss need to remove svn path ; Set Section qss need to remove svn path
SetOutPath "$INSTDIR\qss\" SetOutPath "$INSTDIR\qss\"
@ -220,11 +225,11 @@ Section $(sec_data) sec_data
; Add emoticons ; Add emoticons
SetOutPath "$INSTDIR\emoticons\" SetOutPath "$INSTDIR\emoticons\"
File /r emoticons\*.* File /r gui\emoticons\*.*
; Add Chat Style ; Add Chat Style
SetOutPath "$INSTDIR\style\" ;SetOutPath "$INSTDIR\style\"
File /r style\*.* ;File /r style\*.*
SectionEnd SectionEnd