mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 02:44:20 -05:00
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
This commit is contained in:
parent
e7a78af546
commit
7cba8b3b6b
@ -1,4 +1,4 @@
|
|||||||
CONFIG += qt gui uic qrc resources newsettings
|
CONFIG += qt gui uic qrc resources uitools newsettings
|
||||||
QT += network xml script opengl
|
QT += network xml script opengl
|
||||||
|
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
@ -213,10 +213,6 @@ HEADERS += rshare.h \
|
|||||||
gui/images/retroshare_win.rc.h \
|
gui/images/retroshare_win.rc.h \
|
||||||
gui/settings/rsharesettings.h \
|
gui/settings/rsharesettings.h \
|
||||||
gui/settings/rsettings.h \
|
gui/settings/rsettings.h \
|
||||||
gui/blogs/BlogsDialog.h \
|
|
||||||
gui/blogs/CreateBlog.h \
|
|
||||||
gui/blogs/CreateBlogMsg.h \
|
|
||||||
gui/blogs/BlogsMsgItem.h \
|
|
||||||
gui/toaster/MessageToaster.h \
|
gui/toaster/MessageToaster.h \
|
||||||
gui/toaster/OnlineToaster.h \
|
gui/toaster/OnlineToaster.h \
|
||||||
gui/toaster/ChatToaster.h \
|
gui/toaster/ChatToaster.h \
|
||||||
@ -288,10 +284,6 @@ FORMS += gui/StartDialog.ui \
|
|||||||
gui/InfoDialog.ui \
|
gui/InfoDialog.ui \
|
||||||
gui/DetailsDialog.ui \
|
gui/DetailsDialog.ui \
|
||||||
gui/bwgraph/bwgraph.ui \
|
gui/bwgraph/bwgraph.ui \
|
||||||
gui/blogs/BlogsDialog.ui \
|
|
||||||
gui/blogs/CreateBlog.ui \
|
|
||||||
gui/blogs/CreateBlogMsg.ui \
|
|
||||||
gui/blogs/BlogsMsgItem.ui \
|
|
||||||
gui/profile/ProfileView.ui \
|
gui/profile/ProfileView.ui \
|
||||||
gui/profile/ProfileEdit.ui \
|
gui/profile/ProfileEdit.ui \
|
||||||
gui/profile/ProfileWidget.ui \
|
gui/profile/ProfileWidget.ui \
|
||||||
@ -390,10 +382,6 @@ SOURCES += main.cpp \
|
|||||||
gui/profile/ProfileEdit.cpp \
|
gui/profile/ProfileEdit.cpp \
|
||||||
gui/profile/ProfileWidget.cpp \
|
gui/profile/ProfileWidget.cpp \
|
||||||
gui/profile/StatusMessage.cpp \
|
gui/profile/StatusMessage.cpp \
|
||||||
gui/blogs/BlogsDialog.cpp \
|
|
||||||
gui/blogs/CreateBlog.cpp \
|
|
||||||
gui/blogs/CreateBlogMsg.cpp \
|
|
||||||
gui/blogs/BlogsMsgItem.cpp \
|
|
||||||
gui/channels/CreateChannelMsg.cpp \
|
gui/channels/CreateChannelMsg.cpp \
|
||||||
gui/channels/ChannelDetails.cpp \
|
gui/channels/ChannelDetails.cpp \
|
||||||
gui/chat/PopupChatDialog.cpp \
|
gui/chat/PopupChatDialog.cpp \
|
||||||
@ -535,7 +523,11 @@ HEADERS += gui/unfinished/ApplicationWindow.h \
|
|||||||
gui/unfinished/PhotoDialog.h \
|
gui/unfinished/PhotoDialog.h \
|
||||||
gui/unfinished/PhotoShow.h \
|
gui/unfinished/PhotoShow.h \
|
||||||
gui/unfinished/StatisticDialog.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 \
|
FORMS += gui/unfinished/ApplicationWindow.ui \
|
||||||
gui/unfinished/BlogDialog.ui \
|
gui/unfinished/BlogDialog.ui \
|
||||||
@ -547,7 +539,11 @@ FORMS += gui/unfinished/ApplicationWindow.ui \
|
|||||||
gui/unfinished/PhotoDialog.ui \
|
gui/unfinished/PhotoDialog.ui \
|
||||||
gui/unfinished/PhotoShow.ui \
|
gui/unfinished/PhotoShow.ui \
|
||||||
gui/unfinished/StatisticDialog.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 \
|
SOURCES += gui/unfinished/ApplicationWindow.cpp \
|
||||||
gui/unfinished/BlogDialog.cpp \
|
gui/unfinished/BlogDialog.cpp \
|
||||||
@ -559,7 +555,11 @@ SOURCES += gui/unfinished/ApplicationWindow.cpp \
|
|||||||
gui/unfinished/PhotoDialog.cpp \
|
gui/unfinished/PhotoDialog.cpp \
|
||||||
gui/unfinished/PhotoShow.cpp \
|
gui/unfinished/PhotoShow.cpp \
|
||||||
gui/unfinished/StatisticDialog.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
|
DEFINES *= UNFINISHED
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,10 @@
|
|||||||
#include "LinksDialog.h"
|
#include "LinksDialog.h"
|
||||||
#include "ForumsDialog.h"
|
#include "ForumsDialog.h"
|
||||||
#include "NewsFeed.h"
|
#include "NewsFeed.h"
|
||||||
#include "blogs/BlogsDialog.h"
|
|
||||||
|
#ifdef UNFINISHED
|
||||||
|
#include "gui/unfinished/blogs/BlogsDialog.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "rshare.h"
|
#include "rshare.h"
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
@ -186,7 +189,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
|||||||
createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp));
|
createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef RS_RELEASE_VERSION
|
#ifdef UNFINISHED
|
||||||
BlogsDialog *blogsFeed = NULL;
|
BlogsDialog *blogsFeed = NULL;
|
||||||
ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages),
|
ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages),
|
||||||
createPageAction(QIcon(IMAGE_BLOGS), tr("Blogs"), grp));
|
createPageAction(QIcon(IMAGE_BLOGS), tr("Blogs"), grp));
|
||||||
|
@ -147,7 +147,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
|
|||||||
updateAvatar();
|
updateAvatar();
|
||||||
loadmystatusmessage();
|
loadmystatusmessage();
|
||||||
|
|
||||||
loadstatus();
|
//loadstatus();
|
||||||
|
|
||||||
displayMenu();
|
displayMenu();
|
||||||
updateMessengerDisplay();
|
updateMessengerDisplay();
|
||||||
@ -930,6 +930,9 @@ void MessengerWindow::displayMenu()
|
|||||||
/** Load own status Online,Away,Busy **/
|
/** Load own status Online,Away,Busy **/
|
||||||
void MessengerWindow::loadstatus()
|
void MessengerWindow::loadstatus()
|
||||||
{
|
{
|
||||||
|
//rsiface->lockData(); /* Lock Interface */
|
||||||
|
|
||||||
|
|
||||||
/* load up configuration from rsPeers */
|
/* load up configuration from rsPeers */
|
||||||
RsPeerDetails detail;
|
RsPeerDetails detail;
|
||||||
std::string ownId = rsPeers->getOwnId();
|
std::string ownId = rsPeers->getOwnId();
|
||||||
@ -965,11 +968,15 @@ void MessengerWindow::loadstatus()
|
|||||||
}
|
}
|
||||||
|
|
||||||
ui.statuscomboBox->setCurrentIndex(statusIndex);
|
ui.statuscomboBox->setCurrentIndex(statusIndex);
|
||||||
|
|
||||||
|
//rsiface->unlockData(); /* UnLock Interface */
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Save own status Online,Away,Busy **/
|
/** Save own status Online,Away,Busy **/
|
||||||
void MessengerWindow::savestatus()
|
void MessengerWindow::savestatus()
|
||||||
{
|
{
|
||||||
|
//rsiface->lockData(); /* Lock Interface */
|
||||||
|
|
||||||
RsPeerDetails detail;
|
RsPeerDetails detail;
|
||||||
std::string ownId = rsPeers->getOwnId();
|
std::string ownId = rsPeers->getOwnId();
|
||||||
|
|
||||||
@ -1006,4 +1013,6 @@ void MessengerWindow::savestatus()
|
|||||||
|
|
||||||
rsStatus->setStatus(si);
|
rsStatus->setStatus(si);
|
||||||
|
|
||||||
|
//rsiface->unlockData(); /* UnLock Interface */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user