From 7cba8b3b6bcbd356b83ebeec49e36aaa950e3857 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 24 Feb 2010 12:58:24 +0000 Subject: [PATCH] clean up blogs from project file added to the unfinished section for compiling git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2413 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 38 +++++++++++----------- retroshare-gui/src/gui/MainWindow.cpp | 13 +++++--- retroshare-gui/src/gui/MessengerWindow.cpp | 17 +++++++--- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index a8d9ef034..16b106405 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -1,4 +1,4 @@ -CONFIG += qt gui uic qrc resources newsettings +CONFIG += qt gui uic qrc resources uitools newsettings QT += network xml script opengl TEMPLATE = app @@ -212,11 +212,7 @@ HEADERS += rshare.h \ gui/msgs/textformat.h \ gui/images/retroshare_win.rc.h \ gui/settings/rsharesettings.h \ - gui/settings/rsettings.h \ - gui/blogs/BlogsDialog.h \ - gui/blogs/CreateBlog.h \ - gui/blogs/CreateBlogMsg.h \ - gui/blogs/BlogsMsgItem.h \ + gui/settings/rsettings.h \ gui/toaster/MessageToaster.h \ gui/toaster/OnlineToaster.h \ gui/toaster/ChatToaster.h \ @@ -287,11 +283,7 @@ FORMS += gui/StartDialog.ui \ gui/HelpDialog.ui \ gui/InfoDialog.ui \ gui/DetailsDialog.ui \ - gui/bwgraph/bwgraph.ui \ - gui/blogs/BlogsDialog.ui \ - gui/blogs/CreateBlog.ui \ - gui/blogs/CreateBlogMsg.ui \ - gui/blogs/BlogsMsgItem.ui \ + gui/bwgraph/bwgraph.ui \ gui/profile/ProfileView.ui \ gui/profile/ProfileEdit.ui \ gui/profile/ProfileWidget.ui \ @@ -389,11 +381,7 @@ SOURCES += main.cpp \ gui/profile/ProfileView.cpp \ gui/profile/ProfileEdit.cpp \ gui/profile/ProfileWidget.cpp \ - gui/profile/StatusMessage.cpp \ - gui/blogs/BlogsDialog.cpp \ - gui/blogs/CreateBlog.cpp \ - gui/blogs/CreateBlogMsg.cpp \ - gui/blogs/BlogsMsgItem.cpp \ + gui/profile/StatusMessage.cpp \ gui/channels/CreateChannelMsg.cpp \ gui/channels/ChannelDetails.cpp \ gui/chat/PopupChatDialog.cpp \ @@ -535,7 +523,11 @@ HEADERS += gui/unfinished/ApplicationWindow.h \ gui/unfinished/PhotoDialog.h \ gui/unfinished/PhotoShow.h \ gui/unfinished/StatisticDialog.h \ - gui/unfinished/TransferFeed.h + gui/unfinished/TransferFeed.h \ + gui/unfinished/blogs/BlogsDialog.h \ + gui/unfinished/blogs/CreateBlog.h \ + gui/unfinished/blogs/CreateBlogMsg.h \ + gui/unfinished/blogs/BlogsMsgItem.h FORMS += gui/unfinished/ApplicationWindow.ui \ gui/unfinished/BlogDialog.ui \ @@ -547,7 +539,11 @@ FORMS += gui/unfinished/ApplicationWindow.ui \ gui/unfinished/PhotoDialog.ui \ gui/unfinished/PhotoShow.ui \ gui/unfinished/StatisticDialog.ui \ - gui/unfinished/TransferFeed.ui + gui/unfinished/TransferFeed.ui \ + gui/unfinished/blogs/BlogsDialog.ui \ + gui/unfinished/blogs/CreateBlog.ui \ + gui/unfinished/blogs/CreateBlogMsg.ui \ + gui/unfinished/blogs/BlogsMsgItem.ui SOURCES += gui/unfinished/ApplicationWindow.cpp \ gui/unfinished/BlogDialog.cpp \ @@ -559,7 +555,11 @@ SOURCES += gui/unfinished/ApplicationWindow.cpp \ gui/unfinished/PhotoDialog.cpp \ gui/unfinished/PhotoShow.cpp \ gui/unfinished/StatisticDialog.cpp \ - gui/unfinished/TransferFeed.cpp + gui/unfinished/TransferFeed.cpp \ + gui/unfinished/blogs/BlogsDialog.cpp \ + gui/unfinished/blogs/CreateBlog.cpp \ + gui/unfinished/blogs/CreateBlogMsg.cpp \ + gui/unfinished/blogs/BlogsMsgItem.cpp DEFINES *= UNFINISHED } diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index c15999373..290cd7680 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -33,7 +33,10 @@ #include "LinksDialog.h" #include "ForumsDialog.h" #include "NewsFeed.h" -#include "blogs/BlogsDialog.h" + +#ifdef UNFINISHED +#include "gui/unfinished/blogs/BlogsDialog.h" +#endif #include "rshare.h" #include "MainWindow.h" @@ -128,10 +131,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /*messengerWindow instance is created statically so that RsAutoUpdatePage can access it*/ messengerWindow = MessengerWindow::getInstance(); -#ifdef UNFINISHED + #ifdef UNFINISHED applicationWindow = new ApplicationWindow(); applicationWindow->hide(); -#endif + #endif /** Left Side ToolBar**/ connect(ui.actionAdd_Friend, SIGNAL(triggered() ), this , SLOT( addFriend() ) ); @@ -186,11 +189,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); #endif - #ifndef RS_RELEASE_VERSION + #ifdef UNFINISHED BlogsDialog *blogsFeed = NULL; ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages), createPageAction(QIcon(IMAGE_BLOGS), tr("Blogs"), grp)); - #endif + #endif ForumsDialog *forumsDialog = NULL; ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index d560035cf..a7c53be5d 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -147,7 +147,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags) updateAvatar(); loadmystatusmessage(); - loadstatus(); + //loadstatus(); displayMenu(); updateMessengerDisplay(); @@ -930,6 +930,9 @@ void MessengerWindow::displayMenu() /** Load own status Online,Away,Busy **/ void MessengerWindow::loadstatus() { + //rsiface->lockData(); /* Lock Interface */ + + /* load up configuration from rsPeers */ RsPeerDetails detail; std::string ownId = rsPeers->getOwnId(); @@ -938,7 +941,7 @@ void MessengerWindow::loadstatus() { return; } - + StatusInfo si; if (!rsStatus->getStatus(ownId, si)) { @@ -965,19 +968,23 @@ void MessengerWindow::loadstatus() } ui.statuscomboBox->setCurrentIndex(statusIndex); + + //rsiface->unlockData(); /* UnLock Interface */ } /** Save own status Online,Away,Busy **/ void MessengerWindow::savestatus() { + //rsiface->lockData(); /* Lock Interface */ + RsPeerDetails detail; std::string ownId = rsPeers->getOwnId(); if (!rsPeers->getPeerDetails(ownId, detail)) { return; - } - + } + StatusInfo si; int statusIndex = ui.statuscomboBox->currentIndex(); @@ -1005,5 +1012,7 @@ void MessengerWindow::savestatus() si.status = status; rsStatus->setStatus(si); + + //rsiface->unlockData(); /* UnLock Interface */ }