From ce992475a185c30595c62dcb5fc3ed936c3e28f6 Mon Sep 17 00:00:00 2001 From: drbob Date: Sat, 15 Sep 2012 00:17:23 +0000 Subject: [PATCH] Modifications to support the changes in libretroshare. * Disabled all the VEG services, until GUI has been tweaked to match new interface. * Deleted 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 --- retroshare-gui/src/RetroShare.pro | 56 +++++++++---------- .../src/gui/PhotoShare/PhotoItem.ui | 6 -- .../src/gui/unfinished/ApplicationWindow.cpp | 10 ++++ 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 70ae08b12..590166f69 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -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 \ + gui/PhotoShare/AlbumItem.h \ + gui/PhotoShare/AlbumDialog.h \ + gui/PhotoShare/AlbumCreateDialog.h \ util/TokenQueueV2.h \ - gui/PhotoShare/AlbumDialog.h \ - gui/PhotoShare/AlbumItem.h \ gui/PhotoShare/PhotoItem.h \ - gui/PhotoShare/AlbumCreateDialog.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 \ + gui/PhotoShare/AlbumItem.cpp \ + gui/PhotoShare/AlbumDialog.cpp \ + gui/PhotoShare/AlbumCreateDialog.cpp \ util/TokenQueueV2.cpp \ - gui/PhotoShare/AlbumItem.cpp \ - gui/PhotoShare/PhotoItem.cpp \ - gui/PhotoShare/AlbumCreateDialog.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 \ + } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui b/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui index 6101f39ae..b49b45ff3 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui @@ -76,16 +76,10 @@ p, li { white-space: pre-wrap; } - - Enter Title Here - - - Enter Photographer - diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index d3002dc7c..8672b2103 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -33,11 +33,15 @@ #include #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 */