Commit Graph

7847 Commits

Author SHA1 Message Date
AsamK
829c2f396e Move LIBS from gui/nogui linux section to libretroshare
remove -lglib-2.0 it's not needed:
was added in d8e327afcc to compile for arch,
but it compiles on arch now also without this
2015-09-01 14:53:17 +02:00
AsamK
846f7d0204 Make usage of sqlcipher explicit at compile time
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
2015-09-01 14:53:09 +02:00
AsamK
dca295143a Use CONFIG+=create_prl for libretroshare
Allows to specify all LIBS in libretroshare.pro so they don't also have
to be specified in gui/nogui.pro
2015-08-31 22:50:47 +02:00
AsamK
b9c174ba8f Add BIN_DIR variable to allow packagers to override it 2015-08-31 22:50:46 +02:00
AsamK
b66f466c7a Move all INSTALLS to the subproject they belong to
Allows installation of for example only retroshare-nogui, without
installing files only relevant for gui

$ qmake
$ make retroshare-nogui
$ make retroshare-nogui-install_subtargets
2015-08-31 22:49:46 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files
So far it only contains the default values for installation paths
2015-08-31 21:09:28 +02:00
Cyril Soler
c844d37ada Merge pull request #63 from AsamK/lobby_gui_lag
Remove lobby gui lag
2015-08-31 14:11:45 -04:00
electron128
5d4e94c671 libresapi: add basic forum read api (patch from Chozabu) close #32 2015-08-31 19:44:15 +02:00
Cyril Soler
ef292faa22 Merge pull request #61 from PhenomRetroShare/Improve_ElidedLabel_Alignment_HTML
Improve ElidedLabel
2015-08-31 10:43:29 -04:00
AsamK
cfde9d303c Escape name before inserting in name changed message and in anchor info 2015-08-31 16:38:28 +02:00
AsamK
bd6bb8996b Improve performance of eventFilter in chat lobbies
- Only check the anchors if the visible content has actually changed
  by saving lastUpdateCursorPos and End
- Check notify first, before doing any work
- Simplify regexp as the anchors have a fixed format
- Remove unnecessary conversion to utf8 and back
2015-08-31 12:10:49 +02:00
AsamK
5f81d8efc8 Remove nick from anchor names, causes problems
- Nicknames that contain " could break the formatting
- Nicknames containing chars like < or > were converted to html entities
  by the QTextBrowser so the anchor was no longer identical with the
  anchor stored in the _listMsg list
2015-08-31 12:10:49 +02:00
Thunder
de92c06f0b Merge pull request #62 from hunbernd/qt5-fix
Qt5 fix
2015-08-31 12:05:08 +02:00
hunbernd
bd3f7f6d38 Removed limit on opacity setting with recent windows versions on BandwidthGraphDialog
Conflicts:
	retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
2015-08-30 22:53:38 +02:00
hunbernd
acc3e4bb62 Replaced Q_WS_ --> Q_OS_
Q_WS macros are not available in Qt5
Restores some functions in Options->General dialog that were not available under Qt5
2015-08-30 22:51:15 +02:00
defnax
d9fd60ee75 Moved Id Chooser to Tool Menu
Added a place holder text.
2015-08-30 03:48:45 +02:00
Phenom
f73ee2c769 Improve ElidedLabel
Now respect alignment and html text.
Html is shown as plain text, no html in QTextLine...
Test with:
retroshare://file?name=Test_ElidedLabel.7z&size=7330&hash=bd19f1a486d34d08e434ca4309cf4b8f7a436e9e
2015-08-29 21:06:36 +02:00
csoler
b11baa7a65 updated ubuntu changelog 2015-08-29 14:44:16 -04:00
Cyril Soler
a276986eba Merge pull request #60 from PhenomRetroShare/Fix_AllowChatTextFormatOption
Allow Chat Text Format Option working.
2015-08-29 14:22:31 -04:00
Phenom
88a6931758 Allow Chat Text Format Option working. 2015-08-29 19:27:03 +02:00
Cyril Soler
0b5b20d5ea Merge pull request #59 from AsamK/qmake_improvements
Qmake improvements
2015-08-29 09:37:47 -04:00
Cyril Soler
0409dd8030 Merge pull request #58 from AsamK/debian_make_install
Adapt debian/ubuntu package files to use "make install"
2015-08-29 09:34:21 -04:00
AsamK
21e99cf8d4 Use explicit dependencies instead of CONFIG += ordered
Makes inter-dependencies clearer and allows parallel build of
independent libs on multi-core systems, e.g. with:
$ make -j4
2015-08-29 13:12:57 +02:00
AsamK
f002310cf2 Remove libpegmarkdown from win32 retroshare-nogui build
It is only needed for gui
2015-08-29 13:12:57 +02:00
AsamK
2337b468e0 Specify plugins as plugins to qmake
This way only libPLUGIN.so is generated and not the versioned files
libPLUGIN.so.1.0.0
2015-08-29 13:12:57 +02:00
defnax
ecb5d93685 changed default color for the system chat bubble 2015-08-29 04:01:01 +02:00
AsamK
d51b4b2b67 Adapt debian/ubuntu package files to use "make install" 2015-08-28 22:48:20 +02:00
defnax
c07bef37a0 Fixed Create Lobby Dialog's window size 2015-08-28 16:40:40 +02:00
Cyril Soler
a45de1ddb3 Merge pull request #57 from csoler/v0.6-SignedLobbies
V0.6 signed lobbies
2015-08-28 00:14:24 -04:00
csoler
40bffc3042 fixed last GUI bugs for authed lobbies 2015-08-27 23:09:31 -04:00
csoler
6d01461c66 fixed a few GUI bits for non anonymous chat lobbies 2015-08-27 22:37:01 -04:00
defnax
627dcc01a0 Merge pull request #50 from chozabu/forum_additions
enable customisation of columns in forum thread widget
2015-08-28 02:01:15 +02:00
defnax
7270ba908a Merge pull request #56 from AsamK/distant_chat_history
Implement history for distant chat
2015-08-28 01:58:37 +02:00
AsamK
5dad1680e6 Implement history for distant chat
Uses the same history config as private chat
2015-08-28 01:29:34 +02:00
Cyril Soler
d7531b3dea Merge pull request #54 from cavebeat/coverity
travis/coverity tokens updated
2015-08-27 19:28:09 -04:00
Cyril Soler
92405128e6 Merge pull request #55 from AsamK/install_stylesheets
Install qss and chat stylesheets on Linux
2015-08-27 19:27:24 -04:00
AsamK
622e94223c Remove Thumbs.db files and add to .gitignore 2015-08-27 22:35:28 +02:00
AsamK
699213af80 Load chat styles also from DATA_DIR/stylesheets
Chat styles were only loaded from user config dir
(or application dir on windows portable)

If a style exists in both folders, it's taken from config dir, so users
can customize chat styles by copying them to ~/.retroshare/stylesheets/
2015-08-27 22:35:28 +02:00
AsamK
66ba687acd Install qss and chat styles 2015-08-27 22:35:28 +02:00
thunder2
4d7f92ecbe Removed unnecessary select of groups in RsGxsNetService::locked_genReqGrpTransaction. 2015-08-27 22:27:19 +02:00
thunder2
753846beaf Added count of requests and results to debug output in RsDataService::retrieveGxsGrpMetaData 2015-08-27 22:25:24 +02:00
thunder2
d118a13d5a Fixed adding of empty group id to notify when removing a group. 2015-08-27 22:23:04 +02:00
thunder2
4cc1df3c12 Ignore updates of not existing groups in RsGenExchange::processGrpMask.
Solves:
"Error code: no such column: subscribeFlagGXS_MASK_HACK"
2015-08-27 22:23:03 +02:00
cave beat
d8aa7121c5 travis/coverity tokens updated 2015-08-27 19:08:25 +02:00
defnax
6e1a8fac10 Merge pull request #21 from AsamK/lobby_history
Store lobby history on disk
2015-08-27 18:43:28 +02:00
csoler
040b4fb949 implemented gp-authed lobbies. Still needs some GUI 2015-08-26 23:35:36 -04:00
Cyril Soler
b8459b3161 Merge pull request #44 from AsamK/improve_qmake
Improve qmake: "make install" support and ability to change install prefix
2015-08-26 20:38:27 -04:00
AsamK
c622ca035b Issue compile error if DATA_DIR is not set 2015-08-27 01:44:45 +02:00
Cyril Soler
ef499cd570 Merge pull request #46 from PhenomRetroShare/Fix_ChatWidgetSearchTextThreshold
Fix chat widget search text threshold
2015-08-26 19:43:56 -04:00
Cyril Soler
668394d676 Merge pull request #47 from PhenomRetroShare/AddHTML_TextOptimization_0.6
Add html text optimization 0.6
2015-08-26 19:42:42 -04:00