diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index d8bab2aa3..a82f3e93c 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -50,6 +50,7 @@ HEADERS += rshare.h \ gui/ULListDelegate.h \ gui/StartDialog.h \ gui/ChatDialog.h \ + gui/BlogDialog.h \ gui/NetworkDialog.h \ gui/GenCertDialog.h \ gui/TransfersDialog.h \ @@ -150,6 +151,7 @@ HEADERS += rshare.h \ FORMS += gui/ChatDialog.ui \ + gui/BlogDialog.ui \ gui/StartDialog.ui \ gui/GenCertDialog.ui \ gui/NetworkDialog.ui \ @@ -217,6 +219,7 @@ SOURCES += main.cpp \ gui/StartDialog.cpp \ gui/GenCertDialog.cpp \ gui/ChatDialog.cpp \ + gui/BlogDialog.cpp \ gui/NetworkDialog.cpp \ gui/TransfersDialog.cpp \ gui/graphframe.cpp \ diff --git a/retroshare-gui/src/gui/ApplicationWindow.cpp b/retroshare-gui/src/gui/ApplicationWindow.cpp index 9d27a14e4..a2840dc67 100644 --- a/retroshare-gui/src/gui/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/ApplicationWindow.cpp @@ -46,6 +46,7 @@ #include "PhotoDialog.h" #include "ForumsDialog.h" #include "channels/channelsDialog.h" +#include "BlogDialog.h" /* for smplayer */ #include "smplayer.h" @@ -114,6 +115,11 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages), createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), grp)); + BlogDialog *blogDialog = NULL; + ui.stackPages->add(blogDialog = new BlogDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_NETWORK), tr("Blog Feed"), grp)); + + //ui.stackPages->add(groupsDialog = new GroupsDialog(ui.stackPages), // createPageAction(QIcon(), tr("Groups"), grp)); diff --git a/retroshare-gui/src/gui/BlogDialog.cpp b/retroshare-gui/src/gui/BlogDialog.cpp new file mode 100644 index 000000000..02ebc0f78 --- /dev/null +++ b/retroshare-gui/src/gui/BlogDialog.cpp @@ -0,0 +1,33 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2008 Robert Fernie + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ +#include + +#include "BlogDialog.h" + +/** Constructor */ +BlogDialog::BlogDialog(QWidget *parent) +: MainPage (parent) +{ + /* Invoke the Qt Designer generated object setup routine */ + ui.setupUi(this); + +} + diff --git a/retroshare-gui/src/gui/BlogDialog.h b/retroshare-gui/src/gui/BlogDialog.h new file mode 100644 index 000000000..67911cdf1 --- /dev/null +++ b/retroshare-gui/src/gui/BlogDialog.h @@ -0,0 +1,42 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2008 Robert Fernie + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#ifndef _BLOG_DIALOG_H +#define _BLOG_DIALOG_H + +#include "mainpage.h" +#include "ui_BlogDialog.h" + +class BlogDialog : public MainPage +{ + Q_OBJECT + +public: + /** Default Constructor */ + BlogDialog(QWidget *parent = 0); + /** Default Destructor */ + + /** Qt Designer generated object */ + Ui::BlogDialog ui; +}; + +#endif + diff --git a/retroshare-gui/src/gui/BlogDialog.ui b/retroshare-gui/src/gui/BlogDialog.ui new file mode 100644 index 000000000..c1a8466f7 --- /dev/null +++ b/retroshare-gui/src/gui/BlogDialog.ui @@ -0,0 +1,1090 @@ + + BlogDialog + + + + 0 + 0 + 479 + 320 + + + + + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 104 + 104 + 104 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 104 + 104 + 104 + + + + + + + 255 + 255 + 255 + + + + + + + 104 + 104 + 104 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + Arial + 8 + 50 + false + false + false + false + + + + Qt::NoContextMenu + + + + + + + + + + 6 + + + 0 + + + 6 + + + 0 + + + + + + 2 + 0 + + + + Qt::Horizontal + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Qt::Horizontal + + + + 181 + 20 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + + + + :/images/chat.png + + + + + + + + 10 + 75 + true + + + + Live Group Chat: + + + + + + + + + + + + 0 + 0 + + + + Qt::DefaultContextMenu + + + false + + + true + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 41 + 20 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + Users: + + + + + + + + + + :/images/peers_16x16.png + + + + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + true + + + + 1 + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Qt::Horizontal + + + + 321 + 20 + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Underline + + + + + + :/images/edit-italic.png + + + true + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Italic + + + + + + :/images/edit-underline.png + + + true + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Bold + + + + + + :/images/edit-bold.png + + + true + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Text Color + + + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Font + + + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + :/images/emoticons/kopete/kopete020.png + + + + 24 + 24 + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 100 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + + + + Qt::Horizontal + + + + 321 + 20 + + + + + + + + Send + + + + + + + + + Send + + + + + Clear Chat History + + + + + textboldChatButton + textunderlineChatButton + textitalicChatButton + colorChatButton + msgText + msgSendList + + + + + +