diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index fdfb6de5d..375840973 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -56,7 +56,7 @@ #include "statusbar/ratesstatus.h" #include "Preferences/PreferencesWindow.h" -#include "Settings/gsettingswin.h" +//#include "Settings/gsettingswin.h" #include "util/rsversion.h" #include "rsiface/rsiface.h" @@ -436,14 +436,14 @@ MainWindow::showMess(MainWindow::Page page) /** Shows Options */ -void MainWindow::showSettings() -{ - static GSettingsWin *win = new GSettingsWin(this); - if (win->isHidden()) - win->setNewPage(0); - win->show(); - win->activateWindow(); -} +//void MainWindow::showSettings() +//{ +// static GSettingsWin *win = new GSettingsWin(this); +// if (win->isHidden()) +// win->setNewPage(0); +// win->show(); +// win->activateWindow(); +//} /** Shows Messenger window */ void MainWindow::showMessengerWindow() diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index c09a6d536..b43698ce8 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -43,7 +43,7 @@ #endif #include "Preferences/PreferencesWindow.h" -#include "Settings/gsettingswin.h" +//#include "Settings/gsettingswin.h" #include "bwgraph/bwgraph.h" #include "help/browser/helpbrowser.h" #include "games/qbackgammon/bgwindow.h" @@ -151,7 +151,7 @@ private slots: void showPreferencesWindow(PreferencesWindow::Page page = PreferencesWindow::General); void showMess(MainWindow::Page page = MainWindow::Messages); - void showSettings(); +// void showSettings(); void setStyle(); /** Called when user attempts to quit via quit button*/ diff --git a/retroshare-gui/src/gui/Settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/Settings/DirectoriesPage.cpp deleted file mode 100644 index b5b55dc5b..000000000 --- a/retroshare-gui/src/gui/Settings/DirectoriesPage.cpp +++ /dev/null @@ -1,140 +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. - ****************************************************************/ - -#include "DirectoriesPage.h" -#include "rshare.h" -#include "rsiface/rsfiles.h" - - -DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WFlags flags) - : QWidget(parent, flags) -{ - setupUi(this); - setAttribute(Qt::WA_QuitOnClose, false); - - load(); - - //connect(addshareButton, SIGNAL(clicked( ) ), this , SLOT( addShareDirectory() ) ); - connect(removeButton, SIGNAL(clicked( bool ) ), this , SLOT( removeShareDirectory() ) ); - connect(incomingButton, SIGNAL(clicked( bool ) ), this , SLOT( setIncomingDirectory() ) ); - connect(partialButton, SIGNAL(clicked( bool ) ), this , SLOT( setPartialsDirectory() ) ); - -} - -void -DirectoriesPage::closeEvent (QCloseEvent * event) -{ - QWidget::closeEvent(event); -} - - -/** Saves the changes on this page */ -bool -DirectoriesPage::save(QString &errmsg) -{ - return true; - -} - -/** Loads the settings for this page */ -void DirectoriesPage::load() -{ - std::list::const_iterator it; - std::list dirs; - rsFiles->getSharedDirectories(dirs); - - /* get a link to the table */ - QListWidget *listWidget = dirList; - - /* remove old items ??? */ - listWidget->clear(); - - for(it = dirs.begin(); it != dirs.end(); it++) - { - /* (0) Dir Name */ - listWidget->addItem(QString::fromStdString(*it)); - } - - incomingDir->setText(QString::fromStdString(rsFiles->getDownloadDirectory())); - partialsDir->setText(QString::fromStdString(rsFiles->getPartialsDirectory())); - - listWidget->update(); /* update display */ - - -} - -void DirectoriesPage::on_addshareButton_clicked() -{ - - /* select a dir - */ - - - QString qdir = QFileDialog::getOpenFileName(this, tr("Add Shared Directory"),tr("All Files (*)")); - - /* add it to the server */ - std::string dir = qdir.toStdString(); - if (dir != "") - { - rsFiles->addSharedDirectory(dir); - load(); - } -} - -void DirectoriesPage::removeShareDirectory() -{ - /* id current dir */ - /* ask for removal */ - QListWidget *listWidget = dirList; - QListWidgetItem *qdir = listWidget -> currentItem(); - if (qdir) - { - rsFiles->removeSharedDirectory( qdir->text().toStdString()); - load(); - } -} - -void DirectoriesPage::setIncomingDirectory() -{ - QString qdir = QFileDialog::getExistingDirectory(this, tr("Set Incoming Directory"), "", - QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - - std::string dir = qdir.toStdString(); - if (dir != "") - { - rsFiles->setDownloadDirectory(dir); - } - load(); -} - -void DirectoriesPage::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(); -} - diff --git a/retroshare-gui/src/gui/Settings/DirectoriesPage.h b/retroshare-gui/src/gui/Settings/DirectoriesPage.h deleted file mode 100644 index 4915eb972..000000000 --- a/retroshare-gui/src/gui/Settings/DirectoriesPage.h +++ /dev/null @@ -1,62 +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 DIRECTORIESPAGE_H -# define DIRECTORIESPAGE_H - -#include -#include -#include - - -# include "ui_DirectoriesPage.h" - -class DirectoriesPage: public QWidget, private Ui::DirectoriesPage -{ - Q_OBJECT - - public: - DirectoriesPage(QWidget * parent = 0, Qt::WFlags flags = 0); - // ~DirectoriesPage() {} - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - - - - private slots: - void on_addshareButton_clicked(); - void removeShareDirectory(); - void setIncomingDirectory(); - void setPartialsDirectory(); - - - private: - - void closeEvent (QCloseEvent * event); - - -}; - -#endif // !GENERALPAGE_H - diff --git a/retroshare-gui/src/gui/Settings/DirectoriesPage.ui b/retroshare-gui/src/gui/Settings/DirectoriesPage.ui deleted file mode 100644 index 472f6e443..000000000 --- a/retroshare-gui/src/gui/Settings/DirectoriesPage.ui +++ /dev/null @@ -1,698 +0,0 @@ - - DirectoriesPage - - - - 0 - 0 - 470 - 367 - - - - - 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 - - - 6 - - - 6 - - - 6 - - - 0 - - - 0 - - - - - Shared Directories - - - - - - - - - - 34 - 34 - - - - - 34 - 34 - - - - - - - :/images/directoryadd_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - 34 - 34 - - - - - 34 - 34 - - - - - - - :/images/directoryremove_24x24_shadow.png - - - - 24 - 24 - - - - - - - - Qt::Vertical - - - - 20 - 71 - - - - - - - - - - - Incoming Directory - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - - - - :/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - - Partials Direcrtory - - - - - - true - - - - - - - - 31 - 31 - - - - - 31 - 31 - - - - - - - :/images/directoryselect_24x24_shadow.png - - - - 24 - 24 - - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Settings/GeneralPage.cpp b/retroshare-gui/src/gui/Settings/GeneralPage.cpp deleted file mode 100644 index fece8eb4c..000000000 --- a/retroshare-gui/src/gui/Settings/GeneralPage.cpp +++ /dev/null @@ -1,103 +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 "GeneralPage.h" -#include "rshare.h" -#include - -#include - -GeneralPage::GeneralPage(QWidget * parent, Qt::WFlags flags) - : QWidget(parent, flags) -{ - ui.setupUi(this); - setAttribute(Qt::WA_QuitOnClose, false); - setWindowTitle(windowTitle() + QLatin1String(" - General")); - - - /* Create RshareSettings object */ - _settings = new RshareSettings(); - - if (QSystemTrayIcon::isSystemTrayAvailable()){ - - /* Check if we are supposed to show our main window on startup */ - ui.chkShowOnStartup->setChecked(_settings->showMainWindowAtStart()); - if (ui.chkShowOnStartup->isChecked()) - show(); - } else { - /* Don't let people hide the main window, since that's all they have. */ - ui.chkShowOnStartup->hide(); - show(); - } - /* Hide platform specific features */ -#ifndef Q_WS_WIN - ui.chkRunRetroshareAtSystemStartup->setVisible(false); -#endif -} - -void -GeneralPage::closeEvent (QCloseEvent * event) -{ - //GConfig config; - //config.saveWidgetInformation(this); - - QWidget::closeEvent(event); -} - - -/** Saves the changes on this page */ -bool -GeneralPage::save(QString &errmsg) -{ - Q_UNUSED(errmsg); - _settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized()); - - _settings->setRunRetroshareOnBoot( - ui.chkRunRetroshareAtSystemStartup->isChecked()); - - return true; -} - -/** Loads the settings for this page */ -void -GeneralPage::load() -{ - ui.chkRunRetroshareAtSystemStartup->setChecked( - _settings->runRetroshareOnBoot()); - - ui.checkStartMinimized->setChecked(_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()); -} - -bool GeneralPage::startMinimized() const { - if(ui.checkStartMinimized->isChecked()) return true; - return ui.checkStartMinimized->isChecked(); -} - -/** Called when the "show on startup" checkbox is toggled. */ -void -GeneralPage::toggleShowOnStartup(bool checked) -{ - //RshareSettings _settings; - _settings->setShowMainWindowAtStart(checked); -} - - diff --git a/retroshare-gui/src/gui/Settings/GeneralPage.h b/retroshare-gui/src/gui/Settings/GeneralPage.h deleted file mode 100644 index 3419ea84e..000000000 --- a/retroshare-gui/src/gui/Settings/GeneralPage.h +++ /dev/null @@ -1,65 +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 GENERALPAGE_H -# define GENERALPAGE_H - -#include -#include - -#include "gui/Preferences/rsharesettings.h" -#include "lang/languagesupport.h" - -# include -# include "ui_GeneralPage.h" - -class GeneralPage: public QWidget -{ - Q_OBJECT - - public: - GeneralPage(QWidget * parent = 0, Qt::WFlags flags = 0); - ~GeneralPage() {} - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - bool startMinimized() const; - -private slots: - - /** Called when the "show on startup" checkbox is toggled. */ - void toggleShowOnStartup(bool checked); - - private: - /** A VidaliaSettings object used for saving/loading settings */ - RshareSettings* _settings; - - - void closeEvent (QCloseEvent * event); - - Ui::GeneralPage ui; -}; - -#endif // !GENERALPAGE_H - diff --git a/retroshare-gui/src/gui/Settings/GeneralPage.ui b/retroshare-gui/src/gui/Settings/GeneralPage.ui deleted file mode 100644 index b3277baa5..000000000 --- a/retroshare-gui/src/gui/Settings/GeneralPage.ui +++ /dev/null @@ -1,140 +0,0 @@ - - GeneralPage - - - - 0 - 0 - 430 - 296 - - - - Keys manager - - - - - - - 6 - - - 6 - - - 6 - - - 6 - - - 0 - - - 0 - - - - - - 0 - 48 - - - - Login - - - - - 10 - 20 - 141 - 18 - - - - Auto Login - - - - - - - - - 0 - 80 - - - - Misc - - - - - 10 - 40 - 401 - 20 - - - - Show MainWindow at Startup - - - false - - - - - - 10 - 60 - 401 - 20 - - - - Start minimized - - - true - - - - - - 10 - 20 - 411 - 18 - - - - Start RetroShare when my system starts - - - - - - - - Qt::Vertical - - - - 391 - 61 - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Settings/NetworkPage.cpp b/retroshare-gui/src/gui/Settings/NetworkPage.cpp deleted file mode 100644 index 5209ec2bb..000000000 --- a/retroshare-gui/src/gui/Settings/NetworkPage.cpp +++ /dev/null @@ -1,53 +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. - ****************************************************************/ - -#include "NetworkPage.h" -#include "rshare.h" - -NetworkPage::NetworkPage(QWidget * parent, Qt::WFlags flags) - : QWidget(parent, flags) -{ - ui.setupUi(this); - setAttribute(Qt::WA_QuitOnClose, false); - -} - -void -NetworkPage::closeEvent (QCloseEvent * event) -{ - QWidget::closeEvent(event); -} - - -/** Saves the changes on this page */ -bool -NetworkPage::save(QString &errmsg) -{ - -} - -/** Loads the settings for this page */ -void -NetworkPage::load() -{ - -} - diff --git a/retroshare-gui/src/gui/Settings/NetworkPage.h b/retroshare-gui/src/gui/Settings/NetworkPage.h deleted file mode 100644 index 40453ddbb..000000000 --- a/retroshare-gui/src/gui/Settings/NetworkPage.h +++ /dev/null @@ -1,47 +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 NETWORKPAGE_H -# define NETWORKPAGE_H - -# include -# include "ui_NetworkPage.h" - -class NetworkPage: public QWidget -{ - public: - NetworkPage(QWidget * parent = 0, Qt::WFlags flags = 0); - ~NetworkPage() {} - - /** Saves the changes on this page */ - bool save(QString &errmsg); - /** Loads the settings for this page */ - void load(); - - private: - - void closeEvent (QCloseEvent * event); - - Ui::NetworkPage ui; -}; - -#endif // !NETWROKPAGE_H - diff --git a/retroshare-gui/src/gui/Settings/NetworkPage.ui b/retroshare-gui/src/gui/Settings/NetworkPage.ui deleted file mode 100644 index cbdc5cc51..000000000 --- a/retroshare-gui/src/gui/Settings/NetworkPage.ui +++ /dev/null @@ -1,506 +0,0 @@ - - NetworkPage - - - - 0 - 0 - 398 - 389 - - - - - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - - - - diff --git a/retroshare-gui/src/gui/Settings/ServerPage.cpp b/retroshare-gui/src/gui/Settings/ServerPage.cpp deleted file mode 100644 index 3e68f3921..000000000 --- a/retroshare-gui/src/gui/Settings/ServerPage.cpp +++ /dev/null @@ -1,394 +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. - ****************************************************************/ - -#include "ServerPage.h" -#include "rshare.h" - -#include -#include - -#include "rsiface/rsiface.h" -#include "rsiface/rspeers.h" - -#include - -ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags) - : QWidget(parent, flags) -{ - ui.setupUi(this); - setAttribute(Qt::WA_QuitOnClose, false); - - connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); - - QTimer *timer = new QTimer(this); - timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); - timer->start(1000); - - load(); -} - -void -ServerPage::closeEvent (QCloseEvent * event) -{ - QWidget::closeEvent(event); -} - - -/** Saves the changes on this page */ -bool -ServerPage::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 ServerPage::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.totalRate->setValue(rsiface->getConfig().maxDataRate); - ui.indivRate->setValue(rsiface->getConfig().maxIndivDataRate); - - rsiface->unlockData(); /* UnLock Interface */ - - toggleUPnP(); - - //ui.check_net->setCheckable(true); - ui.check_upnp->setCheckable(true); - ui.check_dht->setCheckable(true); - ui.check_ext->setCheckable(true); - ui.check_udp->setCheckable(true); - ui.check_tcp->setCheckable(true); - - //ui.check_net->setEnabled(false); - ui.check_upnp->setEnabled(false); - ui.check_dht->setEnabled(false); - ui.check_ext->setEnabled(false); - ui.check_udp->setEnabled(false); - ui.check_tcp->setEnabled(false); - - ui.radio_nonet->setEnabled(false); - ui.radio_netLimited->setEnabled(false); - ui.radio_netUdp->setEnabled(false); - ui.radio_netServer->setEnabled(false); - - /* 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 ServerPage::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 - - rsiface->lockData(); /* Lock Interface */ - - /* now the extra bit .... switch on check boxes */ - const RsConfig &config = rsiface->getConfig(); - - //ui.check_net->setChecked(config.netOk); - ui.check_upnp->setChecked(config.netUpnpOk); - ui.check_dht->setChecked(config.netDhtOk); - ui.check_ext->setChecked(config.netExtOk); - ui.check_udp->setChecked(config.netUdpOk); - ui.check_tcp->setChecked(config.netTcpOk); - - if (config.netExtOk) - { - if (config.netUpnpOk || config.netTcpOk) - { - ui.radio_netServer->setChecked(true); - } - else - { - ui.radio_netUdp->setChecked(true); - } - } - else if (config.netOk) - { - ui.radio_netLimited->setChecked(true); - } - else - { - ui.radio_nonet->setChecked(true); - } - - - rsiface->unlockData(); /* UnLock Interface */ - - -} - - -void ServerPage::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->setEnabled(false); - ui.localPort -> setEnabled(true); - ui.extAddress -> setEnabled(false); - 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 ServerPage::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.totalRate->value(), ui.indivRate->value() ); - load(); -} - - diff --git a/retroshare-gui/src/gui/Settings/ServerPage.h b/retroshare-gui/src/gui/Settings/ServerPage.h deleted file mode 100644 index 1215eed32..000000000 --- a/retroshare-gui/src/gui/Settings/ServerPage.h +++ /dev/null @@ -1,56 +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 SERVERPAGE_H -# define SERVERPAGE_H - -# include -# include "ui_ServerPage.h" - -class ServerPage: public QWidget -{ - Q_OBJECT - - public: - ServerPage(QWidget * parent = 0, Qt::WFlags flags = 0); - ~ServerPage() {} - - /** 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(); - - private: - - void closeEvent (QCloseEvent * event); - - Ui::ServerPage ui; -}; - -#endif // !SERVERPAGE_H - diff --git a/retroshare-gui/src/gui/Settings/ServerPage.ui b/retroshare-gui/src/gui/Settings/ServerPage.ui deleted file mode 100644 index 1a0c3e94b..000000000 --- a/retroshare-gui/src/gui/Settings/ServerPage.ui +++ /dev/null @@ -1,920 +0,0 @@ - - ServerPage - - - - 0 - 0 - 437 - 388 - - - - - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - 6 - - - 6 - - - 6 - - - 6 - - - 0 - - - 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 - - - - - - Network Configuration - - - - - - - - - - Local Address - - - - - - - External Address - - - - - - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - - - - - Qt::Vertical - - - - 381 - 40 - - - - - - - - - - - - Network Status - - - - - - - - - - No Conectivity - - - - - - - Limited - - - - - - - Udp - - - - - - - Retroshare Server - - - - - - - - - - - UDP Connections - - - false - - - - - - - Stable External IP Addrress - - - false - - - - - - - DHT Okay - - - false - - - - - - - UPnP Active - - - false - - - - - - - TCP server - - - false - - - - - - - - - - - - - - - - 0 - 0 - - - - Transfer Rates - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Total Rate (KB/s) - - - - - - - 1 - - - 12500 - - - 1 - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Per Person - - - - - - - 1 - - - 12500 - - - 1 - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - diff --git a/retroshare-gui/src/gui/Settings/gsettingswin.cpp b/retroshare-gui/src/gui/Settings/gsettingswin.cpp deleted file mode 100644 index 0f2ad8c5f..000000000 --- a/retroshare-gui/src/gui/Settings/gsettingswin.cpp +++ /dev/null @@ -1,102 +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. - ****************************************************************/ - - -#include "GeneralPage.h" -#include "DirectoriesPage.h" -#include "ServerPage.h" -#include "NetworkPage.h" -#include "gsettingswin.h" -//#include "FileAssotiationsDialog.h" - -GSettingsWin::GSettingsWin(QWidget * parent, Qt::WFlags flags) - : QDialog(parent, flags) -{ - setupUi(this); - setAttribute(Qt::WA_QuitOnClose, false); - setModal(false); - //setWindowTitle(windowTitle() + QLatin1String(___GLOSTER_WINTITLE)); - - initStackedWidget(); - - connect(listWidget, SIGNAL(currentRowChanged(int)), - this, SLOT(setNewPage(int))); - -} - -void -GSettingsWin::closeEvent (QCloseEvent * event) -{ - - QWidget::closeEvent(event); -} - -void -GSettingsWin::initStackedWidget() -{ - stackedWidget->setCurrentIndex(-1); - stackedWidget->removeWidget(stackedWidget->widget(0)); - - stackedWidget->addWidget(new GeneralPage(false)); - stackedWidget->addWidget(new NetworkPage()); - stackedWidget->addWidget(new ServerPage()); - stackedWidget->addWidget(new DirectoriesPage()); - // stackedWidget->addWidget(new FileAssotiationsDialog() ); - - - setNewPage(General); - - -} - -void -GSettingsWin::setNewPage(int page) -{ - QString text; - - switch (page) - { - case General: - text = tr("General"); - break; - case Network: - text = tr("Network"); - break; - case Directories: - text = tr("Directories"); - break; - case Server: - text = tr("Server"); - break; - case FileAssotiations: - text = tr("File assotiations"); - break; - default: - text = tr("UnknownPage");// impossible case - } - - pageName->setText(text); //tr("%1").arg( - stackedWidget->setCurrentIndex(page); - listWidget->setCurrentRow(page); -} - - - diff --git a/retroshare-gui/src/gui/Settings/gsettingswin.h b/retroshare-gui/src/gui/Settings/gsettingswin.h deleted file mode 100644 index f72ac8a2b..000000000 --- a/retroshare-gui/src/gui/Settings/gsettingswin.h +++ /dev/null @@ -1,52 +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 GSETTINGSWIN_HPP_ -# define GSETTINGSWIN_HPP_ - -# include -# include "ui_settings.h" - -/*! \class GSettingsWin - \brief The Gloster control panel. - - */ -class GSettingsWin: public QDialog, private Ui::Settings -{ - Q_OBJECT - - public: - enum PageType { General = 0, Network, Server, - Directories, FileAssotiations }; - - GSettingsWin(QWidget * parent = 0, Qt::WFlags flags = 0); - ~GSettingsWin() {} - - public slots: - //! Go to a specific part of the control panel. - void setNewPage(int page); - - private: - void closeEvent (QCloseEvent * event); - void initStackedWidget(); -}; - -#endif // !GSETTINGSWIN_HPP_ diff --git a/retroshare-gui/src/gui/Settings/settings.ui b/retroshare-gui/src/gui/Settings/settings.ui deleted file mode 100644 index 2bfc44108..000000000 --- a/retroshare-gui/src/gui/Settings/settings.ui +++ /dev/null @@ -1,296 +0,0 @@ - - Settings - - - - 0 - 0 - 434 - 366 - - - - Settings - - - - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - Sans Serif - 9 - 75 - false - true - false - false - - - - - - - - - - - Qt::Horizontal - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 312 - 31 - - - - - - - - - 0 - 22 - - - - Cancel - - - - - - - false - - - - 0 - 22 - - - - Apply - - - - - - - - 0 - 22 - - - - OK - - - - - - - - - - 110 - 0 - - - - - 110 - 16777215 - - - - false - - - - 24 - 24 - - - - Qt::ElideMiddle - - - QListView::Static - - - QListView::TopToBottom - - - false - - - QListView::Fixed - - - QListView::SinglePass - - - - 100 - 16 - - - - QListView::ListMode - - - 0 - - - true - - - -1 - - - - General - - - - - Network - - - - - Server - - - - - Directories - - - - - - - - Qt::Horizontal - - - - - - - 0 - - - - - - - - - - - - okButton - clicked() - Settings - accept() - - - 278 - 253 - - - 96 - 254 - - - - - canceButton - clicked() - Settings - reject() - - - 369 - 253 - - - 179 - 282 - - - - -