diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 7a13c7943..38cd65f5c 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -106,7 +106,6 @@ DEPENDPATH += . \ gui\chat \ gui\connect \ gui\images \ - gui\Preferences \ gui\common \ gui\toaster \ gui\help\browser \ @@ -189,21 +188,8 @@ HEADERS += rshare.h \ gui/msgs/ChanMsgDialog.h \ gui/msgs/ChanCreateDialog.h \ gui/images/retroshare_win.rc.h \ - gui/Preferences/configpage.h \ - gui/Preferences/configpagestack.h \ - gui/Preferences/CryptographyDialog.h \ - gui/Preferences/DirectoriesDialog.h \ - gui/Preferences/AppearanceDialog.h \ - gui/Preferences/GeneralDialog.h \ - gui/Preferences/PreferencesWindow.h \ - gui/Preferences/ServerDialog.h \ - gui/Preferences/NotifyDialog.h \ - gui/Preferences/ConfirmQuitDialog.h \ - gui/Preferences/rsharesettings.h \ - gui/Preferences/rsettings.h \ - gui/Preferences/FileAssotiationsDialog.h \ - gui/Preferences/AddFileAssotiationDialog.h \ - gui/Preferences/SoundDialog.h \ + gui/settings/rsharesettings.h \ + gui/settings/rsettings.h \ gui/toaster/MessageToaster.h \ gui/toaster/OnlineToaster.h \ gui/toaster/ChatToaster.h \ @@ -280,15 +266,6 @@ FORMS += gui/StartDialog.ui \ gui/connect/ConfCertDialog.ui \ gui/msgs/ChanMsgDialog.ui \ gui/msgs/ChanCreateDialog.ui \ - gui/Preferences/CryptographyDialog.ui \ - gui/Preferences/DirectoriesDialog.ui \ - gui/Preferences/AppearanceDialog.ui \ - gui/Preferences/GeneralDialog.ui \ - gui/Preferences/PreferencesWindow.ui \ - gui/Preferences/ServerDialog.ui \ - gui/Preferences/NotifyDialog.ui \ - gui/Preferences/SoundDialog.ui \ - gui/Preferences/ConfirmQuitDialog.ui \ gui/toaster/CallToaster.ui \ gui/toaster/ChatToaster.ui \ gui/toaster/MessageToaster.ui \ @@ -376,24 +353,12 @@ SOURCES += main.cpp \ gui/connect/ConnectDialog.cpp \ gui/connect/ConfCertDialog.cpp \ gui/msgs/ChanMsgDialog.cpp \ - gui/msgs/ChanCreateDialog.cpp \ - gui/Preferences/configpagestack.cpp \ - gui/Preferences/CryptographyDialog.cpp \ - gui/Preferences/DirectoriesDialog.cpp \ - gui/Preferences/AppearanceDialog.cpp \ - gui/Preferences/GeneralDialog.cpp \ - gui/Preferences/PreferencesWindow.cpp \ - gui/Preferences/ServerDialog.cpp \ - gui/Preferences/NotifyDialog.cpp \ - gui/Preferences/ConfirmQuitDialog.cpp \ - gui/Preferences/rsharesettings.cpp \ - gui/Preferences/rsettings.cpp \ - gui/Preferences/FileAssotiationsDialog.cpp \ - gui/Preferences/AddFileAssotiationDialog.cpp \ - gui/Preferences/SoundDialog.cpp \ + gui/msgs/ChanCreateDialog.cpp \ gui/common/vmessagebox.cpp \ gui/common/rwindow.cpp \ - gui/common/html.cpp \ + gui/common/html.cpp \ + gui/settings/rsharesettings.cpp \ + gui/settings/rsettings.cpp \ gui/statusbar/peerstatus.cpp \ gui/statusbar/natstatus.cpp \ gui/statusbar/ratesstatus.cpp \ @@ -491,7 +456,7 @@ newsettings { gui/settings/AppearancePage.h \ gui/settings/FileAssociationsPage.h \ gui/settings/SoundPage.h \ - gui/settings/AddFileAssociationDialog.h + gui/settings/AddFileAssociationDialog.h\ FORMS += gui/settings/settings.ui \ gui/settings/GeneralPage.ui \ diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index db2e88d35..a5a1e10a9 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -24,7 +24,7 @@ #include #include "GenCertDialog.h" #include "InfoDialog.h" -#include "gui/Preferences/rsharesettings.h" +#include "gui/settings/rsharesettings.h" #include #include #include diff --git a/retroshare-gui/src/gui/MessengerWindow.h b/retroshare-gui/src/gui/MessengerWindow.h index cb6af63cf..6a8be5bf4 100644 --- a/retroshare-gui/src/gui/MessengerWindow.h +++ b/retroshare-gui/src/gui/MessengerWindow.h @@ -26,7 +26,7 @@ #include "mainpage.h" #include "ui_MessengerWindow.h" #include "NetworkDialog.h" -#include +#include #include class LogoBar; diff --git a/retroshare-gui/src/gui/NetworkDialog.h b/retroshare-gui/src/gui/NetworkDialog.h index 26e57ab9c..42e7efc27 100644 --- a/retroshare-gui/src/gui/NetworkDialog.h +++ b/retroshare-gui/src/gui/NetworkDialog.h @@ -26,7 +26,7 @@ #include #include -#include "Preferences/rsharesettings.h" +#include "settings/rsharesettings.h" #include "mainpage.h" #include "ui_NetworkDialog.h" diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index a8c47e07a..92ea85ca8 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -34,7 +34,7 @@ #include "feeds/BlogMsgItem.h" #include "feeds/MsgItem.h" -#include "Preferences/rsharesettings.h" +#include "settings/rsharesettings.h" #include "GeneralMsgDialog.h" diff --git a/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.cpp b/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.cpp deleted file mode 100644 index e6b2d1e33..000000000 --- a/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.cpp +++ /dev/null @@ -1,228 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2009 The RetroShare Team, Oleksiy Bilyanskyy - * - * 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 "AddFileAssotiationDialog.h" - -//#include "rshare.h" // for Rshare::dataDirectory() method -//#include "rsharesettings.h" -#include //for win registry access -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include -#include - -//============================================================================ - -AddFileAssotiationDialog::AddFileAssotiationDialog(bool onlyEdit, - QWidget* parent) - :QDialog(parent) -{ - fileTypeLabel = new QLabel(); - fileTypeLabel->setText(tr("File type(extension):")); - - - fileTypeEdit = new QLineEdit(); - fileTypeEdit->setEnabled( !onlyEdit ); - fileTypeEdit->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - fileTypeEdit->setFixedWidth(50); - connect(fileTypeEdit, SIGNAL( textEdited( const QString& )), - this , SLOT( fileTypeEdited(const QString & )) ) ; - - loadSystemDefault = new QPushButton(); - loadSystemDefault->setText(tr("Use default command")); - loadSystemDefault->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - loadSystemDefault->setEnabled( fileTypeEdit && - (!(fileTypeEdit->text().isEmpty())) ) ; - connect(loadSystemDefault, SIGNAL(clicked()), - this, SLOT(loadSystemDefaultCommand())); - loadSystemDefault->setVisible(false); //the button sholud remain unvisivle, - //until it will work properly - - commandLabel = new QLabel(); - commandLabel->setText(tr("Command")); - - commandEdit = new QLineEdit; - - selectExecutable = new QPushButton(); - selectExecutable->setText("..."); - selectExecutable->setFixedWidth(30); - - QHBoxLayout* ftlay = new QHBoxLayout(); - ftlay->addWidget( fileTypeLabel ); - ftlay->addWidget( fileTypeEdit ); - - buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok - | QDialogButtonBox::Cancel ); - connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); - - QGridLayout* mainLay = new QGridLayout(); - mainLay->addWidget(fileTypeLabel,0,0,1,1, Qt::AlignLeft); - mainLay->addWidget(fileTypeEdit,0,1,1,1, Qt::AlignLeft); - mainLay->addWidget(loadSystemDefault, 0,2,1,2,Qt::AlignRight); - mainLay->addWidget( commandLabel, 1,0,1,1, Qt::AlignLeft); - mainLay->addWidget( commandEdit, 1,1,1,2); - mainLay->addWidget( selectExecutable, 1,3,1,1); - mainLay->addWidget( buttonBox, 2,1,1,4, Qt::AlignLeft); - - mainLay->setColumnStretch(2,1); - mainLay->setRowStretch(2,1); - - this->setLayout( mainLay ); - - //TODO: in the next line we have to count a real height of the dialog; - // It's not good to use a hardcoded const value; - this->resize(600,200);//this->height()); - -} - -//============================================================================ - -void -AddFileAssotiationDialog::fileTypeEdited(const QString & text ) -{ - loadSystemDefault->setEnabled( !( text.isEmpty() ) ); -} - -//============================================================================ - -void -AddFileAssotiationDialog::setFileType(QString ft) -{ - fileTypeEdit->setText(ft); -} - -//============================================================================ - -void -AddFileAssotiationDialog::loadSystemDefaultCommand() -{ - qDebug() << " lsdc is here"; - - QString fileExt = cleanFileType(fileTypeEdit->text()) ; - //fileExt.prepend('/'); - fileExt.append("/."); - qDebug() << " fileExt is " << fileExt; - QSettings reg("HKEY_CLASSES_ROOT", QSettings::NativeFormat); - - if (reg.contains(fileExt)) - { - QString appKey = reg.value(fileExt).toString(); - qDebug() << " got app key " << appKey; - appKey.append("/shell/open/command/."); - QString command = reg.value(appKey, "-").toString(); - if (command!="-") - { - qDebug() << " got command :" << command ; - commandEdit->setText( command ); - return; - } - } - - QMessageBox::warning(this, tr("RetroShare"), - tr("Sorry, can't determine system " - "default command for this file\n"), - QMessageBox::Ok); - - -} - -//============================================================================ - -QString -AddFileAssotiationDialog::cleanFileType(QString ft) -{ - QString result = ft; - - //-- first remove possible filder names from received filename. (like - // "like "/moviedir/file.avi", we will leave only "file.avi" - int ti; - // dirs may be separated with "/" - ti = result.lastIndexOf('/'); - if (ti > -1) - { - result.remove(0,ti+1); - } - - // or "\" - ti = result.lastIndexOf('\\'); - if (ti > -1) - { - result.remove(0,ti+1); - } - - //-- then, if it is filename (like "file.avi"), we'll have to remove - //-- the name (ans leave just ".avi") - ti = result.lastIndexOf('.'); - if (ti > -1) - { - result.remove(0,ti); - return result; - } - - //-- also, if filename still is not prepended with dot, do it - if ((!result.isEmpty()) && (result.at(0)!='.')) - result.prepend('.'); - - //-- that's all - return result; -} - -//============================================================================ - -QString -AddFileAssotiationDialog::resultCommand() -{ - return commandEdit->text(); -} - -//============================================================================ - -QString -AddFileAssotiationDialog::resultFileType() -{ - return cleanFileType( fileTypeEdit->text() ) ; -} - -//============================================================================ - -void -AddFileAssotiationDialog::setCommand(QString cmd) -{ - commandEdit->setText( cmd ); -} - -//============================================================================ - -//============================================================================ - - diff --git a/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.h b/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.h deleted file mode 100644 index f0feeb36e..000000000 --- a/retroshare-gui/src/gui/Preferences/AddFileAssotiationDialog.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2009 The RetroShare Team, Oleksiy Bilyanskyy - * - * 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 __AddFileAssotiationDialog__ -#define __AddFileAssotiationDialog__ - - -#include -#include - -class QPushButton; -class QDialogButtonBox; - -class QLabel; -class QLineEdit; - -//============================================================================= -//! A dialog for specifying file type and associated command -class AddFileAssotiationDialog: public QDialog -{ - Q_OBJECT -public: - //! constructor - - //! if (onlyEdit == true), user woll not be able to change file type, - //! only command (used for editing existing commands) - AddFileAssotiationDialog( bool onlyEdit = false, QWidget *parent = 0 ) ; - virtual ~AddFileAssotiationDialog(){}; - void setFileType(QString ft); - void setCommand(QString cmd); - - //! Gets file type (file extension) from given filename (or other string) - - //! "file type" has to be like '.png'(some symbols, prepended by a dot) - static QString cleanFileType(QString ft); - - QString resultCommand(); - QString resultFileType(); - -protected: - //QTabWidget *tabWidget; - QLabel* fileTypeLabel; - QLineEdit* fileTypeEdit; - QPushButton* loadSystemDefault; - QPushButton* selectExecutable; - QLabel* commandLabel; - QLineEdit* commandEdit; - QDialogButtonBox *buttonBox; - -protected slots: - void fileTypeEdited(const QString & text ); - - //! On win32, loads default command from system registry. - - //! Unfinished. Is not used in current version. - void loadSystemDefaultCommand(); - - -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/AppearanceDialog.cpp b/retroshare-gui/src/gui/Preferences/AppearanceDialog.cpp deleted file mode 100644 index e9b5a42ae..000000000 --- a/retroshare-gui/src/gui/Preferences/AppearanceDialog.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************** - * RShare 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 -#include "AppearanceDialog.h" - - -/** Constructor */ -AppearanceDialog::AppearanceDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - connect(ui.styleSheetCombo, SIGNAL(clicked()), this, SLOT(loadStyleSheet())); - - /* Populate combo boxes */ - foreach (QString code, LanguageSupport::languageCodes()) { - ui.cmboLanguage->addItem(QIcon(":/images/flags/" + code + ".png"), - LanguageSupport::languageName(code), - code); - } - foreach (QString style, QStyleFactory::keys()) { - ui.cmboStyle->addItem(style, style.toLower()); - } - - ui.styleSheetCombo->setCurrentIndex(ui.styleSheetCombo->findText("Default")); - //loadStyleSheet("Default"); - loadqss(); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -/** Saves the changes on this page */ -bool -AppearanceDialog::save(QString &errmsg) -{ - Q_UNUSED(errmsg); - QString languageCode = - LanguageSupport::languageCode(ui.cmboLanguage->currentText()); - - _settings->setLanguageCode(languageCode); - _settings->setInterfaceStyle(ui.cmboStyle->currentText()); - _settings->setSheetName(ui.styleSheetCombo->currentText()); - - /* Set to new style */ - Rshare::setStyle(ui.cmboStyle->currentText()); - return true; -} - - - -/** Loads the settings for this page */ -void -AppearanceDialog::load() -{ - - int index = ui.cmboLanguage->findData(_settings->getLanguageCode()); - ui.cmboLanguage->setCurrentIndex(index); - - index = ui.cmboStyle->findData(Rshare::style().toLower()); - ui.cmboStyle->setCurrentIndex(index); - - ui.styleSheetCombo->setCurrentIndex(ui.styleSheetCombo->findText(_settings->getSheetName())); - - /** load saved internal styleSheet **/ - //QFile file(":/qss/" + (_settings->getSheetName().toLower()) + ".qss"); - - /** load saved extern Stylesheets **/ - QFile file(QApplication::applicationDirPath() + "/qss/" + (_settings->getSheetName().toLower()) + ".qss"); - - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - qApp->setStyleSheet(styleSheet); - -} - -void AppearanceDialog::on_styleSheetCombo_activated(const QString &sheetName) -{ - loadStyleSheet(sheetName); -} - -void AppearanceDialog::loadStyleSheet(const QString &sheetName) -{ - /** internal Stylesheets **/ - //QFile file(":/qss/" + sheetName.toLower() + ".qss"); - - /** extern Stylesheets **/ - QFile file(QApplication::applicationDirPath() + "/qss/" + sheetName.toLower() + ".qss"); - - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - - - qApp->setStyleSheet(styleSheet); - -} - -void AppearanceDialog::loadqss() -{ - - QFileInfoList slist = QDir(QApplication::applicationDirPath() + "/qss/").entryInfoList(); - foreach(QFileInfo st, slist) - { - if(st.fileName() != "." && st.fileName() != ".." && st.isFile()) - ui.styleSheetCombo->addItem(st.fileName().remove(".qss")); - } - -} \ No newline at end of file diff --git a/retroshare-gui/src/gui/Preferences/AppearanceDialog.h b/retroshare-gui/src/gui/Preferences/AppearanceDialog.h deleted file mode 100644 index 88655ae14..000000000 --- a/retroshare-gui/src/gui/Preferences/AppearanceDialog.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************** - * RShare 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 _LOGDIALOG_H -#define _LOGDIALOG_H - -#include -#include - -#include "rsharesettings.h" -#include - -#include "configpage.h" -#include "ui_AppearanceDialog.h" - -class AppearanceDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - AppearanceDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -private slots: - - void on_styleSheetCombo_activated(const QString &styleSheetName); - - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - void loadStyleSheet(const QString &sheetName); - void loadqss(); - - /** Qt Designer generated object */ - Ui::AppearanceDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/AppearanceDialog.ui b/retroshare-gui/src/gui/Preferences/AppearanceDialog.ui deleted file mode 100644 index 0116ca0f7..000000000 --- a/retroshare-gui/src/gui/Preferences/AppearanceDialog.ui +++ /dev/null @@ -1,786 +0,0 @@ - - AppearanceDialog - - - - 0 - 0 - 410 - 300 - - - - - - - - - 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 - - - 6 - - - 6 - - - 6 - - - 0 - - - 0 - - - - - - 0 - 75 - - - - Qt::NoContextMenu - - - Language - - - - - 10 - 44 - 341 - 26 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - Qt::Horizontal - - - - 300 - 16 - - - - - - - - - 150 - 0 - - - - Qt::NoContextMenu - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the language used in RetroShare</p></body></html> - - - false - - - - 24 - 16 - - - - - - - - - - 10 - 27 - 591 - 17 - - - - Qt::NoContextMenu - - - <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changes to language will only take effect after restarting RetroShare!</p></body></html> - - - - - - - - - 0 - 64 - - - - Qt::NoContextMenu - - - - - - Style - - - - - 10 - 24 - 341 - 26 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - - 150 - 0 - - - - Qt::NoContextMenu - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose RetroShare's interface style</p></body></html> - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 64 - - - - Style Sheet - - - - - 11 - 20 - 341 - 25 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - Qt::Horizontal - - - - 181 - 20 - - - - - - - - - 150 - 0 - - - - - - - - - - - - Qt::Vertical - - - - 361 - 61 - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.cpp b/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.cpp deleted file mode 100644 index 0a2aa9dbc..000000000 --- a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* 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 "ConfirmQuitDialog.h" - -ConfirmQuitDialog::ConfirmQuitDialog(QWidget * parent) : QDialog(parent) -{ - setupUi(this); -} diff --git a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.h b/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.h deleted file mode 100644 index 59504033f..000000000 --- a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* 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 _ConfirmQuitDialog_h -#define _ConfirmQuitDialog_h_ - -#include -#include "ui_ConfirmQuitDialog.h" - -class ConfirmQuitDialog : public QDialog, public Ui::ConfirmQuitDialog -{ - Q_OBJECT - public: - ConfirmQuitDialog(QWidget * parent = 0); - - private slots: - -}; - -#endif diff --git a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.ui b/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.ui deleted file mode 100644 index a0525c91b..000000000 --- a/retroshare-gui/src/gui/Preferences/ConfirmQuitDialog.ui +++ /dev/null @@ -1,237 +0,0 @@ - - ConfirmQuitDialog - - - - 0 - 0 - 500 - 160 - - - - - 1 - 1 - 0 - 0 - - - - - 500 - 160 - - - - Exit RetroShare - - - :/images/RetroShare16.png - - - true - - - - - 0 - 0 - 500 - 155 - - - - - 0 - - - 6 - - - - - 0 - - - 6 - - - - - 5 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 48 - 48 - - - - true - - - - - - :/images/informations_24x24.png - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::ApplicationModal - - - - 200 - 50 - - - - true - - - You are about to exit the RetroShare application and therefore stop all transfers. <br><br>Are you sure you want to stop and exit RetroShare? - - - Qt::AutoText - - - false - - - Qt::AlignJustify|Qt::AlignTop - - - true - - - 6 - - - - - - - - - 5 - - - 6 - - - - - - 0 - 0 - - - - Do not show this message again. - - - - - - - Qt::Horizontal - - - - 80 - 20 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::No|QDialogButtonBox::NoButton|QDialogButtonBox::Yes - - - - - - - - - - - - - - buttonBox - accepted() - ConfirmQuitDialog - accept() - - - 462 - 160 - - - 157 - 274 - - - - - buttonBox - rejected() - ConfirmQuitDialog - reject() - - - 462 - 160 - - - 286 - 274 - - - - - diff --git a/retroshare-gui/src/gui/Preferences/CryptographyDialog.cpp b/retroshare-gui/src/gui/Preferences/CryptographyDialog.cpp deleted file mode 100644 index bdd6109ed..000000000 --- a/retroshare-gui/src/gui/Preferences/CryptographyDialog.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006 - 2009 RetroShare Team - * - * 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 "rsiface/rspeers.h" //for rsPeers variable -#include "rsiface/rsiface.h" - -#include -#include - -#include -#include "CryptographyDialog.h" - -#include -#include -#include - -/** Constructor */ -CryptographyDialog::CryptographyDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - connect(ui.copykeyButton, SIGNAL(clicked()), this, SLOT(copyPublicKey())); - connect(ui.exportkeyButton, SIGNAL(clicked()), this, SLOT(exportPublicKey())); - - - loadPublicKey(); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -/** Saves the changes on this page */ -bool -CryptographyDialog::save(QString &errmsg) -{ - return true; -} - -/** Loads the settings for this page */ -void -CryptographyDialog::load() -{ - -} - -/** Loads ouer default Puplickey */ -void -CryptographyDialog::loadPublicKey() -{ - //std::cerr << "CryptoPage() getting Invite" << std::endl; - - std::string invite = rsPeers->GetRetroshareInvite(); - - RsPeerDetails ownDetail; - rsPeers->getPeerDetails(rsPeers->getOwnId(), ownDetail); - invite += LOCAL_IP; - invite += ownDetail.localAddr + ":"; - std::ostringstream out; - out << ownDetail.localPort; - invite += out.str() + ";"; - invite += "\n"; - invite += EXT_IP; - invite += ownDetail.extAddr + ":"; - std::ostringstream out2; - out2 << ownDetail.extPort; - invite += out2.str() + ";"; - - ui.certtextEdit->setText(QString::fromStdString(invite)); - ui.certtextEdit->setReadOnly(true); - ui.certtextEdit->setMinimumHeight(200); - - //std::cerr << "CryptoPage() getting Invite: " << invite << std::endl; - -} - -void -CryptographyDialog::copyPublicKey() -{ - QMessageBox::information(this, - tr("RetroShare"), - tr("Your Public Key is copied to Clipbard, paste and send it to your" - "friend via email or some other way")); - QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(ui.certtextEdit->toPlainText()); - -} - -void -CryptographyDialog::exportPublicKey() -{ - qDebug() << " exportPulicKey"; - - QString qdir = QFileDialog::getSaveFileName(this, - "Please choose a filename", - QDir::homePath(), - "RetroShare Certificate (*.pqi)"); - - if ( rsPeers->SaveCertificateToFile(rsPeers->getOwnId(), qdir.toStdString()) ) - { - QMessageBox::information(this, tr("RetroShare"), - tr("Certificate file successfully created"), - QMessageBox::Ok, QMessageBox::Ok); - } - else - { - QMessageBox::information(this, tr("RetroShare"), - tr("Sorry, certificate file creation failed"), - QMessageBox::Ok, QMessageBox::Ok); - } -} diff --git a/retroshare-gui/src/gui/Preferences/CryptographyDialog.h b/retroshare-gui/src/gui/Preferences/CryptographyDialog.h deleted file mode 100644 index 53b141adc..000000000 --- a/retroshare-gui/src/gui/Preferences/CryptographyDialog.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006 - 2009 RetroShare Team - * - * 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 _CRYPTOGRAPHYDIALOG_H -#define _CRYPTOGRAPHYDIALOG_H - -#include - -#include -#include "gui/connect/ConnectFriendWizard.h" - -#include "configpage.h" -#include "ui_CryptographyDialog.h" - - -class CryptographyDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - CryptographyDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -private slots: - - void loadPublicKey(); - - void copyPublicKey(); - - void exportPublicKey(); - - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::CryptographyDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/CryptographyDialog.ui b/retroshare-gui/src/gui/Preferences/CryptographyDialog.ui deleted file mode 100644 index f1ced29e3..000000000 --- a/retroshare-gui/src/gui/Preferences/CryptographyDialog.ui +++ /dev/null @@ -1,590 +0,0 @@ - - - CryptographyDialog - - - - 0 - 0 - 542 - 355 - - - - - 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 - - - - - - - - Public Key - - - - - - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Export my Key as file</p></body></html> - - - Export Key - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copy my Key to Clipboard</p></body></html> - - - Copy Key - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - - Qt::Vertical - - - - 58 - 298 - - - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.cpp b/retroshare-gui/src/gui/Preferences/DirectoriesDialog.cpp deleted file mode 100644 index b853aecd7..000000000 --- a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.cpp +++ /dev/null @@ -1,234 +0,0 @@ -/**************************************************************** - * RShare 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 -#include "rsiface/rsfiles.h" -#include "DirectoriesDialog.h" -#include "gui/ShareManager.h" - -#include - -/** Constructor */ -DirectoriesDialog::DirectoriesDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - -// connect(ui.addButton, SIGNAL(clicked( bool ) ), this , SLOT( addShareDirectory() ) ); -// connect(ui.removeButton, SIGNAL(clicked( bool ) ), this , SLOT( removeShareDirectory() ) ); - connect(ui.incomingButton, SIGNAL(clicked( bool ) ), this , SLOT( setIncomingDirectory() ) ); - connect(ui.partialButton, SIGNAL(clicked( bool ) ), this , SLOT( setPartialsDirectory() ) ); - connect(ui.checkBox, SIGNAL(stateChanged(int)), this, SLOT(shareDownloadDirectory(int))); - connect(ui.editButton, SIGNAL(clicked()), this, SLOT(editDirectories())); -#ifdef TO_REMOVE - ui.addButton->setToolTip(tr("Add a Share Directory")); - ui.removeButton->setToolTip(tr("Remove Shared Directory")); -#endif - ui.incomingButton->setToolTip(tr("Browse")); - ui.partialButton->setToolTip(tr("Browse")); - - if (rsFiles->getShareDownloadDirectory()) - { - ui.checkBox->setDown(true); /* signal not emitted */ - } - else - { - ui.checkBox->setDown(false); /* signal not emitted */ - } - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -void DirectoriesDialog::editDirectories() -{ - ShareManager::showYourself() ; -} - -/** Saves the changes on this page */ -bool DirectoriesDialog::save(QString &errmsg) -{ - /* this is usefull especially when shared incoming files is - * default option and when the user don't check/uncheck the - * checkBox, so no signal is emitted to update the shared list */ - if (ui.checkBox->isChecked()) - { - std::list::const_iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - - bool found = false ; - for(std::list::const_iterator it(dirs.begin());it!=dirs.end();++it) - if((*it).filename == rsFiles->getDownloadDirectory()) - { - found=true ; - break ; - } - if(!found) - rsFiles->shareDownloadDirectory(); - - rsFiles->setShareDownloadDirectory(true); - } - else - { - rsFiles->unshareDownloadDirectory(); - rsFiles->setShareDownloadDirectory(false); - } - - return true; -} - -/** Loads the settings for this page */ -void DirectoriesDialog::load() -{ - std::list::const_iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - - /* get a link to the table */ - QListWidget *listWidget = ui.dirList; - - /* remove old items ??? */ - listWidget->clear(); - - for(it = dirs.begin(); it != dirs.end(); it++) - { - /* (0) Dir Name */ - listWidget->addItem(QString::fromStdString((*it).filename)); - } - - ui.incomingDir->setText(QString::fromStdString(rsFiles->getDownloadDirectory())); - ui.partialsDir->setText(QString::fromStdString(rsFiles->getPartialsDirectory())); - - listWidget->update(); /* update display */ -} - -#ifdef TO_REMOVE -void DirectoriesDialog::addShareDirectory() -{ - - /* select a dir - */ - - int ind; - QString qdir = QFileDialog::getExistingDirectory(this, tr("Add Shared Directory"), "", - QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - ind=qdir.lastIndexOf("/"); - - /* add it to the server */ - std::string dir = qdir.toStdString(); - if (dir != "") - { - rsFiles->addSharedDirectory(dir); - load(); - } -} - -void DirectoriesDialog::removeShareDirectory() -{ - /* id current dir */ - /* ask for removal */ - QListWidget *listWidget = ui.dirList; - QListWidgetItem *qdir = listWidget -> currentItem(); - if (qdir) - { - rsFiles->removeSharedDirectory( qdir->text().toStdString()); - load(); - } -} -#endif - -void DirectoriesDialog::setIncomingDirectory() -{ - QString qdir = QFileDialog::getExistingDirectory(this, tr("Set Incoming Directory"), "", - QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - - std::string dir = qdir.toStdString(); - if (dir != "") - { - rsFiles->setDownloadDirectory(dir); - if (ui.checkBox->isChecked()) - { - std::list::const_iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - - bool found = false ; - for(std::list::const_iterator it(dirs.begin());it!=dirs.end();++it) - if((*it).filename == rsFiles->getDownloadDirectory()) - { - found=true ; - break ; - } - if(!found) - rsFiles->shareDownloadDirectory(); - } - } - load(); -} - -void DirectoriesDialog::setPartialsDirectory() -{ - QString qdir = QFileDialog::getExistingDirectory(this, tr("Set Partials Directory"), "", - QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - - std::string dir = qdir.toStdString(); - if (dir != "") - { - rsFiles->setPartialsDirectory(dir); - } - load(); -} - -void DirectoriesDialog::shareDownloadDirectory(int state) -{ - if (state == Qt::Checked) - { - std::list::const_iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - - bool found = false ; - for(std::list::const_iterator it(dirs.begin());it!=dirs.end();++it) - if((*it).filename == rsFiles->getDownloadDirectory()) - { - found=true ; - break ; - } - if(!found) - rsFiles->shareDownloadDirectory(); - - rsFiles->setShareDownloadDirectory(true); - } - else - { - rsFiles->unshareDownloadDirectory(); - rsFiles->setShareDownloadDirectory(false); - } - load(); -} diff --git a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.h b/retroshare-gui/src/gui/Preferences/DirectoriesDialog.h deleted file mode 100644 index 59eb0279a..000000000 --- a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************** - * RShare 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 _DIRECTORIESDIALOG_H -#define _DIRECTORIESDIALOG_H - -#include - -#include "rsharesettings.h" - -#include "configpage.h" -#include "ui_DirectoriesDialog.h" - -class DirectoriesDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - DirectoriesDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -private slots: -#ifdef TO_REMOVE - void addShareDirectory(); - void removeShareDirectory(); -#endif - void editDirectories() ; - void setIncomingDirectory(); - void setPartialsDirectory(); - void shareDownloadDirectory(int state); - - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::DirectoriesDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.ui b/retroshare-gui/src/gui/Preferences/DirectoriesDialog.ui deleted file mode 100644 index 9e5da6eeb..000000000 --- a/retroshare-gui/src/gui/Preferences/DirectoriesDialog.ui +++ /dev/null @@ -1,649 +0,0 @@ - - - DirectoriesDialog - - - - 0 - 0 - 483 - 337 - - - - - 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 - 10 - 50 - false - false - false - false - - - - true - - - Qt::NoContextMenu - - - - 6 - - - 0 - - - - - Incoming Directory - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - - - - - :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - - Partials Direcrtory - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - - - - - :/images/directoryselect_24x24_shadow.png:/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - - Shared Directories - - - - - - - - - - - Edit - - - - - - - true - - - Automatically share incoming directory (Recommanded) - - - true - - - - - - - - - - - - incomingDir - incomingButton - dirList - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.cpp b/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.cpp deleted file mode 100755 index 7f8779983..000000000 --- a/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.cpp +++ /dev/null @@ -1,379 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2009 The RetroShare Team, Oleksiy Bilyanskyy - * - * 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 "FileAssotiationsDialog.h" -#include "AddFileAssotiationDialog.h" -//#include "rshare.h" // for Rshare::dataDirectory() method -#include "rsharesettings.h" - -#include -#include - -#include -#include -#include -#include - -//#include -//#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#include -#include -//#include - -//============================================================================ - -FileAssotiationsDialog::FileAssotiationsDialog(QWidget* parent) - :ConfigPage(parent) -//:QFrame() -{ - QVBoxLayout* pageLay = new QVBoxLayout(this); - - toolBar = new QToolBar("actions", this); - newAction = new QAction(QIcon(":/images/add_24x24.png"), tr("&New"), this); - //newAction->setShortcut(tr("Ctrl+N")); - newAction->setStatusTip(tr("Add new assotiation")); - connect(newAction, SIGNAL(triggered()), this, SLOT(addnew())); - toolBar->addAction(newAction); - - editAction = new QAction(QIcon(":/images/kcmsystem24.png"), - tr("&Edit"), this); - editAction->setStatusTip(tr("Edit this assotiation")); - connect(editAction, SIGNAL(triggered()), this, SLOT(edit())); - toolBar->addAction(editAction); - - removeAction = new QAction(QIcon(":/images/edit_remove24.png"), - tr("&Remove"), this); - removeAction->setStatusTip(tr("Remove this assotiation")); - connect(removeAction, SIGNAL(triggered()), this, SLOT(remove())); - toolBar->addAction( removeAction ); - - pageLay->addWidget( toolBar ); - - table = new QTableWidget(5,2,this);//default 5 rows, 2 columns - table->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("File type") ) ); - - table->setHorizontalHeaderItem(1, new QTableWidgetItem("Command") ); - connect( table, SIGNAL( cellActivated(int, int)), - this, SLOT( tableCellActivated(int, int)) ); - connect( table, SIGNAL( cellClicked(int, int)), - this, SLOT( tableCellActivated(int, int)) ); - -// connect( table, SIGNAL( cellChanged(int, int)), -// this, SLOT( tableCellActivated(int, int)) ); -// -// connect( table, SIGNAL( cellDoubleClicked(int, int)), -// this, SLOT( tableCellActivated(int, int)) ); -// -// connect( table, SIGNAL( cellEntered(int, int)), -// this, SLOT( tableCellActivated(int, int)) ); -// -// connect( table, SIGNAL( cellPressed(int, int)), -// this, SLOT( tableCellActivated(int, int)) ); - - -// connect( table, SIGNAL( itemClicked(QTableWidgetItem*)), -// this, SLOT( tableItemActivated(QTableWidgetItem*)) ); - - pageLay->addWidget(table); - -// addNewAssotiationButton = new QPushButton; -// addNewAssotiationButton->setText(tr("Add..")); -// QHBoxLayout* anbLay = new QHBoxLayout; -// anbLay->addStretch(); -// anbLay->addWidget(addNewAssotiationButton); -// pageLay->addLayout(anbLay); -// connect( addNewAssotiationButton, SIGNAL( clicked() ), -// this, SLOT( testButtonClicked() ) ); - - settings = new RshareSettings(); - //new QSettings( qApp->applicationDirPath()+"/sett.ini", - // QSettings::IniFormat); - settings->beginGroup("FileAssotiations"); - - - -} - -//============================================================================ - -FileAssotiationsDialog::~FileAssotiationsDialog() -{ - delete settings ; -} - -//============================================================================ - -bool -FileAssotiationsDialog::save (QString &errmsg) -{ - //RshareSettings* settings = new RshareSettings(); - - -// settings->beginGroup("FileAssotiations"); -// settings->setValue(".s01", "s01 test"); -// settings->setValue(".s02", "s02 test"); -// settings->setValue(".s03", "s03 test"); -// settings->setValue(".s04", "s04 test"); -// QMap::const_iterator ati = ations.constBegin(); -// while (ati != ations.constEnd()) -// { -// settings->setValue( ati.key(), ati.value() ); -// qDebug() << " - " << ati.key() << ati.value() << "\n" ; -// ati++; -// } -// -// settings->endGroup(); - - settings->sync(); - -// delete settings; -/* */ - return true; -} - -//============================================================================ - -void -FileAssotiationsDialog::load() -{ - //RshareSettings* settings = new RshareSettings(); -// QSettings* settings = new QSettings( qApp->applicationDirPath()+"/sett.ini", -// QSettings::IniFormat); -// -// settings->beginGroup("FileAssotiations"); - QStringList keys = settings->allKeys(); - - table->setRowCount( keys.count() ); - - int rowi = 0; - QStringList::const_iterator ki; - for(ki=keys.constBegin(); ki!=keys.constEnd(); ki++) - { - QString val = (settings->value(*ki, "")).toString(); - - addNewItemToTable( rowi, 0, *ki ); - addNewItemToTable( rowi, 1, val ); - - rowi++; - } - - //delete settings; - if (keys.count()==0) - { - removeAction->setEnabled(false); - editAction->setEnabled(false); - } - - table->selectRow(0); -} - -//============================================================================ - -void -FileAssotiationsDialog::remove() -{ - int currentRow = table->currentRow() ; - QTableWidgetItem const * titem = table->item( currentRow,0); - QString key = (titem->data(QTableWidgetItem::Type)).toString(); - - settings->remove(key); - table->removeRow( currentRow ); - - if ( table->rowCount()==0 ) - { - removeAction->setEnabled(false); - editAction->setEnabled(false); - } -} - -//============================================================================ - -void -FileAssotiationsDialog::addnew() -{ - AddFileAssotiationDialog afad(false, this);//'add file assotiations' dialog - - int currentRow = table->currentRow() ; - QTableWidgetItem* titem; - - int ti = afad.exec(); - - if (ti==QDialog::Accepted) - { - QString currType = afad.resultFileType() ; - QString currCmd = afad.resultCommand() ; - - - if ( !settings->contains(currType) )//new item should be added only if - { // it wasn't entered before. - int nridx = table->rowCount();//new row index - table->setRowCount(nridx+1); - addNewItemToTable(nridx,0, currType) ; - addNewItemToTable(nridx,1, currCmd); - } - else - { - for(int rowi=0; rowirowCount(); rowi++) - { - titem = table->item( rowi, 0); - if (titem->data(QTableWidgetItem::Type).toString()==currType) - { - titem = table->item( rowi, 1); - titem->setData(QTableWidgetItem::Type, currCmd); - break; - } - } - } - - settings->setValue(currType, currCmd); - - removeAction->setEnabled(true); - editAction->setEnabled(true); - } -} - -//============================================================================ - -void -FileAssotiationsDialog::edit() -{ - AddFileAssotiationDialog afad(true, this);//'add file assotiations' dialog - - int currentRow = table->currentRow() ; - QTableWidgetItem* titem; - - titem = table->item( currentRow,0); - QString currType = (titem->data(QTableWidgetItem::Type)).toString(); - titem = table->item( currentRow,1); - QString currCmd = (titem->data(QTableWidgetItem::Type)).toString(); - afad.setCommand(currCmd); - afad.setFileType(currType); - - int ti = afad.exec(); - - if (ti==QDialog::Accepted) - { - currCmd = afad.resultCommand() ; - titem = table->item( currentRow,1); - - titem->setData(QTableWidgetItem::Type, currCmd); - - settings->setValue(currType, currCmd); - } -} - -//============================================================================ - -void -FileAssotiationsDialog::tableCellActivated ( int row, int column ) -{ - table->selectRow(row); -} - -//============================================================================ - -void -FileAssotiationsDialog::tableItemActivated ( QTableWidgetItem * item ) -{ - qDebug() << "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy\n"; - QMessageBox::information(this, - tr(" Friend Help"), - tr("You this")); - table->selectRow(table->row(item)); - -} - -//============================================================================ - -void -FileAssotiationsDialog::addNewItemToTable(int row, int column, - QString itemText) -{ - QTableWidgetItem* tmpitem ; - - tmpitem = new QTableWidgetItem(itemText) ; - tmpitem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - // | Qt::ItemIsUserCheckable); - table->setItem(row, column, tmpitem ); -} - -//============================================================================ - -void -FileAssotiationsDialog::testButtonClicked() -{ - AddFileAssotiationDialog afad(this);// = new AddFileAssotiationDialog(); - -// commented code below is a test for -// AddFileAssotiationDialog::loadSystemDefaultCommand(QString ft) method -// QString tmps; -// tmps = "/home/folder/file"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = "/home/folder/file.avi"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = "file.avi"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = ".file"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = "c:\\home\\folder\\file"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = "/home/folder/.file"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); -// tmps = "D:\\folder\\file.asd.avi"; -// qDebug() << " for " << tmps <<" is " << afad.cleanFileType(tmps); - - - - int ti = afad.exec(); - - if (ti==QDialog::Accepted) - { - qDebug() << " dialog was accepted"; - QProcess::execute(afad.resultCommand());//, - //QStringList("D:\\prog\\eclipse_workspace\\tapp-fa\\tt.txt") ); - qDebug() << " process finished?"; - } - else - if (ti == QDialog::Rejected) - qDebug() << " dialog rejected" ; - else - qDebug() << "dialog returned something else" ; - - -} - -//============================================================================ - - - diff --git a/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.h b/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.h deleted file mode 100755 index a28cc686e..000000000 --- a/retroshare-gui/src/gui/Preferences/FileAssotiationsDialog.h +++ /dev/null @@ -1,90 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2009 The RetroShare Team, Oleksiy Bilyanskyy - * - * 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 __FileAssotiationsDialog__ -#define __FileAssotiationsDialog__ - -#include "configpage.h" - -#include -//#include - -//#include -//#include - -class QToolBar; -class QAction; -class QTableWidget; -class QTableWidgetItem; -class QPushButton; -class QDialogButtonBox; - -class QLabel; -class QLineEdit; - -//class QSettings; -class RshareSettings; - -//============================================================================= -//! Dialog for setting file assotiations for RS - -//! With this config page user can specify, what programs should be executed -//! to open some types of files. Here 'type' means 'file extension'(and -//! 'file extension' means 'some symbols after last dot in filename'). -class FileAssotiationsDialog : public ConfigPage -{ - Q_OBJECT - -public: - FileAssotiationsDialog(QWidget* parent = 0); - virtual ~FileAssotiationsDialog(); - - void load(); - bool save (QString &errmsg); - -protected: - QToolBar* toolBar; - - QAction* newAction; - QAction* editAction; - QAction* removeAction; - - QTableWidget* table; - QPushButton* addNewAssotiationButton; - QString settingsFileName; - - RshareSettings* settings; -// QSettings* settings; - - void addNewItemToTable(int row, int column, QString itemText); - -protected slots: - void remove(); - void addnew(); - void edit(); - void tableCellActivated ( int row, int column ); - void tableItemActivated ( QTableWidgetItem * item ) ; - void testButtonClicked();//! slot for debuggin purposes, nnot really used -}; - - - -#endif diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp b/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp deleted file mode 100644 index 51031a8a1..000000000 --- a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * 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 "rshare.h" -#include "GeneralDialog.h" -#include -#include - -/** Constructor */ -GeneralDialog::GeneralDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - - /* Hide platform specific features */ -#ifndef Q_WS_WIN - ui.chkRunRetroshareAtSystemStartup->setVisible(false); - //ui.autologincheckBox->setEnabled(false) ; - //ui.autologincheckBox->setChecked(false) ; -#endif -} - -/** Destructor */ -GeneralDialog::~GeneralDialog() -{ - delete _settings; -} - -/** Saves the changes on this page */ -bool -GeneralDialog::save(QString &errmsg) -{ - _settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized()); - - _settings->setValue(QString::fromUtf8("doQuit"), quit()); - - _settings->setRunRetroshareOnBoot( - ui.chkRunRetroshareAtSystemStartup->isChecked()); - - return true; -} - -/** Loads the settings for this page */ -void -GeneralDialog::load() -{ - ui.chkRunRetroshareAtSystemStartup->setChecked( - _settings->runRetroshareOnBoot()); - - ui.checkStartMinimized->setChecked(_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()); - - ui.checkQuit->setChecked(_settings->value(QString::fromUtf8("doQuit"), false).toBool()); - -} - -bool GeneralDialog::quit() const { - if(ui.checkQuit->isChecked()) return true; - return ui.checkQuit->isChecked(); -} - -bool GeneralDialog::startMinimized() const { - if(ui.checkStartMinimized->isChecked()) return true; - return ui.checkStartMinimized->isChecked(); -} - -/** Called when the "show on startup" checkbox is toggled. */ -void -GeneralDialog::toggleShowOnStartup(bool checked) -{ - //RshareSettings _settings; - _settings->setShowMainWindowAtStart(checked); -} diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.h b/retroshare-gui/src/gui/Preferences/GeneralDialog.h deleted file mode 100644 index 3fb67c8a1..000000000 --- a/retroshare-gui/src/gui/Preferences/GeneralDialog.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * 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 _GENERALDIALOG_H -#define _GENERALDIALOG_H - -#include -#include -#include - -#include "rsharesettings.h" - -#include "configpage.h" -#include "ui_GeneralDialog.h" - - -class GeneralDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - GeneralDialog(QWidget *parent = 0); - /** Default Destructor */ - ~GeneralDialog(); - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - bool startMinimized() const; - bool quit() const; - - -private slots: - - /** Called when the "show on startup" checkbox is toggled. */ - void toggleShowOnStartup(bool checked); - -private: - /** A RetroShare Settings object used for saving/loading settings */ - RshareSettings *_settings; - - - - /** Qt Designer generated object */ - Ui::GeneralDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.ui b/retroshare-gui/src/gui/Preferences/GeneralDialog.ui deleted file mode 100644 index d297c797f..000000000 --- a/retroshare-gui/src/gui/Preferences/GeneralDialog.ui +++ /dev/null @@ -1,570 +0,0 @@ - - - GeneralDialog - - - - 0 - 0 - 413 - 267 - - - - - 0 - 64 - - - - - - - - - 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 - 10 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - - - - 0 - 80 - - - - Startup - - - - - - Start RetroShare when my system starts - - - - - - - Start minimized - - - true - - - - - - - - - - Misc - - - - - - Do not show the Quit RetroShare MessageBox - - - - - - - - - - Qt::Vertical - - - - 178 - 95 - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/LogDialog.cpp b/retroshare-gui/src/gui/Preferences/LogDialog.cpp deleted file mode 100644 index 1ab0801ee..000000000 --- a/retroshare-gui/src/gui/Preferences/LogDialog.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************** - * RShare 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 -#include "LogDialog.h" - - -/** Constructor */ -LogDialog::LogDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -/** Saves the changes on this page */ -bool -LogDialog::save(QString &errmsg) -{ - - return true; -} - - - -/** Loads the settings for this page */ -void -LogDialog::load() -{ - -} diff --git a/retroshare-gui/src/gui/Preferences/LogDialog.h b/retroshare-gui/src/gui/Preferences/LogDialog.h deleted file mode 100644 index 7aa0d893d..000000000 --- a/retroshare-gui/src/gui/Preferences/LogDialog.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************** - * RShare 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 _LOGDIALOG_H -#define _LOGDIALOG_H - -#include - -#include - -#include "configpage.h" -#include "ui_LogDialog.h" - -class LogDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - LogDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -private slots: - - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::LogDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/LogDialog.ui b/retroshare-gui/src/gui/Preferences/LogDialog.ui deleted file mode 100644 index 83771dd02..000000000 --- a/retroshare-gui/src/gui/Preferences/LogDialog.ui +++ /dev/null @@ -1,732 +0,0 @@ - - LogDialog - - - - 0 - 0 - 440 - 311 - - - - - - - - - 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 - - - - - 0 - 0 - 441 - 311 - - - - true - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> - -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:medium; font-weight:600; background-color:#aaaaaa;"><a name="ABOUT"></a><span style=" font-size:medium;"> </span><span style=" font-size:medium;">About RetroShare </span><span style=" font-size:medium;"> </span></p></td></tr></table> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#aaaaaa;">Quick Links: </p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#ABOUT"><span style=" text-decoration: underline; color:#0000ff;">About</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#START"><span style=" text-decoration: underline; color:#0000ff;">Getting Started</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">Gui Basics</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a></p></td></tr></table> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RetroShare is a private peer to peer communication platform created by Dr. Bob.This program enables you to securely share files and chat with your friends (and no-one else!).</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For more information, and the latest release go to http://www.lunamutt.com.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:medium; font-weight:600; background-color:#aaaaaa;"><a name="START"></a><span style=" font-size:medium;"> </span><span style=" font-size:medium;">Quick Start Guide to RetroShare </span><span style=" font-size:medium;"> </span></p></td></tr></table> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#aaaaaa;">Quick Links: </p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#ABOUT"><span style=" text-decoration: underline; color:#0000ff;">About</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#START"><span style=" text-decoration: underline; color:#0000ff;">Getting Started</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">Gui Basics</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a></p></td></tr></table> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If this is your first time using Retroshare, it is recommended that you readthis guide for instructions on how to get started. The first step is:<a href="#START-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">Connecting to Your Friends</span></a>. Once you have managed this you can <a href="#START-DOWNLOAD"><span style=" text-decoration: underline; color:#0000ff;">Download Files</span></a> and<a href="#START-SHARE"><span style=" text-decoration: underline; color:#0000ff;">Share with Others</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Some of the key concepts related to ensuring your sharing remains private aredescribed in the <a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">Frequently Asked Questions</span></a>. Some Key security questions are:<a href="#FAQ-WEBOFTRUST"><span style=" text-decoration: underline; color:#0000ff;">What is a Web of Trust?</span></a>, <a href="#FAQ-SIGN"><span style=" text-decoration: underline; color:#0000ff;">Should I Sign this Certificate?</span></a>, and finally<a href="#FAQ-TRUST"><span style=" text-decoration: underline; color:#0000ff;">What does "Trust" Mean?</span></a>.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It is also worthwhile reading the <a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">GUI Overview</span></a>which describes the featureson available through the User Interface.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="START-CONNECT"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">Connecting to your Friends </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There are four steps to connecting to a Friend:</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Get Friend's Certificate </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Load Certificate </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Sign Certificate </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Connect to Friend.</li></ul> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The instructions might initially appear long and daunting, however thesesteps are required to ensure that your sharing is private and secure.These steps are only required a couple of times, to add new friends, and become quite straight forward after the first time.</p> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600;"><span style=" font-size:small;"> (1) EXCHANGE CERTIFICATES </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Before you can connect, you need send your certificate to your friend, and get your friends certificate. Follow these steps to get your certificate:</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Go to the "Connect" Tab </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click on Your Certificate to Select it. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click on the "Export Friend" Button to bring up a file save dialog. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Select directory to save the certificate to. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Enter desired filename. (with a file type of .pqi), and Click OK. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Email this File to your Friend. (It is recommended you put the certificate in a zip file before sending, as some email programs don't transmit the file correctly). </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Ask your friend to do the same. </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Once you have received your friend's certificate, removed it from the zip file and saved it to disk, you can proceed to step (2).</li></ul> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Note: This exchange of certificates is only necessary to get you started.Once you are connected to some friends the exchange of certificates becomeautomated by the autoDiscovery system. See<a href="#GUI-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">GUI: Connecting</span></a> for more information.------------------------------------------------------------------------<br /><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600;"><span style=" font-size:small;"> (2) LOAD YOUR FRIEND'S CERTIFICATE </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Go to the "Connect" Tab </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click "Import Friend" </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Select your friends certificate file, then click "Okay". Their certificate should appear in the top window of the "Connect" Tab.</li></ul> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">------------------------------------------------------------------------<br /><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600;"><span style=" font-size:small;"> (3) SIGN CERTIFICATE </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Select their Certificate by clicking on their name. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click "Configure Friend" Button. This will bring up a configuration window. which allows you to look at the details of the certificate. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click the "Sign Certificate" button near the bottom of the "Certificate Configuration" Window. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Now close the window by clicking on the "Done" button. </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Your Friends certificate should now say "Trusted (S)", indicating it is ready for connections.</li></ul> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can only share with "Trusted" Peers. You must sign your Friend'scertificate to prove that you know the certificate belongs to your Friend. Do not sign any/all certificates - only the people youtrust. For more information see: <br /><a href="#FAQ-SIGN"><span style=" text-decoration: underline; color:#0000ff;">FAQ: Should I Sign this Certificate?</span></a>.<br /><a href="#FAQ-TRUST"><span style=" text-decoration: underline; color:#0000ff;">FAQ: What does "Trust" Mean?</span></a>.<br /><a href="#FAQ-WEBOFTRUST"><span style=" text-decoration: underline; color:#0000ff;">FAQ: What is a Web of Trust?</span></a>. <br />------------------------------------------------------------------------<br /><br /> <br /></p> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600;"><span style=" font-size:small;"> (4) AUTOCONNECT TO PEER </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Finally You need to activate the connection: </p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Click in the Box, next to your friends Name. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> A Tick should appear in the box, a connection will be started. </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> The "Offline" will change to "Online" when you have successfully connected.</li></ul> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remember: Your initial connection attempts will fail, until your friend has signed your certificate and ticked the Auto-Connect Box.This ensures that both peers trust each other, and stops random peopleaccessing your files.<br /><a href="#FAQ-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">FAQ: Why won't it Connect?</span></a>. <br />------------------------------------------------------------------------<br /><br /><br /></p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="START-DOWNLOAD"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">Downloading Files </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Once you have connected to friends, you can download their shared files.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can search for the files you want using either:</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(1) File Listing Tab: This gives you a directory view of the files being shared by your peers. Double clickon the directory name (not the arrow) to diplay its subdirectories and files.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">NOTE 1: This can take up to 5 seconds to fetch the information for your peer.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">NOTE 2: If the directory is empty, or the person is offline, then the request will silently fail.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(2) Search Tab: Retroshare also allows you to search your peers computers for filenames. Enter yourterm(s) in the search box at the top of the TAB and click the "Search" button. This willsearch all of the peers that you are currently connected to.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">NOTE 3: If any matching files are found they will be displayed within 5 - 10 seconds.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Once you have found the files you want, Select the file(s), and click "Download" to begin the download process.If you click over the "File Transfer" TAB, the status of the files will appear.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">NOTE 4: The files can take up to 10 seconds to appear in the transfer window.</p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="START-SHARING"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">Sharing Files </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can specify which files you want to share in the "Config" Tab.In the "Share Directories" section, click the "Add Directory" Button, and select the directory you want to share.The files and subdirectories will become available for you peers.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can remove a directory from the Shared Directories List by clicking onthe directory name in the list, and then clicking "Remove Directory".</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:medium; font-weight:600; background-color:#aaaaaa;"><a name="GUI"></a><span style=" font-size:medium;"> </span><span style=" font-size:medium;">Gui Overview (Tab Description) </span><span style=" font-size:medium;"> </span></p></td></tr></table> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#aaaaaa;">Quick Links: </p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#ABOUT"><span style=" text-decoration: underline; color:#0000ff;">About</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#START"><span style=" text-decoration: underline; color:#0000ff;">Getting Started</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">Gui Basics</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The GUI is divided up into several sections which can be accessed by clicking on the Tabs along the top of the main window. </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:1px;"> </p> -<ul style="-qt-list-indent: 1;"><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Connect: Manage Connections and Friends. (<a href="#START-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">getting started</span></a> and <a href="#GUI-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">more info</span></a>) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> File Listing: A directory view of available files. (<a href="#START-DOWNLOAD"><span style=" text-decoration: underline; color:#0000ff;">downloading</span></a>) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Search: Search for available files. (<a href="#START-DOWNLOAD"><span style=" text-decoration: underline; color:#0000ff;">downloading</span></a>) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Messages: For Sending/Recving Message. (Coming Soon) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Channels: A broadcast/subscription system. (Coming Soon) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> File Transfer: Listing of Current and completed Transfers. </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Config: Specify of share diectories and IP Addresses. (<a href="#GUI-CONFIG"><span style=" text-decoration: underline; color:#0000ff;">more info</span></a>) </li> -<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> About: Help and other Information. </li> -<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Chat: Accessed by the clicking on the "Chat" button.</li></ul> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="GUI-CONNECT"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">The Connect Tab </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The Connect TAB consists of two windows. The upper windowshows a list of your friends. This window indicates each friendscurrent trust level, as well as their connection state.The "Trust_Lvl" Column indicates if the certificate has beenAuthenticated using the web of trust. You can only connect to "Trusted" certificates. Tick the "Auto_Connect" box to connect to your trusted friends.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The lower window provides a list of the friends of your friends.This window shows the neighbour's name and how long ago they attempted to connect to you. This window is automatically populatedby the autoDiscovery system, and should be used to expand yourretroShare network. A word of warning: Do not automatically trust (or sign) anyonethat appears in this window. First verify by some other means (email/phone)that certificate belongs to the person you think it does.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use the "Neighbour List" window to expand your friend list. Select the desired entry in the lower window by clicking on it, then click the "Add to Friends" Button to move it to the upper window.Likewise the "Remove from Friends" button moved a person from the upper window to the lower window.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The "Configure Friend" Button opens a Certificate Configuration window.This window can be used to examine the certificate details, sign the certificate or manually change the peer's IP Address.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">See Also:<br /><a href="#START-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">Getting Started: Connecting to your friends</span></a>.<br /><a href="#FAQ-CONNECT"><span style=" text-decoration: underline; color:#0000ff;">FAQ: Why won't it Connect?</span></a>.<br /><a href="#FAQ-SIGN"><span style=" text-decoration: underline; color:#0000ff;">FAQ: Should I Sign this Certificate?</span></a>.<br /><a href="#FAQ-TRUST"><span style=" text-decoration: underline; color:#0000ff;">FAQ: What does "Trust" Mean?</span></a>.<br /><a href="#FAQ-WEBOFTRUST"><span style=" text-decoration: underline; color:#0000ff;">FAQ: What is a Web of Trust?</span></a>. <br /></p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="GUI-CONFIG"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">The Config Tab </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The Configuration Tab allows you to select the share directories, as well as the directory that downloaded files are saved to.<br />See <a href="#STARTUP-SHARING"><span style=" text-decoration: underline; color:#0000ff;">Sharing you Files</span></a> for details. </p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The Config Tab also allows you to control the IP Address and Portused by RetroShare. Under most cirumstances you do not need to changethese setting. If you are behind a firewall and can setup a forwarded port, the selected IP Address and Port should be specified here.</p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:medium; font-weight:600; background-color:#aaaaaa;"><a name="FAQ"></a><span style=" font-size:medium;"> </span><span style=" font-size:medium;">Frequently Asked Questions </span><span style=" font-size:medium;"> </span></p></td></tr></table> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#aaaaaa;">Quick Links: </p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#ABOUT"><span style=" text-decoration: underline; color:#0000ff;">About</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#START"><span style=" text-decoration: underline; color:#0000ff;">Getting Started</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">Gui Basics</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a></p></td></tr></table> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="FAQ-WEBOFTRUST"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">How does the security/privacy work? </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RetroShares uses a Web of Trust Authentication system to ensurethat your "friends" are your friends, and uses SSL to encryptthe communcications between peers. </p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="FAQ-WEBOFTRUST"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">What is a Web of Trust? </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A Web of Trust relies on a collection of peers to identify eachother. Look it up on the Web!</p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="FAQ-TRUST"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">What does "Trust" Mean in RetroShare?</span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Anyone can generate a certificate, with any name on it. So howdo you know that the certificate that claims to be from "Joe Bloggs"is really from your mate Joe. This is the "AuthenticationProblem". RetroShare uses a Web of Trust to Authenticate your peers.</p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><a name="FAQ-SIGN"></a><span style=" font-size:small;"> </span><span style=" font-size:small;">Should I Sign this Certificate? </span><span style=" font-size:small;"> </span></p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You should only sign a certificate if you are completely surethat it comes from the "right" person. If you sign a certificateyou are "Authenticating" the person to yourself and others.If you sign certificates that you haven't checked, then you aredestroying your own privacy and security.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">How do you verify a certificate? Use an alternative method ofcommunication to send the certificate: E.g. email or USB stick. This will improve you confidence that the certificate belongsto the correct person. </p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#cccccc"> -<p style=" margin-top:12px; margin-bottom:4px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small; font-weight:600; background-color:#cccccc;"><span style=" font-size:small;"> </span><a name="FAQ-CONNECT"></a><span style=" font-size:small;">W</span><span style=" font-size:small;">hy won't it Connect?</span><span style=" font-size:small;"> </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></td></tr></table> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A connection can fail for a number of reasons:</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(1) Failed Authentication. Have both peers signed each otherscertificates? </p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(2) Firewalls. If both peers are behind firewalls then they cannotconnect directly. RetroShare has a built in proxy system to circumventfirewalls - However this can only function if both peers can connect to a common third party that is not behind a firewall. Thisis the most likely reason for initial connections to fail. The only solution to find a common friend that isn't firewalled (know anyone with Broadband?)</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(3) IP Addresses are wrong. You can manually examine and change these using the Certificate configuration.</p> -<table border="0" width="100%" cellspacing="2" cellpadding="2"> -<tr> -<td bgcolor="#aaaaaa"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#aaaaaa;">Quick Links: </p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#ABOUT"><span style=" text-decoration: underline; color:#0000ff;">About</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#START"><span style=" text-decoration: underline; color:#0000ff;">Getting Started</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#GUI"><span style=" text-decoration: underline; color:#0000ff;">Gui Basics</span></a></p></td> -<td bgcolor="#cccccc"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#cccccc;"><a href="#FAQ"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a></p></td></tr></table> -</body></html> - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp b/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp deleted file mode 100644 index 71b89585c..000000000 --- a/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/**************************************************************** - * RShare 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 -#include "NotifyDialog.h" -#include -#include - -#include "rsiface/rsnotify.h" - -#include - - - -/** Constructor */ -NotifyDialog::NotifyDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - - //QTimer *timer = new QTimer(this); - //timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); - //timer->start(1000); - - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -/** Saves the changes on this page */ -bool -NotifyDialog::save(QString &errmsg) -{ - /* extract from rsNotify the flags */ - - uint notifyflags = 0; - uint newsflags = 0; - uint chatflags = 0; - - if (ui.popup_Connect->isChecked()) - notifyflags |= RS_POPUP_CONNECT; - - if (ui.popup_NewMsg->isChecked()) - notifyflags |= RS_POPUP_MSG; - -// if (ui.popup_NewChat->isChecked()) - notifyflags |= RS_POPUP_CHAT; - - //if (ui.popup_Call->isChecked()) - // notifyflags |= RS_POPUP_CALL; - - - if (ui.notify_Peers->isChecked()) - newsflags |= RS_FEED_TYPE_PEER; - if (ui.notify_Channels->isChecked()) - newsflags |= RS_FEED_TYPE_CHAN; - if (ui.notify_Forums->isChecked()) - newsflags |= RS_FEED_TYPE_FORUM; - if (ui.notify_Blogs->isChecked()) - newsflags |= RS_FEED_TYPE_BLOG; - if (ui.notify_Chat->isChecked()) - newsflags |= RS_FEED_TYPE_CHAT; - if (ui.notify_Messages->isChecked()) - newsflags |= RS_FEED_TYPE_MSG; - if (ui.notify_Downloads->isChecked()) - newsflags |= RS_FEED_TYPE_FILES; - - if (ui.chat_NewWindow->isChecked()) - chatflags |= RS_CHAT_OPEN_NEW; - if (ui.chat_Reopen->isChecked()) - chatflags |= RS_CHAT_REOPEN; - if (ui.chat_Focus->isChecked()) - chatflags |= RS_CHAT_FOCUS; - - _settings->setNotifyFlags(notifyflags); - _settings->setNewsFeedFlags(newsflags); - _settings->setChatFlags(chatflags); - - load(); - return true; -} - - -/** Loads the settings for this page */ -void NotifyDialog::load() -{ - /* extract from rsNotify the flags */ - - uint notifyflags = _settings->getNotifyFlags(); - uint newsflags = _settings->getNewsFeedFlags(); - uint chatflags = _settings->getChatFlags(); - - ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT); - ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG); - ui.systray_GroupChat->setChecked(true) ; -// ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT); - //ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL); - - ui.notify_Peers->setChecked(newsflags & RS_FEED_TYPE_PEER); - ui.notify_Channels->setChecked(newsflags & RS_FEED_TYPE_CHAN); - ui.notify_Forums->setChecked(newsflags & RS_FEED_TYPE_FORUM); - ui.notify_Blogs->setChecked(newsflags & RS_FEED_TYPE_BLOG); - ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT); - ui.notify_Messages->setChecked(newsflags & RS_FEED_TYPE_MSG); - ui.notify_Downloads->setChecked(newsflags & RS_FEED_TYPE_FILES); - - ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN_NEW); - ui.chat_Reopen->setChecked(chatflags & RS_CHAT_REOPEN); - ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS); - - - /* disable ones that don't work yet */ - ui.notify_Chat->setEnabled(false); - ui.notify_Blogs->setEnabled(false); - ui.notify_Downloads->setEnabled(false); - ui.systray_GroupChat->setEnabled(false); -// ui.popup_NewChat->setEnabled(false); -} - - -/** Loads the settings for this page */ -void NotifyDialog::updateStatus() -{ - -} - - - diff --git a/retroshare-gui/src/gui/Preferences/NotifyDialog.h b/retroshare-gui/src/gui/Preferences/NotifyDialog.h deleted file mode 100644 index 3019b12c7..000000000 --- a/retroshare-gui/src/gui/Preferences/NotifyDialog.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************** - * 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 _NOTIFYDIALOG_H -#define _NOTIFYDIALOG_H - -#include - -#include "rsharesettings.h" - -#include "configpage.h" -#include "ui_NotifyDialog.h" - -class NotifyDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - NotifyDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -public slots: - void updateStatus(); - -private slots: - -private: - - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::NotifyDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/NotifyDialog.ui b/retroshare-gui/src/gui/Preferences/NotifyDialog.ui deleted file mode 100644 index 0ff5e3b11..000000000 --- a/retroshare-gui/src/gui/Preferences/NotifyDialog.ui +++ /dev/null @@ -1,686 +0,0 @@ - - - NotifyDialog - - - - 0 - 0 - 388 - 425 - - - - - 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 - 10 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - - - - - - - News Feed - - - - 0 - - - 6 - - - - - Peers - - - - - - - Channels - - - - - - - Forums - - - - - - - Chat - - - - - - - Blogs - - - - - - - Messages - - - - - - - Downloads - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Toasters - - - - 9 - - - 9 - - - - - Peer Connect - - - - - - - New Message - - - - - - - - - - Private Chat - - - - - - Open Window for new Peer Chat - - - - - - - Reopen if closed by user: - - - - - - - Grab Focus when chat arrives - - - - - - - - - - Group chat - - - - - - Display systray message - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 130 - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp b/retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp deleted file mode 100644 index e37f6cee8..000000000 --- a/retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp +++ /dev/null @@ -1,265 +0,0 @@ -/**************************************************************** - * RShare 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 -#include -#include "PreferencesWindow.h" - -#include "rsiface/rsiface.h" - - -#define FONT QFont(tr("Arial"), 9) - -/* Images for toolbar icons */ -#define IMAGE_PREFERENCES ":/images/kcmsystem24.png" -#define IMAGE_SERVER ":/images/server_24x24.png" -#define IMAGE_DIRECTORIES ":/images/folder_doments.png" -#define IMAGE_CRYPTOGRAPHY ":/images/encrypted32.png" -#define IMAGE_LOG ":/images/log_24x24.png" -#define IMAGE_ABOUT ":/images/informations_24x24.png" -#define IMAGE_SAVE ":/images/media-floppy.png" -#define IMAGE_HELP ":/images/help24.png" -#define IMAGE_APPEARRANCE ":/images/looknfeel.png" -#define IMAGE_FILE_ASSOTIATIONS ":/images/filetype-association.png" -#define IMAGE_NOTIFY ":/images/status_unknown.png" -#define IMAGE_SOUND ":/images/sound.png" - - - -/** Constructor */ -PreferencesWindow::PreferencesWindow(QWidget *parent, Qt::WFlags flags) -: RWindow("PreferencesWindow", parent, flags) -{ - /* Invoke the Qt Designer generated QObject setup routine */ - ui.setupUi(this); - - /* Create the config pages and actions */ - QActionGroup *grp = new QActionGroup(this); - ui.stackPages->add(new GeneralDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_PREFERENCES), tr("General"), grp)); - - ui.stackPages->add(new ServerDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_SERVER), tr("Server"), grp)); - - ui.stackPages->add(new DirectoriesDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_DIRECTORIES), tr("Directories"), grp)); - - ui.stackPages->add(new AppearanceDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_APPEARRANCE), tr("Appearance"), grp)); - - ui.stackPages->add(new NotifyDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_NOTIFY), tr("Notify"), grp)); - - ui.stackPages->add(new CryptographyDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_CRYPTOGRAPHY), tr("Security"), grp)); - - ui.stackPages->add(new FileAssotiationsDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_FILE_ASSOTIATIONS), - tr("File Associations"), grp)); -#ifdef RS_RELEASE_VERSION -#else - ui.stackPages->add(new SoundDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_SOUND), tr("Sound"), grp)); -#endif - - - /*foreach (ConfigPage *page, ui.stackPages->pages()) { - connect(page, SIGNAL(helpRequested(QString)), - this, SLOT(help(QString))); - } */ - - /* Create the toolbar */ - ui.toolBar->addActions(grp->actions()); - ui.toolBar->addSeparator(); - connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *))); - - /* Create and bind the Help button */ - QAction *helpAct = new QAction(QIcon(IMAGE_HELP), tr("Help"), ui.toolBar); - addAction(helpAct, SLOT(showHelp())); - - /* Select the first action */ - grp->actions()[0]->setChecked(true); - - connect(ui.okButton, SIGNAL(clicked( bool )), this, SLOT( saveChanges()) ); - connect(ui.cancelprefButton, SIGNAL(clicked( bool )), this, SLOT( cancelpreferences()) ); - -#if defined(Q_WS_WIN) - helpAct->setShortcut(QString("F1")); -#else - helpAct->setShortcut(QString("Ctrl+?")); -#endif - -} - -/** Creates a new action associated with a config page. */ -QAction* -PreferencesWindow::createPageAction(QIcon img, QString text, QActionGroup *group) -{ - QAction *action = new QAction(img, text, group); - action->setCheckable(true); - action->setFont(FONT); - return action; -} - -/** Adds the given action to the toolbar and hooks its triggered() signal to - * the specified slot (if given). */ -void -PreferencesWindow::addAction(QAction *action, const char *slot) -{ - action->setFont(FONT); - ui.toolBar->addAction(action); - connect(action, SIGNAL(triggered()), this, slot); -} - -/** Overloads the default show so we can load settings */ -/*void -PreferencesWindow::show() -{*/ - /* Load saved settings */ - /*loadSettings(); - - if (!this->isVisible()) { - QMainWindow::show(); - } else { - QMainWindow::activateWindow(); - setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive); - QMainWindow::raise(); - } -}*/ - -/** Shows the Preferences dialog with focus set to the given page. */ -void -PreferencesWindow::showWindow(Page page) -{ - /* Load saved settings */ - loadSettings(); - /* Show the dialog. */ - RWindow::showWindow(); - /* Set the focus to the specified page. */ - ui.stackPages->setCurrentIndex((int)page); -} - - -/** Loads the saved PreferencesWindow settings. */ -void -PreferencesWindow::loadSettings() -{ - /* Call each config page's load() method to load its data */ - foreach (ConfigPage *page, ui.stackPages->pages()) { - page->load(); - } -} - - -/** Saves changes made to settings. */ -void -PreferencesWindow::saveChanges() -{ - QString errmsg; - - /* Call each config page's save() method to save its data */ - foreach (ConfigPage *page, ui.stackPages->pages()) { - if (!page->save(errmsg)) { - /* Display the offending page */ - ui.stackPages->setCurrentPage(page); - - /* Show the user what went wrong */ - QMessageBox::warning(this, - tr("Error Saving Configuration"), errmsg, - QMessageBox::Ok, QMessageBox::NoButton); - - /* Don't process the rest of the pages */ - return; - } - } - - /* call to RsIface save function.... */ - //rsicontrol -> ConfigSave(); - - QMainWindow::close(); -} - -/** Cancel and close the Preferences Window. */ -void -PreferencesWindow::cancelpreferences() -{ - - QMainWindow::close(); -} - -void -PreferencesWindow::closeEvent (QCloseEvent * event) -{ - hide(); - event->ignore(); -} - -/** Displays the help browser and displays the most recently viewed help - * topic. */ -void -PreferencesWindow::showHelp() -{ - showHelp(QString()); -} - - -/**< Shows the help browser and displays the given help topic. */ -void -PreferencesWindow::showHelp(const QString &topic) -{ - static HelpBrowser *helpBrowser = 0; - if (!helpBrowser) - helpBrowser = new HelpBrowser(this); - helpBrowser->showWindow(topic); -} - - -/** Shows help information for whichever settings page the user is currently - * viewing. */ -/*void -PreferencesWindow::help() -{ - Page currentPage = static_cast(ui.stackPages->currentIndex()); - - switch (currentPage) { - case General: - help("config.general"); break; - case Server: - help("config.server"); break; - case Directories: - help("config.directories"); break; - default: - help("config.general"); break; - } -}*/ - -/** Called when a ConfigPage in the dialog requests help on a specific - * topic. */ -/*void -PreferencesWindow::help(const QString &topic) -{ - emit helpRequested(topic); -}*/ - - - diff --git a/retroshare-gui/src/gui/Preferences/PreferencesWindow.h b/retroshare-gui/src/gui/Preferences/PreferencesWindow.h deleted file mode 100644 index c4b7befc4..000000000 --- a/retroshare-gui/src/gui/Preferences/PreferencesWindow.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************** - * RShare 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 _PreferencesWindow_H -#define _PreferencesWindow_H - -#include -#include - -#include "GeneralDialog.h" -#include "DirectoriesDialog.h" -#include "ServerDialog.h" -#include "CryptographyDialog.h" -#include "AppearanceDialog.h" -#include "NotifyDialog.h" -#include "FileAssotiationsDialog.h" -#include "SoundDialog.h" -#include "gui/help/browser/helpbrowser.h" -#include - - -#include "ui_PreferencesWindow.h" - -class PreferencesWindow : public RWindow -{ - Q_OBJECT - -public: - /** Preferences dialog pages. */ - enum Page { - General = 0, /** Preferences page. */ - Server, /** Server page. */ - Directories, /** Directories page. */ - Appearance, /** Appearance page. */ - Notify, /** Notify page. */ - Security, /** Security page. */ - FileAssotiations, /** File assotiations page. */ - Sound /** Sound page. */ - }; - - /** Default Constructor */ - PreferencesWindow(QWidget *parent = 0, Qt::WFlags flags = 0); - /** Default destructor */ - //~PreferencesWindow(); - -protected: - void closeEvent (QCloseEvent * event); - -public slots: - /** Called when this dialog is to be displayed */ - //void show(); - /** Shows the Preferences dialog with focus set to the given page. */ - void showWindow(Page page); - -private slots: - - /** Called when user clicks "Save Settings" */ - void saveChanges(); - /**void preferences();*/ - - void cancelpreferences(); - - /** Called when a ConfigPage in the dialog requests help on a specific - * topic. */ - //void help(const QString &topic); - /** Shows general help information for whichever settings page the user is - * currently viewing. */ - //void help(); - - /** Displays the help browser and displays the most recently viewed help - * topic. */ - void showHelp(); - /** Called when a child window requests the given help topic. */ - void showHelp(const QString &topic); - -private: - /** Loads the current configuration settings */ - void loadSettings(); - /** Creates a new action for a config page. */ - QAction* createPageAction(QIcon img, QString text, QActionGroup *group); - /** Adds a new action to the toolbar. */ - void addAction(QAction *action, const char *slot = 0); - - /** Qt Designer generated object */ - Ui::PreferencesWindow ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui b/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui deleted file mode 100644 index 5ba83719e..000000000 --- a/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui +++ /dev/null @@ -1,1093 +0,0 @@ - - - PreferencesWindow - - - - 0 - 0 - 578 - 354 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 120 - 120 - 120 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 139 - 139 - 139 - - - - - - - 120 - 120 - 120 - - - - - - - 255 - 255 - 255 - - - - - - - 120 - 120 - 120 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - Qt::NoContextMenu - - - Options - - - - :/images/rstray3.png:/images/rstray3.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - 6 - - - 3 - - - - - 3 - - - 3 - - - 6 - - - - - - 75 - 0 - - - - Cancel - - - - - - - - 75 - 0 - - - - OK - - - false - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 160 - 160 - 160 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - - 120 - 120 - 120 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 120 - 120 - 120 - - - - - - - 160 - 160 - 160 - - - - - - - 120 - 120 - 120 - - - - - - - 255 - 255 - 255 - - - - - - - 120 - 120 - 120 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - - Qt::NoContextMenu - - - - - - - Qt::Horizontal - - - - - - - - Qt::NoContextMenu - - - true - - - Qt::Horizontal - - - - 24 - 24 - - - - TopToolBarArea - - - false - - - - - - ConfigPageStack - QWidget -
gui/Preferences/configpagestack.h
- - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.cpp b/retroshare-gui/src/gui/Preferences/ServerDialog.cpp deleted file mode 100644 index f8c9f5186..000000000 --- a/retroshare-gui/src/gui/Preferences/ServerDialog.cpp +++ /dev/null @@ -1,374 +0,0 @@ -/**************************************************************** - * RShare 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 -#include "ServerDialog.h" -#include -#include -#include - -#include "rsiface/rsiface.h" -#include "rsiface/rspeers.h" - -#include - - - -/** Constructor */ -ServerDialog::ServerDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); - connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) ); - connect( ui._showTurtleDialogPB,SIGNAL(clicked()),this,SLOT( showTurtleRouterDialog() )) ; - - ui._enableTurtleCB->setChecked(true) ; - ui._enableTurtleCB->setEnabled(false) ; - - QTimer *timer = new QTimer(this); - timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); - timer->start(1000); - - load(); - updateStatus(); - - bool b = rsPeers->getAllowServerIPDetermination() ; - ui.allowIpDeterminationCB->setChecked(b) ; - ui.IPServersLV->setEnabled(b) ; - - std::list ip_servers ; - rsPeers->getIPServersList(ip_servers) ; - - for(std::list::const_iterator it(ip_servers.begin());it!=ip_servers.end();++it) - ui.IPServersLV->addItem(QString::fromStdString(*it)) ; - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -void ServerDialog::showTurtleRouterDialog() -{ - TurtleRouterDialog::showUp() ; -} - -void ServerDialog::toggleIpDetermination(bool b) -{ - rsPeers->allowServerIPDetermination(b) ; - ui.IPServersLV->setEnabled(b) ; -} - -/** Saves the changes on this page */ -bool -ServerDialog::save(QString &errmsg) -{ - -/* save the server address */ -/* save local address */ -/* save the url for DNS access */ - -/* restart server */ - -/* save all? */ - saveAddresses(); - return true; -} - - -/** Loads the settings for this page */ -void ServerDialog::load() -{ - - /* load up configuration from rsPeers */ - RsPeerDetails detail; - if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) - { - return; - } - - /* set net mode */ - int netIndex = 0; - switch(detail.tryNetMode) - { - case RS_NETMODE_EXT: - netIndex = 2; - break; - case RS_NETMODE_UDP: - netIndex = 1; - break; - default: - case RS_NETMODE_UPNP: - netIndex = 0; - break; - } - ui.netModeComboBox->setCurrentIndex(netIndex); - - /* set dht/disc */ - netIndex = 1; - if (detail.visState & RS_VS_DHT_ON) - { - netIndex = 0; - } - ui.dhtComboBox->setCurrentIndex(netIndex); - - netIndex = 1; - if (detail.visState & RS_VS_DISC_ON) - { - netIndex = 0; - } - ui.discComboBox->setCurrentIndex(netIndex); - - rsiface->lockData(); /* Lock Interface */ - - ui.totalDownloadRate->setValue(rsiface->getConfig().maxDownloadDataRate); - ui.totalUploadRate->setValue(rsiface->getConfig().maxUploadDataRate); - - rsiface->unlockData(); /* UnLock Interface */ - - - toggleUPnP(); - - - /* Addresses must be set here - otherwise can't edit it */ - /* set local address */ - ui.localAddress->setText(QString::fromStdString(detail.localAddr)); - ui.localPort -> setValue(detail.localPort); - /* set the server address */ - ui.extAddress->setText(QString::fromStdString(detail.extAddr)); - ui.extPort -> setValue(detail.extPort); -} - -/** Loads the settings for this page */ -void ServerDialog::updateStatus() -{ - - /* load up configuration from rsPeers */ - RsPeerDetails detail; - if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) - { - return; - } - - /* only update if can't edit */ - if (!ui.localPort->isEnabled()) - { - /* set local address */ - ui.localPort -> setValue(detail.localPort); - ui.extPort -> setValue(detail.extPort); - } - - /* set local address */ - ui.localAddress->setText(QString::fromStdString(detail.localAddr)); - /* set the server address */ - ui.extAddress->setText(QString::fromStdString(detail.extAddr)); - -#if 0 - /* set status */ - std::ostringstream out; - out << "Attempted Network Mode: "; - switch(detail.tryNetMode) - { - case RS_NETMODE_EXT: - out << "External Forwarded Port (UltraPEER Mode)"; - break; - case RS_NETMODE_UDP: - out << "Firewalled"; - break; - default: - case RS_NETMODE_UPNP: - - out << "Automatic: UPnP Forwarded Port"; - break; - } - out << std::endl; - out << "Actual Network Mode: "; - switch(detail.netMode) - { - case RS_NETMODE_EXT: - out << "External Forwarded Port (UltraPEER Mode)"; - break; - case RS_NETMODE_UDP: - out << "Firewalled"; - break; - case RS_NETMODE_UPNP: - out << "Automatic: UPnP Forwarded Port"; - break; - default: - case RS_NETMODE_UNREACHABLE: - out << "Unreachable: Firewalled by Symmetric NAT"; - break; - } - out << std::endl; - out << "\tLocal Address: " << detail.localAddr; - out << ":" << detail.localPort; - out << std::endl; - out << "\tExternal Address: " << detail.extAddr; - out << ":" << detail.extPort; - out << std::endl; - - out << "UPnP Status: "; - out << std::endl; - - out << "DHT Status: "; - if (detail.visState & RS_VS_DHT_ON) - out << " Enabled"; - else - out << " Disabled"; - out << std::endl; - - out << "Discovery Status: "; - if (detail.visState & RS_VS_DISC_ON) - out << " Enabled"; - else - out << " Disabled"; - out << std::endl; - - - if (detail.netMode == RS_NETMODE_UNREACHABLE) - { - ui.netStatusBox->setTextColor( Qt::red ); - } - else - { - ui.netStatusBox->setTextColor( Qt::black ); - } - - ui.netStatusBox->setText(QString::fromStdString(out.str())); - ui.netStatusBox ->setReadOnly(true); -#endif - - - - -} - - -void ServerDialog::toggleUPnP() -{ - /* switch on the radioButton */ - bool settingChangeable = false; - if (0 != ui.netModeComboBox->currentIndex()) - { - settingChangeable = true; - } - - if (settingChangeable) - { - ui.dhtComboBox->setEnabled(true); - // disabled until we've got it all working. - //ui.discComboBox->setEnabled(true); - ui.discComboBox->setEnabled(false); - - ui.localAddress->setReadOnly (true); - ui.localPort -> setEnabled (true); - ui.extAddress -> setReadOnly (true); - ui.extPort -> setEnabled (true); - } - else - { - ui.dhtComboBox->setEnabled(false); - ui.discComboBox->setEnabled(false); - - ui.localAddress->setEnabled(false); - ui.localPort -> setEnabled(false); - ui.extAddress -> setEnabled(false); - ui.extPort -> setEnabled(false); - } -} - -void ServerDialog::saveAddresses() -{ - QString str; - - bool saveAddr = false; - - - RsPeerDetails detail; - std::string ownId = rsPeers->getOwnId(); - - if (!rsPeers->getPeerDetails(ownId, detail)) - { - return; - } - - int netIndex = ui.netModeComboBox->currentIndex(); - - /* Check if netMode has changed */ - int netMode = 0; - switch(netIndex) - { - case 2: - netMode = RS_NETMODE_EXT; - break; - case 1: - netMode = RS_NETMODE_UDP; - break; - default: - case 0: - netMode = RS_NETMODE_UPNP; - break; - } - - if (detail.tryNetMode != netMode) - { - rsPeers->setNetworkMode(ownId, netMode); - } - - int visState = 0; - /* Check if vis has changed */ - if (0 == ui.discComboBox->currentIndex()) - { - visState |= RS_VS_DISC_ON; - } - - if (0 == ui.dhtComboBox->currentIndex()) - { - visState |= RS_VS_DHT_ON; - } - - if (visState != detail.visState) - { - rsPeers->setVisState(ownId, visState); - } - - if (0 != netIndex) - { - saveAddr = true; - } - - if (saveAddr) - { - rsPeers->setLocalAddress(rsPeers->getOwnId(), ui.localAddress->text().toStdString(), ui.localPort->value()); - rsPeers->setExtAddress(rsPeers->getOwnId(), ui.extAddress->text().toStdString(), ui.extPort->value()); - } - - rsicontrol->ConfigSetDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); - load(); -} - diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.h b/retroshare-gui/src/gui/Preferences/ServerDialog.h deleted file mode 100644 index 84e2e3d7a..000000000 --- a/retroshare-gui/src/gui/Preferences/ServerDialog.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************** - * 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 _SERVERDIALOG_H -#define _SERVERDIALOG_H - -#include - -#include "rsharesettings.h" - -#include "configpage.h" -#include "ui_ServerDialog.h" - -class ServerDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - ServerDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -public slots: - void updateStatus(); - -private slots: - void saveAddresses(); - void toggleUPnP(); - void toggleIpDetermination(bool) ; - void showTurtleRouterDialog(); - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::ServerDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.ui b/retroshare-gui/src/gui/Preferences/ServerDialog.ui deleted file mode 100644 index 72ca471f0..000000000 --- a/retroshare-gui/src/gui/Preferences/ServerDialog.ui +++ /dev/null @@ -1,864 +0,0 @@ - - - ServerDialog - - - - 0 - 0 - 467 - 448 - - - - - 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 - - - - - - - - Qt::NoContextMenu - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - Network Configuration (takes effect after restart) - - - - - - - - - Automatic - - - - - Firewalled - - - - - Forwarded Port - - - - - - - - - - - DHT Enabled - - - - - DHT Disabled - - - - - - - - - Discovery Enabled - - - - - Discovery Disabled - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - - - - Network Configuration - - - - - - - 0 - 0 - - - - Network Configuration - - - - - - - - - - Local Address - - - - - - - External Address - - - - - - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - - - - - - - - - IP Service - - - - - - IP check service - - - - - - If you unckeck this, RetroShare can only determine your IP -when you connect to somebody. Leaving this checked helps -connecting when you have few friends. It also helps if you're -behind a firewall or a VPN. - - - Allow RetroShare to ask my ip to these websites: - - - true - - - - - - - QAbstractItemView::NoEditTriggers - - - - - - - - - - - F2F routing - - - - - - - - enable anonymous F2F routing - - - true - - - - - - - Show router statistics - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-size:8pt;"> is capable of transfering data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">If want to you use </span><span style=" font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-size:8pt;"> to anonymously share and download files, leaving this checked drastically increases your download scope, and participate into the overall network bandwidth. </span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You can separately setup share flags for each shared directory:</span></p> -<ul style="-qt-list-indent: 1;"><li style=" font-size:8pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Browsable by friends</span>: files are browsable from your direct friends.</li> -<li style=" font-size:8pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Anonymously shared</span>: files can be downloaded by anybody through anonymous tunnels.</li></ul></body></html> - - - - - - - - - - - - 0 - 0 - - - - Transfer Rates - - - - - - 6 - - - 0 - - - - - Download (KB/s) - - - - - - - 1 - - - 12500 - - - 1 - - - - - - - - - 6 - - - - - Upload (KB/s) - - - - - - - 1 - - - 12500 - - - 1 - - - - - - - - - - - - localAddress - localPort - extPort - totalDownloadRate - - - - diff --git a/retroshare-gui/src/gui/Preferences/SoundDialog.cpp b/retroshare-gui/src/gui/Preferences/SoundDialog.cpp deleted file mode 100644 index 16948f541..000000000 --- a/retroshare-gui/src/gui/Preferences/SoundDialog.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006 - 2009 RetroShare Team - * - * 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 "SoundDialog.h" - - -/** Constructor */ -SoundDialog::SoundDialog(QWidget *parent) -: ConfigPage(parent) -{ - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - connect(ui.cmd_openFile, SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile())); - connect(ui.cmd_openFile_2,SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile2())); - connect(ui.cmd_openFile_3,SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile3())); - connect(ui.cmd_openFile_4,SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile4())); - connect(ui.cmd_openFile_5,SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile5())); - connect(ui.cmd_openFile_6,SIGNAL(clicked(bool) ),this,SLOT(on_cmd_openFile6())); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif -} - -/** Saves the changes on this page */ -bool -SoundDialog::save(QString &errmsg) -{ - _settings->beginGroup("Sound"); - _settings->beginGroup("Enable"); - _settings->setValue("User_go_Online",ui.checkBoxSound->isChecked()); - _settings->setValue("User_go_Offline",ui.checkBoxSound_2->isChecked()); - _settings->setValue("FileSend_Finished",ui.checkBoxSound_3->isChecked()); - _settings->setValue("FileRecive_Incoming",ui.checkBoxSound_4->isChecked()); - _settings->setValue("FileRecive_Finished",ui.checkBoxSound_5->isChecked()); - _settings->setValue("NewChatMessage",ui.checkBoxSound_6->isChecked()); - _settings->endGroup(); - _settings->beginGroup("SoundFilePath"); - _settings->setValue("User_go_Online",ui.txt_SoundFile->text()); - _settings->setValue("User_go_Offline",ui.txt_SoundFile2->text()); - _settings->setValue("FileSend_Finished",ui.txt_SoundFile3->text()); - _settings->setValue("FileRecive_Incoming",ui.txt_SoundFile4->text()); - _settings->setValue("FileRecive_Finished",ui.txt_SoundFile5->text()); - _settings->setValue("NewChatMessage",ui.txt_SoundFile6->text()); - _settings->endGroup(); - _settings->endGroup(); - - return true; -} - - - -/** Loads the settings for this page */ -void -SoundDialog::load() -{ - _settings->beginGroup("Sound"); - _settings->beginGroup("SoundFilePath"); - ui.txt_SoundFile->setText(_settings->value("User_go_Online","").toString()); - ui.txt_SoundFile2->setText(_settings->value("User_go_Offline","").toString()); - ui.txt_SoundFile3->setText(_settings->value("FileSend_Finished","").toString()); - ui.txt_SoundFile4->setText(_settings->value("FileRecive_Incoming","").toString()); - ui.txt_SoundFile5->setText(_settings->value("FileRecive_Finished","").toString()); - ui.txt_SoundFile6->setText(_settings->value("NewChatMessage","").toString()); - - if(!ui.txt_SoundFile->text().isEmpty())ui.checkBoxSound->setEnabled(true); - if(!ui.txt_SoundFile2->text().isEmpty())ui.checkBoxSound_2->setEnabled(true); - if(!ui.txt_SoundFile3->text().isEmpty())ui.checkBoxSound_3->setEnabled(true); - if(!ui.txt_SoundFile4->text().isEmpty())ui.checkBoxSound_4->setEnabled(true); - if(!ui.txt_SoundFile5->text().isEmpty())ui.checkBoxSound_5->setEnabled(true); - if(!ui.txt_SoundFile6->text().isEmpty())ui.checkBoxSound_6->setEnabled(true); - - _settings->endGroup(); - - _settings->beginGroup("Enable"); - ui.checkBoxSound->setChecked(_settings->value("User_go_Online",false).toBool()); - ui.checkBoxSound_2->setChecked(_settings->value("User_go_Offline",false).toBool()); - ui.checkBoxSound_3->setChecked(_settings->value("FileSend_Finished",false).toBool()); - ui.checkBoxSound_4->setChecked(_settings->value("FileRecive_Incoming",false).toBool()); - ui.checkBoxSound_5->setChecked(_settings->value("FileRecive_Finished",false).toBool()); - ui.checkBoxSound_6->setChecked(_settings->value("NewChatMessage",false).toBool()); - _settings->endGroup(); - _settings->endGroup(); -} - -void SoundDialog::on_cmd_openFile() -{ - - ui.txt_SoundFile->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile->text().isEmpty()){ - ui.checkBoxSound->setChecked(false); - ui.checkBoxSound->setEnabled(false); - } - else - ui.checkBoxSound->setEnabled(true); -} - -void SoundDialog::on_cmd_openFile2() -{ - ui.txt_SoundFile2->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile2->text().isEmpty()){ - ui.checkBoxSound_2->setChecked(false); - ui.checkBoxSound_2->setEnabled(false); - } - else - ui.checkBoxSound_2->setEnabled(true); - -} -void SoundDialog::on_cmd_openFile3() -{ - ui.txt_SoundFile3->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile3->text().isEmpty()){ - ui.checkBoxSound_3->setChecked(false); - ui.checkBoxSound_3->setEnabled(false); - } - else - ui.checkBoxSound_3->setEnabled(true); -} -void SoundDialog::on_cmd_openFile4() -{ - ui.txt_SoundFile4->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile4->text().isEmpty()){ - ui.checkBoxSound_4->setChecked(false); - ui.checkBoxSound_4->setEnabled(false); - } - else - ui.checkBoxSound_4->setEnabled(true); -} -void SoundDialog::on_cmd_openFile5() -{ - ui.txt_SoundFile5->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile5->text().isEmpty()){ - ui.checkBoxSound_5->setChecked(false); - ui.checkBoxSound_5->setEnabled(false); - } - else - ui.checkBoxSound_5->setEnabled(true); -} -void SoundDialog::on_cmd_openFile6() -{ - ui.txt_SoundFile6->setText(QFileDialog::getOpenFileName(this,"Open File", ".", "wav (*.wav)")); - if(ui.txt_SoundFile6->text().isEmpty()){ - ui.checkBoxSound_6->setChecked(false); - ui.checkBoxSound_6->setEnabled(false); - } - else - ui.checkBoxSound_6->setEnabled(true); - -} diff --git a/retroshare-gui/src/gui/Preferences/SoundDialog.h b/retroshare-gui/src/gui/Preferences/SoundDialog.h deleted file mode 100644 index 56a5be985..000000000 --- a/retroshare-gui/src/gui/Preferences/SoundDialog.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006 - 2009 RetroShare Team - * - * 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 _SOUNDDIALOG_H -#define _SOUNDDIALOG_H - -#include - -#include - -#include "configpage.h" -#include "ui_SoundDialog.h" - -class SoundDialog : public ConfigPage -{ - Q_OBJECT - -public: - /** Default Constructor */ - SoundDialog(QWidget *parent = 0); - /** Default Destructor */ - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - -private slots: - - void on_cmd_openFile(); - void on_cmd_openFile2(); - void on_cmd_openFile3(); - void on_cmd_openFile4(); - void on_cmd_openFile5(); - void on_cmd_openFile6(); - -private: - /** A RshareSettings object used for saving/loading settings */ - RshareSettings* _settings; - - /** Qt Designer generated object */ - Ui::SoundDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/SoundDialog.ui b/retroshare-gui/src/gui/Preferences/SoundDialog.ui deleted file mode 100644 index cdd29c7fe..000000000 --- a/retroshare-gui/src/gui/Preferences/SoundDialog.ui +++ /dev/null @@ -1,814 +0,0 @@ - - - SoundDialog - - - - 0 - 0 - 468 - 407 - - - - - - - - - 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 - - - - - - Sound Events - - - - - 10 - 20 - 421 - 81 - - - - User - - - - false - - - - 10 - 20 - 80 - 23 - - - - go Online - - - - - false - - - - 10 - 50 - 80 - 23 - - - - go Offline - - - - - false - - - - 90 - 20 - 281 - 24 - - - - - - false - - - - 90 - 50 - 281 - 24 - - - - - - - 380 - 20 - 31 - 21 - - - - ... - - - - - - 380 - 50 - 31 - 21 - - - - ... - - - - - - - 10 - 100 - 421 - 61 - - - - FileSend - - - - false - - - - 90 - 20 - 281 - 24 - - - - - - - 380 - 20 - 31 - 21 - - - - ... - - - - - false - - - - 10 - 20 - 80 - 23 - - - - Finished - - - - - - - 10 - 160 - 421 - 91 - - - - FileRecive - - - - false - - - - 10 - 20 - 80 - 23 - - - - Incoming - - - - - false - - - - 90 - 20 - 281 - 24 - - - - - - - 380 - 20 - 31 - 21 - - - - ... - - - - - - 380 - 50 - 31 - 21 - - - - ... - - - - - false - - - - 10 - 50 - 80 - 23 - - - - Finished - - - - - false - - - - 90 - 50 - 281 - 24 - - - - - - - - 10 - 260 - 421 - 111 - - - - Chatmessage - - - - - 380 - 20 - 31 - 21 - - - - ... - - - - - false - - - - 10 - 20 - 80 - 23 - - - - New - - - - - false - - - - 90 - 20 - 281 - 24 - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Preferences/configpage.h b/retroshare-gui/src/gui/Preferences/configpage.h deleted file mode 100644 index dd30fd068..000000000 --- a/retroshare-gui/src/gui/Preferences/configpage.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * 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 _CONFIGPAGE_H -#define _CONFIGPAGE_H - -#include - - -class ConfigPage : public QWidget -{ -public: - /** Default Constructor */ - ConfigPage(QWidget *parent = 0) : QWidget(parent) {} - - /** Pure virtual method. Subclassed pages load their config settings here. */ - virtual void load() = 0; - /** Pure virtual method. Subclassed pages save their config settings here - * and return true if everything was saved successfully. */ - virtual bool save(QString &errmsg) = 0; -}; - -#endif - diff --git a/retroshare-gui/src/gui/Preferences/configpagestack.cpp b/retroshare-gui/src/gui/Preferences/configpagestack.cpp deleted file mode 100644 index eb82be2be..000000000 --- a/retroshare-gui/src/gui/Preferences/configpagestack.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * 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 "configpagestack.h" - -/** Default constructor. */ -ConfigPageStack::ConfigPageStack(QWidget *parent) -: QStackedWidget(parent) -{ -} - -/** Adds a page to the stack. */ -void -ConfigPageStack::add(ConfigPage *page, QAction *action) -{ - _pages.insert(action, page); - insertWidget(count(), page); -} - -/** Sets the current config page and checks its action. */ -void -ConfigPageStack::setCurrentPage(ConfigPage *page) -{ - foreach (QAction *action, _pages.keys(page)) { - action->setChecked(true); - } - setCurrentWidget(page); -} - -/** Sets the current config page index and checks its action. */ -void -ConfigPageStack::setCurrentIndex(int index) -{ - setCurrentPage((ConfigPage *)widget(index)); -} - -/** Shows the config page associated with the activated action. */ -void -ConfigPageStack::showPage(QAction *pageAction) -{ - setCurrentWidget(_pages.value(pageAction)); -} - diff --git a/retroshare-gui/src/gui/Preferences/configpagestack.h b/retroshare-gui/src/gui/Preferences/configpagestack.h deleted file mode 100644 index 914d328f2..000000000 --- a/retroshare-gui/src/gui/Preferences/configpagestack.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * 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 _CONFIGPAGESTACK_H -#define _CONFIGPAGESTACK_H - -#include -#include - -#include "configpage.h" - - -class ConfigPageStack : public QStackedWidget -{ - Q_OBJECT - -public: - /** Constructor. */ - ConfigPageStack(QWidget *parent = 0); - - /** Adds a configuration page to the stack. */ - void add(ConfigPage *page, QAction *action); - /** Sets the current config page and checks its action. */ - void setCurrentPage(ConfigPage *page); - /** Sets the current config page index and checks its action. */ - void setCurrentIndex(int index); - - /** Returns a list of all pages in the stack. */ - QList pages() { return _pages.values(); } - -public slots: - /** Displays the page associated with the activated action. */ - void showPage(QAction *pageAction); - -private: - /** Maps an action to a config page. */ - QHash _pages; -}; - -#endif - diff --git a/retroshare-gui/src/gui/SearchDialog.h b/retroshare-gui/src/gui/SearchDialog.h index c4974ab51..3727140b1 100644 --- a/retroshare-gui/src/gui/SearchDialog.h +++ b/retroshare-gui/src/gui/SearchDialog.h @@ -33,7 +33,7 @@ #include "mainpage.h" #include "ui_SearchDialog.h" #include "advsearch/advancedsearchdialog.h" -#include "Preferences/rsharesettings.h" +#include "settings/rsharesettings.h" class SearchDialog : public MainPage { diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index 2acb57c6d..2de8f19d0 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -22,14 +22,14 @@ #include "rshare.h" #include "SharedFilesDialog.h" -#include "Preferences/AddFileAssotiationDialog.h" +#include "settings/AddFileAssociationDialog.h" #include "rsiface/rsiface.h" #include "rsiface/rspeers.h" #include "rsiface/rsfiles.h" #include "util/RsAction.h" #include "msgs/ChanMsgDialog.h" -#include "Preferences/rsharesettings.h" +#include "settings/rsharesettings.h" #include "AddLinksDialog.h" #ifndef RETROSHARE_LINK_ANALYZER @@ -662,7 +662,7 @@ SharedFilesDialog::fileAssotiationAction(const QString fileName) // QSettings::IniFormat); settings->beginGroup("FileAssotiations"); - QString key = AddFileAssotiationDialog::cleanFileType(currentFile) ; + QString key = AddFileAssociationDialog::cleanFileType(currentFile) ; if ( settings->contains(key) ) { result = new QAction(QIcon(IMAGE_PLAY), tr( "Open File" ), this ); @@ -704,9 +704,9 @@ SharedFilesDialog::runCommandForFile() void SharedFilesDialog::tryToAddNewAssotiation() { - AddFileAssotiationDialog afad(true, this);//'add file assotiations' dialog + AddFileAssociationDialog afad(true, this);//'add file assotiations' dialog - afad.setFileType(AddFileAssotiationDialog::cleanFileType(currentFile)); + afad.setFileType(AddFileAssociationDialog::cleanFileType(currentFile)); int ti = afad.exec(); diff --git a/retroshare-gui/src/gui/SoundManager.h b/retroshare-gui/src/gui/SoundManager.h index 327637579..6f6efe1a2 100644 --- a/retroshare-gui/src/gui/SoundManager.h +++ b/retroshare-gui/src/gui/SoundManager.h @@ -25,7 +25,7 @@ #include #include -#include +#include "settings/rsharesettings.h" class SoundManager :public QObject diff --git a/retroshare-gui/src/gui/StartDialog.h b/retroshare-gui/src/gui/StartDialog.h index 98448a192..e9a1f81f2 100644 --- a/retroshare-gui/src/gui/StartDialog.h +++ b/retroshare-gui/src/gui/StartDialog.h @@ -23,7 +23,7 @@ #ifndef _STARTDIALOG_H #define _STARTDIALOG_H -#include +#include "settings/rsharesettings.h" #include "rsiface/rsiface.h" /******** #if (QT_VERSION >= 040300) diff --git a/retroshare-gui/src/gui/bwgraph/bwgraph.h b/retroshare-gui/src/gui/bwgraph/bwgraph.h index cd563dbdf..974e1737a 100644 --- a/retroshare-gui/src/gui/bwgraph/bwgraph.h +++ b/retroshare-gui/src/gui/bwgraph/bwgraph.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "ui_bwgraph.h" diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index 971b0fbfb..f46b14574 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -27,7 +27,7 @@ #include #include "ui_PopupChatDialog.h" -#include +#include #include "rsiface/rsiface.h" #include "gui/feeds/SubFileItem.h" diff --git a/retroshare-gui/src/gui/common/rwindow.h b/retroshare-gui/src/gui/common/rwindow.h index 0b491e83b..063f23b23 100644 --- a/retroshare-gui/src/gui/common/rwindow.h +++ b/retroshare-gui/src/gui/common/rwindow.h @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2006-2007, crypton * Copyright (c) 2006, Matt Edman, Justin Hipple * * This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ #include #include #include -#include +#include class RWindow : public QMainWindow diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.h b/retroshare-gui/src/gui/connect/ConnectDialog.h index 2cf97fb3d..a32f90666 100644 --- a/retroshare-gui/src/gui/connect/ConnectDialog.h +++ b/retroshare-gui/src/gui/connect/ConnectDialog.h @@ -23,7 +23,7 @@ #ifndef _CONNECTDIALOG_H #define _CONNECTDIALOG_H -#include +#include #include "ui_ConnectDialog.h" diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.ui b/retroshare-gui/src/gui/feeds/SubFileItem.ui index 7fa7a5c1b..3c75db928 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.ui +++ b/retroshare-gui/src/gui/feeds/SubFileItem.ui @@ -6,8 +6,8 @@ 0 0 - 517 - 57 + 640 + 87 @@ -39,211 +39,213 @@ background: white;} QFrame::Raised - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 300 - 16777215 - - - - - 75 - true - true - - - - File Name - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 100 - 26 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - 24 - - - %p Kb - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Expand - - - - - - - :/images/textedit/zoomin.png:/images/textedit/zoomin.png - - - - - - - - 0 - 0 - - - - Save File - - - - - - - :/images/save24.png:/images/save24.png - - - - - - - - 0 - 0 - - - - Cancel Download - - - - - - - :/images/delete.png:/images/delete.png - - - - - - - - 0 - 0 - - - - Download File - - - - - - - :/images/download.png:/images/download.png - - - - - - - - 0 - 0 - - - - Play File - - - - - - - :/images/start.png:/images/start.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - + + + + + + + + 0 + 0 + + + + + 300 + 16777215 + + + + + 75 + true + true + + + + File Name + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 100 + 26 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + 24 + + + %p Kb + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + + + 0 + 0 + + + + Expand + + + + + + + :/images/textedit/zoomin.png:/images/textedit/zoomin.png + + + + + + + + 0 + 0 + + + + Save File + + + + + + + :/images/save24.png:/images/save24.png + + + + + + + + 0 + 0 + + + + Cancel Download + + + + + + + :/images/delete.png:/images/delete.png + + + + + + + + 0 + 0 + + + + Download File + + + + + + + :/images/download.png:/images/download.png + + + + + + + + 0 + 0 + + + + Play File + + + + + + + :/images/start.png:/images/start.png + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 398 + 17 + + + + + diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index c212689ec..f5a1dcfcd 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -22,7 +22,7 @@ #include "CreateForumMsg.h" -#include +#include #include "rsiface/rsforums.h" @@ -33,7 +33,7 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - RshareSettings config; + RshareSettings config; config.loadWidgetInformation(this); // connect up the buttons. @@ -118,7 +118,7 @@ void CreateForumMsg::cancelMsg() close(); return; - RshareSettings config; + RshareSettings config; config.saveWidgetInformation(this); } diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp index 0a5c93338..99484a4ef 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp @@ -26,7 +26,7 @@ #include "rsiface/rspeers.h" #include "rsiface/rsmsgs.h" -#include +#include #include "util/misc.h" #include diff --git a/retroshare-gui/src/gui/msgs/ChanMsgDialog.h b/retroshare-gui/src/gui/msgs/ChanMsgDialog.h index a97311945..1834b3f61 100644 --- a/retroshare-gui/src/gui/msgs/ChanMsgDialog.h +++ b/retroshare-gui/src/gui/msgs/ChanMsgDialog.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "ui_ChanMsgDialog.h" #include "rsiface/rsfiles.h" diff --git a/retroshare-gui/src/gui/profile/StatusMessage.h b/retroshare-gui/src/gui/profile/StatusMessage.h index 5a68158c4..6c3a251eb 100644 --- a/retroshare-gui/src/gui/profile/StatusMessage.h +++ b/retroshare-gui/src/gui/profile/StatusMessage.h @@ -25,7 +25,7 @@ #include -#include +#include #include "ui_StatusMessage.h" diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index d8a0e02cc..c2fb91dd3 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -26,7 +26,7 @@ #include #include -#include "gui/Preferences/rsharesettings.h" +#include "rsharesettings.h" #include #include "configpage.h" diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index a54a30906..0d06c3cc9 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -25,7 +25,7 @@ #include #include -#include +#include "rsharesettings.h" #include "gui/connect/ConnectFriendWizard.h" #include "configpage.h" diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp index 8ea1098e7..ece5aad86 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp @@ -22,7 +22,7 @@ #include "FileAssociationsPage.h" #include "AddFileAssociationDialog.h" //#include "rshare.h" // for Rshare::dataDirectory() method -#include "gui/Preferences/rsharesettings.h" +#include "rsharesettings.h" #include #include diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index f68261f48..7cc6868a1 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -27,7 +27,7 @@ #include #include -#include "gui/Preferences/rsharesettings.h" +#include "rsharesettings.h" #include "configpage.h" #include "ui_GeneralPage.h" diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index 46b835f4d..2df729f92 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -25,7 +25,7 @@ #include #include -#include "gui/Preferences/rsharesettings.h" +#include "rsharesettings.h" #include "configpage.h" #include "ui_NotifyPage.h" diff --git a/retroshare-gui/src/gui/settings/SoundPage.h b/retroshare-gui/src/gui/settings/SoundPage.h index 3d9e5c158..74eb83d3d 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.h +++ b/retroshare-gui/src/gui/settings/SoundPage.h @@ -24,7 +24,7 @@ #include -#include +#include "rsharesettings.h" #include "configpage.h" #include "ui_SoundPage.h" diff --git a/retroshare-gui/src/gui/Preferences/rsettings.cpp b/retroshare-gui/src/gui/settings/rsettings.cpp similarity index 100% rename from retroshare-gui/src/gui/Preferences/rsettings.cpp rename to retroshare-gui/src/gui/settings/rsettings.cpp diff --git a/retroshare-gui/src/gui/Preferences/rsettings.h b/retroshare-gui/src/gui/settings/rsettings.h similarity index 100% rename from retroshare-gui/src/gui/Preferences/rsettings.h rename to retroshare-gui/src/gui/settings/rsettings.h diff --git a/retroshare-gui/src/gui/Preferences/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp similarity index 100% rename from retroshare-gui/src/gui/Preferences/rsharesettings.cpp rename to retroshare-gui/src/gui/settings/rsharesettings.cpp diff --git a/retroshare-gui/src/gui/Preferences/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h similarity index 100% rename from retroshare-gui/src/gui/Preferences/rsharesettings.h rename to retroshare-gui/src/gui/settings/rsharesettings.h diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h index e9c46ed6c..a83ad6260 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.h +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.h @@ -31,7 +31,6 @@ #include "ui_ApplicationWindow.h" -#include "gui/Preferences/rsharesettings.h" class ApplicationWindow : public QMainWindow { diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.h b/retroshare-gui/src/gui/unfinished/ExampleDialog.h index 1934a1d7a..4e9b5cd7b 100644 --- a/retroshare-gui/src/gui/unfinished/ExampleDialog.h +++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.h @@ -24,8 +24,6 @@ #include -//#include - #include "gui/mainpage.h" #include "ui_ExampleDialog.h" diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.h b/retroshare-gui/src/gui/unfinished/LibraryDialog.h index 897cdab4a..dbf5340b4 100644 --- a/retroshare-gui/src/gui/unfinished/LibraryDialog.h +++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.h @@ -24,8 +24,6 @@ #include -//#include - #include "gui/mainpage.h" #include "ui_LibraryDialog.h" diff --git a/retroshare-gui/src/gui/unfinished/StatisticDialog.h b/retroshare-gui/src/gui/unfinished/StatisticDialog.h index 4c1d9bebe..2e48f52d5 100644 --- a/retroshare-gui/src/gui/unfinished/StatisticDialog.h +++ b/retroshare-gui/src/gui/unfinished/StatisticDialog.h @@ -27,9 +27,6 @@ #include #include - -#include - #include "gui/mainpage.h" #include "ui_StatisticDialog.h" #include "gui/linetypes.h" diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 80b27b784..ef4568168 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -25,8 +25,7 @@ #include #include #include -#include -#include +#include #include /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index c3ece6933..c876be9f1 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2006-2007, crypton * Copyright (c) 2006, Matt Edman, Justin Hipple * * This program is free software; you can redistribute it and/or @@ -33,7 +33,7 @@ #include #include -#include "gui/Preferences/rsharesettings.h" +#include "gui/settings/rsharesettings.h" #include "rshare.h" diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h index 828023d36..8fbd8a266 100644 --- a/retroshare-gui/src/rshare.h +++ b/retroshare-gui/src/rshare.h @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2006-2007, crypton * Copyright (c) 2006, Matt Edman, Justin Hipple * * This program is free software; you can redistribute it and/or @@ -36,7 +36,7 @@ #include #include "util/log.h" -#include "gui/Preferences/rsharesettings.h" +#include "gui/settings/rsharesettings.h" /** Rshare's version string */ #define RSHARE_VERSION "0.7" diff --git a/retroshare-gui/src/rsiface/notifyqt.cpp b/retroshare-gui/src/rsiface/notifyqt.cpp index 2d999c7d7..9cce29ac2 100644 --- a/retroshare-gui/src/rsiface/notifyqt.cpp +++ b/retroshare-gui/src/rsiface/notifyqt.cpp @@ -11,7 +11,6 @@ #include "gui/PeersDialog.h" #include "gui/SharedFilesDialog.h" #include "gui/TransfersDialog.h" -//#include "gui/ChatDialog.h" #include "gui/MessagesDialog.h" #include "gui/MessengerWindow.h" @@ -20,7 +19,7 @@ #include "gui/toaster/ChatToaster.h" #include "gui/toaster/CallToaster.h" -#include "gui/Preferences/rsharesettings.h" +#include "gui/settings/rsharesettings.h" #include #include