Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modifications to support the changes in libretroshare.

Browse Source 
* Disabled all the VEG services, until GUI has been tweaked to match new interface.
 * Deleted <placeholder> text from PhotoItem.ui - to compile with older version of Qt.
 * Fixes to Retroshare.pro (restore libdht path, disable compilation of VEG classes)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-09-15 00:17:23 +00:00
parent bfef2c659f
commit ce992475a1
3 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
retroshare-gui/src/RetroShare.pro
View File

@ -2,13 +2,13 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht
# Below is for GXS services.
CONFIG += photoshare
CONFIG += wikipoos
CONFIG += thewire
CONFIG += identities
CONFIG += forumsv2
CONFIG += posted
#CONFIG += wikipoos
#CONFIG += thewire
#CONFIG += identities
#CONFIG += forumsv2
#CONFIG += posted
CONFIG += unfinished
CONFIG += gxsgui
#CONFIG += gxsgui
#CONFIG += pluginmgr
@ -193,8 +193,12 @@ freebsd-* {
# ###########################################
bitdht {
LIBS += ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
# Chris version.
#LIBS += ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a
#PRE_TARGETDEPS *= ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a
}
win32 {
@ -860,40 +864,36 @@ photoshare {
HEADERS += \
gui/PhotoShare/PhotoDialog.h \
gui/PhotoShare/PhotoDrop.h \
gui/PhotoShare/PhotoSlideShow.h \
util/TokenQueueV2.h \
gui/PhotoShare/AlbumDialog.h \
gui/PhotoShare/AlbumItem.h \
gui/PhotoShare/PhotoItem.h \
gui/PhotoShare/AlbumDialog.h \
gui/PhotoShare/AlbumCreateDialog.h \
util/TokenQueueV2.h \
gui/PhotoShare/PhotoItem.h \
gui/PhotoShare/PhotoShareItemHolder.h \
gui/PhotoShare/PhotoShare.h
gui/PhotoShare/PhotoShare.h \
gui/PhotoShare/PhotoSlideShow.h \
#gui/PhotoShare/PhotoDetailsDialog.h \
# gui/PhotoShare/PhotoAddDialog.h \
FORMS += \
gui/PhotoShare/PhotoItem.ui \
gui/PhotoShare/PhotoDialog.ui \
gui/PhotoShare/PhotoSlideShow.ui \
gui/PhotoShare/AlbumItem.ui \
gui/PhotoShare/AlbumDialog.ui \
gui/PhotoShare/PhotoItem.ui \
gui/PhotoShare/AlbumCreateDialog.ui \
gui/PhotoShare/PhotoShare.ui
# gui/PhotoShare/PhotoAddDialog.ui \1
# gui/PhotoShare/PhotoDetailsDialog.ui \
gui/PhotoShare/PhotoShare.ui \
gui/PhotoShare/PhotoSlideShow.ui \
SOURCES += \
gui/PhotoShare/PhotoItem.cpp \
gui/PhotoShare/PhotoDialog.cpp \
gui/PhotoShare/PhotoDrop.cpp \
gui/PhotoShare/PhotoSlideShow.cpp \
gui/PhotoShare/AlbumDialog.cpp \
util/TokenQueueV2.cpp \
gui/PhotoShare/AlbumItem.cpp \
gui/PhotoShare/PhotoItem.cpp \
gui/PhotoShare/AlbumDialog.cpp \
gui/PhotoShare/AlbumCreateDialog.cpp \
util/TokenQueueV2.cpp \
gui/PhotoShare/PhotoShareItemHolder.cpp \
gui/PhotoShare/PhotoShare.cpp
# gui/PhotoShare/PhotoAddDialog.cpp \
# gui/PhotoShare/PhotoDetailsDialog.cpp \
gui/PhotoShare/PhotoShare.cpp \
gui/PhotoShare/PhotoSlideShow.cpp \
}

6
retroshare-gui/src/gui/PhotoShare/PhotoItem.ui
View File

@ -76,16 +76,10 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Enter Title Here</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_PhotoGrapher">
<property name="placeholderText">
<string>Enter Photographer</string>
</property>
</widget>
</item>
</layout>

10
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -33,11 +33,15 @@
#include <retroshare/rsiface.h>
#include "gui/PhotoShare/PhotoDialog.h"
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE
#include "gui/WikiPoos/WikiDialog.h"
#include "gui/TheWire/WireDialog.h"
#include "gui/Identity/IdDialog.h"
#include "gui/ForumsV2Dialog.h"
#include "gui/Posted/PostedDialog.h"
#endif
//#include "GamesDialog.h"
//#include "CalDialog.h"
@ -93,14 +97,19 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
//ui.stackPages->add(calDialog = new CalDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp));
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE
IdDialog *idDialog = NULL;
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
#endif
PhotoDialog *photoDialog = NULL;
ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), grp));
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE
WikiDialog *wikiDialog = NULL;
ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Wiki Pages"), grp));
@ -116,6 +125,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
PostedDialog *postedDialog = NULL;
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Posted Links"), grp));
#endif
/* Create the toolbar */