Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 07:16:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #924 from PhenomRetroShare/Fix_retroshare06_case

Browse Source 
Change RetroShare06 to lower case
This commit is contained in:
csoler 2017-07-19 18:26:32 +02:00 committed by GitHub
commit 0d681b149f
80 changed files with 212 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MacOS_X_InstallGuide.md
View File

@ -89,4 +89,4 @@ You can now compile RS into Qt Creator or with terminal
You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
You can find compiled application on *./retroshare/retroshare-gui/src/RetroShare06.app* You can find compiled application on *./retroshare/retroshare-gui/src/retroshare.app*

6
README.md
View File

@ -68,8 +68,8 @@ Compilation on Linux
The executables produced will be: The executables produced will be:
/usr/bin/RetroShare06 /usr/bin/retroshare
/usr/bin/RetroShare06-nogui /usr/bin/retroshare-nogui
5. Uninstall: 5. Uninstall:
```bash ```bash
@ -124,7 +124,7 @@ Using retroshare-nogui & webUI
The webUI needs to be enabled as a parameter option in retroshare-nogui: The webUI needs to be enabled as a parameter option in retroshare-nogui:
```bash ```bash
./retroshare-nogui --webinterface 9090 --docroot /usr/share/RetroShare06/webui/ ./retroshare-nogui --webinterface 9090 --docroot /usr/share/retroshare/webui/
``` ```
The webUI is only accessible on localhost:9090. It is advised to keep it that way so that your RS The webUI is only accessible on localhost:9090. It is advised to keep it that way so that your RS

4
Start_RetroShare-Gui_Debug.bat
View File

@ -4,8 +4,8 @@ set RSPATH=.\retroshare-gui\src\debug
set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH% set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH%
If not exist %RSPATH%\RetroShare06.exe ( If not exist %RSPATH%\retroshare.exe (
build-all-mingw32make.bat build-all-mingw32make.bat
) )
%RSPATH%\RetroShare06.exe %RSPATH%\retroshare.exe

10
build_scripts/Debian+Ubuntu/README.txt
View File

@ -34,10 +34,10 @@ How do I create a source package?
You should get as many source packages as wanted distributions. For each You should get as many source packages as wanted distributions. For each
of them you get (example here for wheezy): of them you get (example here for wheezy):
retroshare06_0.6.0-0.7829~wheezy.dsc retroshare_0.6.0-0.7829~wheezy.dsc
retroshare06_0.6.0-0.7829~wheezy_source.build retroshare_0.6.0-0.7829~wheezy_source.build
retroshare06_0.6.0-0.7829~wheezy_source.changes retroshare_0.6.0-0.7829~wheezy_source.changes
retroshare06_0.6.0-0.7829~wheezy.tar.gz retroshare_0.6.0-0.7829~wheezy.tar.gz
How do I create a binary package? How do I create a binary package?
================================= =================================
@ -69,7 +69,7 @@ How do I create a binary package?
*Package compilation* *Package compilation*
> pbuilder-dist wheezy build retroshare06_0.6.0~7856~wheezy.dsc > pbuilder-dist wheezy build retroshare_0.6.0~7856~wheezy.dsc
The generated compiled binary packages (including all package plugins etc) The generated compiled binary packages (including all package plugins etc)
will be in ~/pbuilder/wheezy_result/ will be in ~/pbuilder/wheezy_result/

10
build_scripts/Debian+Ubuntu/clean.sh
View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
rm -f ./libssh-0.5.4.tar.gz.* rm -f ./libssh-0.5.4.tar.gz.*
rm -f ./retroshare06_0.6.2-1.*_source.build rm -f ./retroshare_0.6.2-1.*_source.build
rm -f ./retroshare06_0.6.2-1.*_source.changes rm -f ./retroshare_0.6.2-1.*_source.changes
rm -f ./retroshare06_0.6.2-1.*.tar.gz rm -f ./retroshare_0.6.2-1.*.tar.gz
rm -f ./retroshare06_0.6.2-1.*.diff.gz rm -f ./retroshare_0.6.2-1.*.diff.gz
rm -f ./retroshare06_0.6.2-1.*.dsc rm -f ./retroshare_0.6.2-1.*.dsc
rm -f *.upload rm -f *.upload
rm -f *~ rm -f *~

18
build_scripts/Debian+Ubuntu/control.jessie
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.precise
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, li
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqtmultimediakit1 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.squeeze_bubba3
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, qt4-dev-tools, li
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqtmultimediakit1 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqtmultimediakit1
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.stretch
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.xenial
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.yakkety
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

18
build_scripts/Debian+Ubuntu/control.zesty
View File

@ -1,4 +1,4 @@
Source: retroshare06 Source: retroshare
Section: devel Section: devel
Priority: standard Priority: standard
Maintainer: Cyril Soler <csoler@users.sourceforge.net> Maintainer: Cyril Soler <csoler@users.sourceforge.net>
@ -6,34 +6,34 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev, libupnp-dev, libssl-dev, libxs
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://retroshare.sourceforge.net Homepage: http://retroshare.sourceforge.net
Package: retroshare06-voip-plugin Package: retroshare-voip-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
friends chatting together need the plugin installed to be able to talk together. friends chatting together need the plugin installed to be able to talk together.
Package: retroshare06-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: RetroShare FeedReader plugin Description: RetroShare FeedReader plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend communication
plateform. The plugin adds a RSS feed reader tab to retroshare. plateform. The plugin adds a RSS feed reader tab to retroshare.
Package: retroshare06-nogui Package: retroshare-nogui
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06 Conflicts: retroshare
Description: Secure communication with friends Description: Secure communication with friends
This is the command-line client for RetroShare network. This client This is the command-line client for RetroShare network. This client
can be contacted and talked-to using SSL. Clients exist for portable can be contacted and talked-to using SSL. Clients exist for portable
devices running e.g. Android. devices running e.g. Android.
Package: retroshare06 Package: retroshare
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare06-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source cross-platform, private and secure decentralised RetroShare is a Open Source cross-platform, private and secure decentralised
commmunication platform. It lets you to securely chat and share files with your commmunication platform. It lets you to securely chat and share files with your

0
build_scripts/Debian+Ubuntu/debian/retroshare06-feedreader-plugin.install → build_scripts/Debian+Ubuntu/debian/retroshare-feedreader-plugin.install
View File

3
build_scripts/Debian+Ubuntu/debian/retroshare-nogui.install Normal file
View File

@ -0,0 +1,3 @@
debian/tmp/usr/bin/retroshare-nogui
debian/tmp/usr/share/retroshare/bdboot.txt
debian/tmp/usr/share/retroshare/webui/*

0
build_scripts/Debian+Ubuntu/debian/retroshare06-voip-plugin.install → build_scripts/Debian+Ubuntu/debian/retroshare-voip-plugin.install
View File

6
build_scripts/Debian+Ubuntu/debian/retroshare.install Normal file
View File

@ -0,0 +1,6 @@
debian/tmp/usr/bin/retroshare
debian/tmp/usr/bin/retroshare-nogui
debian/tmp/usr/share/applications/retroshare.desktop
debian/tmp/usr/share/icons/hicolor/*
debian/tmp/usr/share/pixmaps/retroshare.xpm
debian/tmp/usr/share/retroshare/*

3
build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install
View File

@ -1,3 +0,0 @@
debian/tmp/usr/bin/RetroShare06-nogui
debian/tmp/usr/share/RetroShare06/bdboot.txt
debian/tmp/usr/share/RetroShare06/webui/*

6
build_scripts/Debian+Ubuntu/debian/retroshare06.install
View File

@ -1,6 +0,0 @@
debian/tmp/usr/bin/RetroShare06
debian/tmp/usr/bin/RetroShare06-nogui
debian/tmp/usr/share/applications/retroshare06.desktop
debian/tmp/usr/share/icons/hicolor/*
debian/tmp/usr/share/pixmaps/retroshare06.xpm
debian/tmp/usr/share/RetroShare06/*

4
build_scripts/Debian+Ubuntu/full_packaging_pipeline.sh
View File

@ -10,12 +10,12 @@ archis="armhf amd64 i386"
######################################################## ########################################################
./clean.sh ./clean.sh
rm -rf retroshare06-0.6.2 rm -rf retroshare-0.6.2
./makeSourcePackage.sh -distribution "$distribs" ./makeSourcePackage.sh -distribution "$distribs"
for dist in $distribs; do for dist in $distribs; do
for arch in $archis; do for arch in $archis; do
pbuilder-dist $dist $arch build retroshare06_0.6.2-1.???????.????????~"$dist".dsc pbuilder-dist $dist $arch build retroshare.6.2-1.???????.????????~"$dist".dsc
done done
done done

2
build_scripts/Debian+Ubuntu/makeSourcePackage.sh
View File

@ -3,7 +3,7 @@
###################### PARAMETERS #################### ###################### PARAMETERS ####################
version="0.6.2" version="0.6.2"
gitpath="https://github.com/RetroShare/RetroShare.git" gitpath="https://github.com/RetroShare/RetroShare.git"
workdir=retroshare06-${version} workdir=retroshare-${version}
branch="master" branch="master"
#bubba3="Y" # comment out to compile for bubba3 #bubba3="Y" # comment out to compile for bubba3
###################################################### ######################################################

2
build_scripts/Debian+Ubuntu/ppa_upload.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
for i in `ls retroshare06_0.6.2-1.*.changes` ; do for i in `ls retroshare.6.2-1.*.changes` ; do
dput ppa:retroshare/unstable $i dput ppa:retroshare/unstable $i
done done

6
build_scripts/RedHat+Fedora/data/retroshare.desktop
View File

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Name=RetroShare06 Name=RetroShare
Comment=Securely share files with your friends Comment=Securely share files with your friends
Exec=/usr/bin/RetroShare06 %U Exec=/usr/bin/retroshare %U
Icon=/usr/share/pixmaps/retroshare06.xpm Icon=/usr/share/pixmaps/retroshare.xpm
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Network;P2P; Categories=Network;P2P;

4
build_scripts/RedHat+Fedora/makePackages.sh
View File

@ -34,7 +34,7 @@ echo "Using revision: ${REV}"
echo "Hit ENTER if this is correct. Otherwise hit Ctrl+C" echo "Hit ENTER if this is correct. Otherwise hit Ctrl+C"
read tmp read tmp
WORKDIR="retroshare06-${FULL_VERSION}" WORKDIR="retroshare-${FULL_VERSION}"
if [[ -d ${WORKDIR} ]] if [[ -d ${WORKDIR} ]]
then then
@ -80,6 +80,6 @@ do
done done
popd >/dev/null popd >/dev/null
tar -zcf rpm-build/rpm/SOURCES/${WORKDIR}.tar.gz ${WORKDIR} tar -zcf rpm-build/rpm/SOURCES/${WORKDIR}.tar.gz ${WORKDIR}
rpmbuild --define="%rev ${REV}" --define="%_usrsrc $PWD/rpm-build" --define="%_topdir %{_usrsrc}/rpm" -ba retroshare06.spec rpmbuild --define="%rev ${REV}" --define="%_usrsrc $PWD/rpm-build" --define="%_topdir %{_usrsrc}/rpm" -ba retroshare.spec
rm -rf ${WORKDIR} rm -rf ${WORKDIR}
exit 0 exit 0

12
build_scripts/RedHat+Fedora/retroshare06.spec → build_scripts/RedHat+Fedora/retroshare.spec
View File

@ -1,5 +1,5 @@
Summary: Secure communication with friends Summary: Secure communication with friends
Name: retroshare06 Name: retroshare
Version: 0.6.0.%{rev} Version: 0.6.0.%{rev}
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv3 License: GPLv3
@ -65,25 +65,25 @@ rm -rf $RPM_BUILD_ROOT
cd src cd src
make INSTALL_ROOT=$RPM_BUILD_ROOT install make INSTALL_ROOT=$RPM_BUILD_ROOT install
#menu #menu
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare06.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare.desktop
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/RetroShare06 %{_bindir}/retroshare
%defattr(644, root, root) %defattr(644, root, root)
%{_datadir}/pixmaps/%{name}.xpm %{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/icons/hicolor %{_datadir}/icons/hicolor
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/RetroShare06 %{_datadir}/retroshare
%files nogui %files nogui
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/RetroShare06-nogui %{_bindir}/retroshare-nogui
%defattr(644, root, root) %defattr(644, root, root)
%{_datadir}/RetroShare06 %{_datadir}/retroshare
%files voip-plugin %files voip-plugin
%defattr(-, root, root) %defattr(-, root, root)

2
build_scripts/Windows/build/pack.bat
View File

@ -116,7 +116,7 @@ echo copy external binaries
copy "%RootPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite% copy "%RootPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite%
echo copy dependencies echo copy dependencies
call :copy_dependencies "%RsDeployPath%\RetroShare06.exe" "%RsDeployPath%" call :copy_dependencies "%RsDeployPath%\retroshare.exe" "%RsDeployPath%"
echo copy Qt DLL's echo copy Qt DLL's
copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite% copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite%

20
build_scripts/Windows/installer/retroshare-Qt4.nsi
View File

@ -41,7 +41,7 @@
!define SOURCEDIR "..\..\.." !define SOURCEDIR "..\..\.."
# Get version from executable # Get version from executable
!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" VERSION_ !GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_
!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
;!define REVISION ${VERSION_4} ;!define REVISION ${VERSION_4}
@ -107,7 +107,7 @@ Var StyleSheetDir
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
!define MUI_FINISHPAGE_RUN "$INSTDIR\RetroShare06.exe" !define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe"
!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main
; Main binaries ; Main binaries
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File /oname=RetroShare06.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe" File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe"
; Qt binaries ; Qt binaries
File "${QTDIR}\bin\QtCore4.dll" File "${QTDIR}\bin\QtCore4.dll"
@ -270,7 +270,7 @@ SectionEnd
; WriteRegStr HKCR retroshare "" "PQI File" ; WriteRegStr HKCR retroshare "" "PQI File"
; WriteRegBin HKCR retroshare EditFlags 00000100 ; WriteRegBin HKCR retroshare EditFlags 00000100
; WriteRegStr HKCR "retroshare\shell" "" open ; WriteRegStr HKCR "retroshare\shell" "" open
; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\RetroShare06.exe" "%1"` ; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"`
;SectionEnd ;SectionEnd
# Shortcuts # Shortcuts
@ -279,15 +279,15 @@ Section $(Section_StartMenu) Section_StartMenu
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\${APPNAME}" CreateDirectory "$SMPROGRAMS\${APPNAME}"
CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
Section $(Section_Desktop) Section_Desktop Section $(Section_Desktop) Section_Desktop
CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
Section $(Section_QuickLaunch) Section_QuickLaunch Section $(Section_QuickLaunch) Section_QuickLaunch
CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
@ -296,7 +296,7 @@ Section $(Section_AutoStart) Section_AutoStart
SectionEnd SectionEnd
;Section $(Section_AutoStart) Section_AutoStart ;Section $(Section_AutoStart) Section_AutoStart
; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe -m" 0 ; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0
;SectionEnd ;SectionEnd
Section -FinishSection Section -FinishSection
@ -305,7 +305,7 @@ Section -FinishSection
WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\RetroShare06.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1"

20
build_scripts/Windows/installer/retroshare-Qt5.nsi
View File

@ -41,7 +41,7 @@
!define SOURCEDIR "..\..\.." !define SOURCEDIR "..\..\.."
# Get version from executable # Get version from executable
!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" VERSION_ !GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe" VERSION_
!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
;!define REVISION ${VERSION_4} ;!define REVISION ${VERSION_4}
@ -107,7 +107,7 @@ Var StyleSheetDir
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
!define MUI_FINISHPAGE_RUN "$INSTDIR\RetroShare06.exe" !define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe"
!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main
; Main binaries ; Main binaries
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File /oname=RetroShare06.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe" File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe"
; Qt binaries ; Qt binaries
File "${QTDIR}\bin\Qt5Core.dll" File "${QTDIR}\bin\Qt5Core.dll"
@ -288,7 +288,7 @@ SectionEnd
; WriteRegStr HKCR retroshare "" "PQI File" ; WriteRegStr HKCR retroshare "" "PQI File"
; WriteRegBin HKCR retroshare EditFlags 00000100 ; WriteRegBin HKCR retroshare EditFlags 00000100
; WriteRegStr HKCR "retroshare\shell" "" open ; WriteRegStr HKCR "retroshare\shell" "" open
; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\RetroShare06.exe" "%1"` ; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"`
;SectionEnd ;SectionEnd
# Shortcuts # Shortcuts
@ -297,15 +297,15 @@ Section $(Section_StartMenu) Section_StartMenu
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\${APPNAME}" CreateDirectory "$SMPROGRAMS\${APPNAME}"
CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
Section $(Section_Desktop) Section_Desktop Section $(Section_Desktop) Section_Desktop
CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
Section $(Section_QuickLaunch) Section_QuickLaunch Section $(Section_QuickLaunch) Section_QuickLaunch
CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0 CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
@ -314,7 +314,7 @@ Section $(Section_AutoStart) Section_AutoStart
SectionEnd SectionEnd
;Section $(Section_AutoStart) Section_AutoStart ;Section $(Section_AutoStart) Section_AutoStart
; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe -m" 0 ; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0
;SectionEnd ;SectionEnd
Section -FinishSection Section -FinishSection
@ -323,7 +323,7 @@ Section -FinishSection
WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}" WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\RetroShare06.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1"

0
data/128x128/apps/retroshare06.png → data/128x128/apps/retroshare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
data/24x24/apps/retroshare06.png → data/24x24/apps/retroshare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
data/48x48/apps/retroshare06.png → data/48x48/apps/retroshare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
data/64x64/apps/retroshare06.png → data/64x64/apps/retroshare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

6
data/retroshare06.desktop → data/retroshare.desktop
View File

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Version=1.0 Version=1.0
Name=RetroShare06 Name=RetroShare
Comment=Securely share files with your friends Comment=Securely share files with your friends
Exec=/usr/bin/RetroShare06 %U Exec=/usr/bin/retroshare %U
Icon=/usr/share/pixmaps/retroshare06.xpm Icon=/usr/share/pixmaps/retroshare.xpm
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Application;Network; Categories=Application;Network;

0
data/retroshare06.xpm → data/retroshare.xpm
View File

2
libresapi/src/README.md
View File

@ -10,5 +10,5 @@ Quickinfo for builders and packagers
* copy the files in ./webui to * copy the files in ./webui to
* ./webui (Windows) * ./webui (Windows)
* /usr/share/RetroShare06/webui (Linux) * /usr/share/retroshare/webui (Linux)
* other OS: see RsAccountsDetail::PathDataDirectory() * other OS: see RsAccountsDetail::PathDataDirectory()

2
libresapi/src/webui-src/README.md
View File

@ -19,7 +19,7 @@ BUILD / DEVELOPMENT
- the build process watches files for changes, and rebuilds and reloads the page. Build output is in ./public - the build process watches files for changes, and rebuilds and reloads the page. Build output is in ./public
- use the --webinterface 9090 command line parameter to enable webui in retroshare-nogui - use the --webinterface 9090 command line parameter to enable webui in retroshare-nogui
- set the --docroot parameter of retroshare-nogui to point to the "libresapi/src/webui-src/public" directory - set the --docroot parameter of retroshare-nogui to point to the "libresapi/src/webui-src/public" directory
(or symlink from /usr/share/RetroShare06/webui on Linux, ./webui on Windows) (or symlink from /usr/share/retroshare/webui on Linux, ./webui on Windows)
- retroshare-gui does not have a --docroot parameter. Use symlinks then. - retroshare-gui does not have a --docroot parameter. Use symlinks then.
CONTRIBUTE CONTRIBUTE

2
plugins/Common/retroshare_plugin.pri
View File

@ -80,7 +80,7 @@ macx {
#https://developer.apple.com/library/mac/documentation/Porting/Conceptual/PortingUnix/compiling/compiling.html #https://developer.apple.com/library/mac/documentation/Porting/Conceptual/PortingUnix/compiling/compiling.html
QMAKE_LFLAGS_PLUGIN -= -dynamiclib QMAKE_LFLAGS_PLUGIN -= -dynamiclib
QMAKE_LFLAGS_PLUGIN += -bundle QMAKE_LFLAGS_PLUGIN += -bundle
QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/RetroShare06.app/Contents/MacOS/RetroShare06" QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/retroshare.app/Contents/MacOS/retroshare"
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc

4
retroshare-gui/src/Info.plist
View File

@ -13,9 +13,9 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>RetroShare06</string> <string>retroshare</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.RetroShare06</string> <string>com.retroshare</string>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>
<true/> <true/>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>

2
retroshare-gui/src/gui/settings/GeneralPage.ui
View File

@ -165,7 +165,7 @@
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>!!!The RetroShare's desktop file is missing or wrong!!!</string> <string>!!!The RetroShare's desktop file is missing or wrong!!!</string>

4
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -799,9 +799,9 @@ bool RshareSettings::getRetroShareProtocol()
} }
} }
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
QFile desktop("/usr/share/applications/retroshare06.desktop"); QFile desktop("/usr/share/applications/retroshare.desktop");
if (!desktop.exists()) { if (!desktop.exists()) {
desktop.setFileName("/usr/share/applications/RetroShare06.desktop"); desktop.setFileName("/usr/share/applications/retroshare.desktop");
} }
if (desktop.exists()) { if (desktop.exists()) {
desktop.open(QIODevice::ReadOnly | QIODevice::Text); desktop.open(QIODevice::ReadOnly | QIODevice::Text);

4
retroshare-gui/src/lang/retroshare_af.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_ar.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20977,4 +20977,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_bg.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

6
retroshare-gui/src/lang/retroshare_ca_ES.ts
View File

@ -6678,8 +6678,8 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instal·la RetroShare amb un instal·lador de paquets per obtindre&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instal·la RetroShare amb un instal·lador de paquets per obtindre&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -21276,4 +21276,4 @@ Tingues paciència!</translation>
<translation>Imatges (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Imatges (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_cs.ts
View File

@ -6678,7 +6678,7 @@ a vytvořit nový node využívající stejný profil.</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21063,4 +21063,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_cy.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_da.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -6674,7 +6674,7 @@ und den Import zum Laden verwenden</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21184,4 +21184,4 @@ Bitte habe etwas Geduld!</translation>
<translation>Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_el.ts
View File

@ -6654,7 +6654,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21103,4 +21103,4 @@ Try to be patient!</source>
<translation>Εικόνες (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Εικόνες (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

2
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -6630,7 +6630,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

6
retroshare-gui/src/lang/retroshare_es.ts
View File

@ -6683,8 +6683,8 @@ y usar el botón Importar para cargarlo</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instale RetroShare con un paquete instalador para obtener&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instale RetroShare con un paquete instalador para obtener&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -21257,4 +21257,4 @@ bloques defectuosos y los descargará de nuevo.
<translation>Imágenes (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Imágenes (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_fi.ts
View File

@ -6662,7 +6662,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21143,4 +21143,4 @@ Kärsivällisyyttä!</translation>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

16
retroshare-gui/src/lang/retroshare_fr.ts
View File

@ -1777,14 +1777,14 @@ Double-cliquez sur un salon pour entrer et discuter.</translation>
<location line="+114"/> <location line="+114"/>
<location line="+114"/> <location line="+114"/>
<source>Style:</source> <source>Style:</source>
<translation>Style :</translation> <translation>Style :</translation>
</message> </message>
<message> <message>
<location line="-212"/> <location line="-212"/>
<location line="+114"/> <location line="+114"/>
<location line="+114"/> <location line="+114"/>
<source>Variant:</source> <source>Variant:</source>
<translation>Variante :</translation> <translation>Variante :</translation>
</message> </message>
<message> <message>
<location line="-525"/> <location line="-525"/>
@ -2577,7 +2577,7 @@ après la conversion en HTML.</translation>
<message> <message>
<location line="+34"/> <location line="+34"/>
<source>Name:</source> <source>Name:</source>
<translation>Nom :</translation> <translation>Nom :</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
@ -6697,8 +6697,8 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Installer RetroShare avec un gestionnaire de paquets afin d&apos;obtenir &lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Installer RetroShare avec un gestionnaire de paquets afin d&apos;obtenir &lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -7746,7 +7746,7 @@ Les publications sont conservés pendant %1 jours et synchronisés au cours des
<message> <message>
<location filename="../gui/feeds/GxsChannelPostItem.ui" line="+199"/> <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+199"/>
<source>New Comment:</source> <source>New Comment:</source>
<translation>Nouveau commentaire :</translation> <translation>Nouveau commentaire :</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
@ -15231,7 +15231,7 @@ comportements malveillants des extensions.</translation>
<message> <message>
<location line="-100"/> <location line="-100"/>
<source>New Comment:</source> <source>New Comment:</source>
<translation>Nouveau commentaire :</translation> <translation>Nouveau commentaire :</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
@ -21350,4 +21350,4 @@ Essayez d&apos;être patient !</translation>
<translation>Images (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Images (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_hu.ts
View File

@ -6651,7 +6651,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21123,4 +21123,4 @@ Kérlek, légy türelmes!</translation>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_it.ts
View File

@ -6678,7 +6678,7 @@ il bottone IMPORT per caricarlo</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21177,4 +21177,4 @@ Sii paziente!</translation>
<translation>Immagini (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Immagini (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_ja_JP.ts
View File

@ -6629,7 +6629,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20977,4 +20977,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_ko.ts
View File

@ -6637,7 +6637,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20991,4 +20991,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_nl.ts
View File

@ -6654,7 +6654,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21129,4 +21129,4 @@ Even geduld a.u.b.!</translation>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_pl.ts
View File

@ -6637,7 +6637,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21018,4 +21018,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_pt.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

6
retroshare-gui/src/lang/retroshare_ru.ts
View File

@ -6685,8 +6685,8 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Установить RetroShare с помощью установщика пакетов, чтобы создать&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Установить RetroShare с помощью установщика пакетов, чтобы создать&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -21269,4 +21269,4 @@ Try to be patient!</source>
<translation>Изображения (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Изображения (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_sl.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_sr.ts
View File

@ -6629,7 +6629,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20977,4 +20977,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_sv.ts
View File

@ -6660,7 +6660,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21139,4 +21139,4 @@ Försök ha tålamod!
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

6
retroshare-gui/src/lang/retroshare_tr.ts
View File

@ -6680,8 +6680,8 @@ ve Al düğmesini kullanarak yükleyebilirsiniz</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bir paket yükleyici ile RetroShare yüklemek için&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bir paket yükleyici ile RetroShare yüklemek için&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -21260,4 +21260,4 @@ Lütfen sabırla bekleyin!</translation>
<translation>Görseller (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation> <translation>Görseller (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_zh_CN.ts
View File

@ -6653,7 +6653,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -21134,4 +21134,4 @@ RetroShare 将向数据源请求详细的校验
<translation>图片 (*.png *.xpm *.jpg *.tiff *.gif *.jpeg)</translation> <translation>图片 (*.png *.xpm *.jpg *.tiff *.gif *.jpeg)</translation>
</message> </message>
</context> </context>
</TS> </TS>

4
retroshare-gui/src/lang/retroshare_zh_TW.ts
View File

@ -6628,7 +6628,7 @@ and use the import button to load it</source>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
@ -20976,4 +20976,4 @@ Try to be patient!</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
</TS> </TS>

6
retroshare-gui/src/retroshare-gui.pro
View File

@ -4,7 +4,7 @@ TEMPLATE = app
QT += network xml QT += network xml
CONFIG += qt gui uic qrc resources idle bitdht CONFIG += qt gui uic qrc resources idle bitdht
CONFIG += link_prl CONFIG += link_prl
TARGET = RetroShare06 TARGET = retroshare
DEFINES += TARGET=\\\"$${TARGET}\\\" DEFINES += TARGET=\\\"$${TARGET}\\\"
# Plz never commit the .pro with these flags enabled. # Plz never commit the .pro with these flags enabled.
@ -101,11 +101,11 @@ unix {
INSTALLS += icon_files INSTALLS += icon_files
desktop_files.path = "$${PREFIX}/share/applications" desktop_files.path = "$${PREFIX}/share/applications"
desktop_files.files = ../../data/retroshare06.desktop desktop_files.files = ../../data/retroshare.desktop
INSTALLS += desktop_files INSTALLS += desktop_files
pixmap_files.path = "$${PREFIX}/share/pixmaps" pixmap_files.path = "$${PREFIX}/share/pixmaps"
pixmap_files.files = ../../data/retroshare06.xpm pixmap_files.files = ../../data/retroshare.xpm
INSTALLS += pixmap_files INSTALLS += pixmap_files
} }

2
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -1,7 +1,7 @@
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare06-nogui TARGET = retroshare-nogui
CONFIG += bitdht CONFIG += bitdht
#CONFIG += introserver #CONFIG += introserver
CONFIG -= qt xml gui CONFIG -= qt xml gui

2
retroshare-qml-app/src/android/AndroidManifest.xml
View File

@ -6,7 +6,7 @@
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" <application android:name="org.qtproject.qt5.android.bindings.QtApplication"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:label="RetroShare" android:label="RetroShare"
android:icon="@drawable/retroshare06_128x128"> android:icon="@drawable/retroshare_128x128">
<activity android:name=".RetroShareQmlActivity" <activity android:name=".RetroShareQmlActivity"
android:label="RetroShare" android:label="RetroShare"
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"

1
retroshare-qml-app/src/android/res/drawable/retroshare06_128x128.png
View File

@ -1 +0,0 @@
../../../../../data/128x128/apps/retroshare06.png

1
retroshare-qml-app/src/android/res/drawable/retroshare06_48x48.png
View File

@ -1 +0,0 @@
../../../../../data/48x48/apps/retroshare06.png

1
retroshare-qml-app/src/android/res/drawable/retroshare_128x128.png Symbolic link
View File

@ -0,0 +1 @@
../../../../../data/128x128/apps/retroshare.png

1
retroshare-qml-app/src/android/res/drawable/retroshare_48x48.png Symbolic link
View File

@ -0,0 +1 @@
../../../../../data/48x48/apps/retroshare.png

2
retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareAndroidNotifyService.java
View File

@ -34,7 +34,7 @@ public class RetroShareAndroidNotifyService extends QtService
public void notify(String title, String text, String uri) public void notify(String title, String text, String uri)
{ {
Notification.Builder mBuilder = new Notification.Builder(this); Notification.Builder mBuilder = new Notification.Builder(this);
mBuilder.setSmallIcon(R.drawable.retroshare06_48x48) mBuilder.setSmallIcon(R.drawable.retroshare_48x48)
.setContentTitle(title) .setContentTitle(title)
.setContentText(text) .setContentText(text)
.setAutoCancel(true) .setAutoCancel(true)

1
retroshare-qml-app/src/icons/retroshare.png Symbolic link
View File

@ -0,0 +1 @@
../../../data/128x128/apps/retroshare.png

1
retroshare-qml-app/src/icons/retroshare06.png
View File

@ -1 +0,0 @@
../../../data/128x128/apps/retroshare06.png

2
retroshare-qml-app/src/main-app.qml
View File

@ -64,7 +64,7 @@ ApplicationWindow
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
height: Math.max(30, parent.height - 4) height: Math.max(30, parent.height - 4)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
source: "icons/retroshare06.png" source: "icons/retroshare.png"
} }
Label Label
{ {

2
retroshare-qml-app/src/qml.qrc
View File

@ -9,7 +9,7 @@
<file>RsLoginPassView.qml</file> <file>RsLoginPassView.qml</file>
<file>TrustedNodesView.qml</file> <file>TrustedNodesView.qml</file>
<file>ChatView.qml</file> <file>ChatView.qml</file>
<file>icons/retroshare06.png</file> <file>icons/retroshare.png</file>
<file>icons/state-offline.png</file> <file>icons/state-offline.png</file>
<file>icons/state-ok.png</file> <file>icons/state-ok.png</file>
<file>GxsIdentityDelegate.qml</file> <file>GxsIdentityDelegate.qml</file>

2
retroshare-qml-app/src/retroshare-qml-app.pro
View File

@ -41,7 +41,7 @@ DISTFILES += \
android/build.gradle \ android/build.gradle \
android/gradle/wrapper/gradle-wrapper.properties \ android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew.bat \ android/gradlew.bat \
icons/retroshare06.png icons/retroshare.png
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

4
retroshare.pri
View File

@ -86,9 +86,9 @@ rs_async_chat:CONFIG -= no_rs_async_chat
unix { unix {
isEmpty(PREFIX) { PREFIX = "/usr" } isEmpty(PREFIX) { PREFIX = "/usr" }
isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" } isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }
isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare06" } isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare" }
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" } isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/retroshare" }
isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" } isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" }
rs_autologin { rs_autologin {