diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 997a32332..02998c48d 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -233,6 +233,7 @@ HEADERS += rshare.h \ gui/settings/NetworkPage.h \ gui/settings/NotifyPage.h \ gui/settings/CryptoPage.h \ + gui/settings/MessagePage.h \ gui/settings/AppearancePage.h \ gui/settings/FileAssociationsPage.h \ gui/settings/SoundPage.h \ @@ -330,6 +331,7 @@ FORMS += gui/StartDialog.ui \ gui/settings/NetworkPage.ui \ gui/settings/NotifyPage.ui \ gui/settings/CryptoPage.ui \ + gui/settings/MessagePage.ui \ gui/settings/AppearancePage.ui \ gui/settings/TransferPage.ui \ gui/settings/SoundPage.ui \ @@ -444,6 +446,7 @@ SOURCES += main.cpp \ gui/settings/NetworkPage.cpp \ gui/settings/NotifyPage.cpp \ gui/settings/CryptoPage.cpp \ + gui/settings/MessagePage.cpp \ gui/settings/AppearancePage.cpp \ gui/settings/FileAssociationsPage.cpp \ gui/settings/SoundPage.cpp \ diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp new file mode 100644 index 000000000..8f99b961c --- /dev/null +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -0,0 +1,57 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006, crypton + * + * 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 "MessagePage.h" +#include "rshare.h" + +MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags) + : ConfigPage(parent, flags) +{ + ui.setupUi(this); + setAttribute(Qt::WA_QuitOnClose, false); + +} + +MessagePage::~MessagePage() +{ +} + +void +MessagePage::closeEvent (QCloseEvent * event) +{ + QWidget::closeEvent(event); +} + + +/** Saves the changes on this page */ +bool +MessagePage::save(QString &errmsg) +{ + return true; +} + +/** Loads the settings for this page */ +void +MessagePage::load() +{ + +} + diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h new file mode 100644 index 000000000..637b2bfce --- /dev/null +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -0,0 +1,49 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006, crypton + * + * 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 MESSAGEPAGE_H +#define MESSAGEPAGE_H + +#include + +#include "configpage.h" +#include "ui_MessagePage.h" + +class MessagePage : public ConfigPage +{ + public: + MessagePage(QWidget * parent = 0, Qt::WFlags flags = 0); + ~MessagePage(); + + /** Saves the changes on this page */ + bool save(QString &errmsg); + /** Loads the settings for this page */ + void load(); + + private: + + void closeEvent (QCloseEvent * event); + + Ui::MessagePage ui; +}; + +#endif // !MESSAGEPAGE_H + diff --git a/retroshare-gui/src/gui/settings/MessagePage.ui b/retroshare-gui/src/gui/settings/MessagePage.ui new file mode 100644 index 000000000..7837d7e22 --- /dev/null +++ b/retroshare-gui/src/gui/settings/MessagePage.ui @@ -0,0 +1,506 @@ + + MessagePage + + + + 0 + 0 + 398 + 389 + + + + + 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 + + + + + + + diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index 0efc13319..48185589c 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -30,6 +30,7 @@ #include "SoundPage.h" #include "TransferPage.h" #include "ChatPage.h" +#include "MessagePage.h" #define IMAGE_GENERAL ":/images/kcmsystem24.png" @@ -105,12 +106,10 @@ RSettingsWin::initStackedWidget() stackedWidget->addWidget(new DirectoriesPage()); stackedWidget->addWidget(new NotifyPage()); stackedWidget->addWidget(new CryptoPage()); + stackedWidget->addWidget(new MessagePage()); stackedWidget->addWidget(new ChatPage()); stackedWidget->addWidget(new AppearancePage()); - // #ifndef RS_RELEASE_VERSION - // stackedWidget->addWidget(new FileAssociationsPage() ); stackedWidget->addWidget(new SoundPage() ); - // #endif loadSettings(); /* load saved settings */ @@ -148,6 +147,10 @@ RSettingsWin::setNewPage(int page) text = tr("Security"); pageicon->setPixmap(QPixmap(":/images/encrypted32.png")); break; + case Message: + text = tr("Message"); + pageicon->setPixmap(QPixmap(":/images/evolution.png")); + break; case Chat: text = tr("Chat"); pageicon->setPixmap(QPixmap(":/images/chat_24.png")); diff --git a/retroshare-gui/src/gui/settings/rsettingswin.h b/retroshare-gui/src/gui/settings/rsettingswin.h index b3e51aed3..35db5f102 100755 --- a/retroshare-gui/src/gui/settings/rsettingswin.h +++ b/retroshare-gui/src/gui/settings/rsettingswin.h @@ -32,7 +32,7 @@ class RSettingsWin: public QDialog, private Ui::Settings public: enum PageType { General = 0, Server, Transfer, - Directories, Notify, Security, Chat, Appearance, Sound,Fileassociations }; + Directories, Notify, Security, Message, Chat, Appearance, Sound, Fileassociations }; static void showYourself(QWidget *parent); static void postModDirectories(bool update_local); diff --git a/retroshare-gui/src/gui/settings/settings.ui b/retroshare-gui/src/gui/settings/settings.ui index 631c6350c..ae9ea610c 100755 --- a/retroshare-gui/src/gui/settings/settings.ui +++ b/retroshare-gui/src/gui/settings/settings.ui @@ -131,6 +131,15 @@ :/images/encrypted32.png:/images/encrypted32.png + + + Message + + + + :/images/evolution.png:/images/evolution.png + + Chat