Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add new settings

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
alexandrut 2009-08-19 22:19:35 +00:00
parent 19920e95bc
commit 1c93c63ba4
4 changed files with 54 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/RetroShare.pro
View file

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools debug pluginmgr #release newsettings CONFIG += qt gui uic qrc resources uitools debug pluginmgr newsettings #release
QT += network xml script QT += network xml script
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare TARGET = RetroShare

2
retroshare-gui/src/gui/ApplicationWindow.cpp
View file

@ -30,8 +30,6 @@
#include <rshare.h> #include <rshare.h>
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include "Preferences/PreferencesWindow.h"
//#include "Settings/gsettingswin.h" //#include "Settings/gsettingswin.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"

14
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -50,12 +50,6 @@
#include "statusbar/natstatus.h" #include "statusbar/natstatus.h"
#include "statusbar/ratesstatus.h" #include "statusbar/ratesstatus.h"
#include "Preferences/PreferencesWindow.h"
#ifdef NEWSETTINGS
#include "settings/rsettingswin.h"
#endif
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
@ -129,7 +123,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create all the dialogs of which we only want one instance */ /* Create all the dialogs of which we only want one instance */
_bandwidthGraph = new BandwidthGraph(); _bandwidthGraph = new BandwidthGraph();
messengerWindow = new MessengerWindow(); messengerWindow = new MessengerWindow();
_preferencesWindow = new PreferencesWindow(); _settingsWindow = new RSettingsWin();
applicationWindow = new ApplicationWindow(); applicationWindow = new ApplicationWindow();
applicationWindow->hide(); applicationWindow->hide();
@ -433,9 +427,9 @@ void MainWindow::openShareManager()
/** Creates and displays the Configuration dialog with the current page set to /** Creates and displays the Configuration dialog with the current page set to
* <b>page</b>. */ * <b>page</b>. */
void void
MainWindow::showPreferencesWindow(PreferencesWindow::Page page) MainWindow::showPreferencesWindow(RSettingsWin::PageType page)
{ {
_preferencesWindow->showWindow(page); _settingsWindow->showWindow(page);
} }
/** Shows Messages Dialog */ /** Shows Messages Dialog */
@ -476,7 +470,7 @@ MainWindow::~MainWindow()
{ {
delete _bandwidthGraph; delete _bandwidthGraph;
delete _messengerwindowAct; delete _messengerwindowAct;
delete _preferencesWindow; delete _settingsWindow;
} }
/** Create and bind actions to events. Setup for initial /** Create and bind actions to events. Setup for initial

10
retroshare-gui/src/gui/MainWindow.h
View file

@ -38,8 +38,7 @@
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include "PluginsPage.h" #include "PluginsPage.h"
#include "Preferences/PreferencesWindow.h" #include "settings/rsettingswin.h"
#include "Preferences/rsharesettings.h"
#include "bwgraph/bwgraph.h" #include "bwgraph/bwgraph.h"
#include "help/browser/helpbrowser.h" #include "help/browser/helpbrowser.h"
@ -47,7 +46,6 @@
#include "ui_MainWindow.h" #include "ui_MainWindow.h"
class PeerStatus; class PeerStatus;
class DHTStatus; class DHTStatus;
class NATStatus; class NATStatus;
@ -133,7 +131,7 @@ private slots:
/** Creates and displays the Configuration dialog with the current page set /** Creates and displays the Configuration dialog with the current page set
* to <b>page</b>. */ * to <b>page</b>. */
void showPreferencesWindow(PreferencesWindow::Page page = PreferencesWindow::General); void showPreferencesWindow(RSettingsWin::PageType page = RSettingsWin::General);
void showMess(MainWindow::Page page = MainWindow::Messages); void showMess(MainWindow::Page page = MainWindow::Messages);
#ifdef NEWSETTINGS #ifdef NEWSETTINGS
void showSettings(); void showSettings();
@ -151,8 +149,6 @@ protected:
private slots: private slots:
private: private:
/** Create the actions on the tray menu or menubar */ /** Create the actions on the tray menu or menubar */
@ -171,7 +167,7 @@ private:
/** A BandwidthGraph object which handles monitoring RetroShare bandwidth usage */ /** A BandwidthGraph object which handles monitoring RetroShare bandwidth usage */
BandwidthGraph* _bandwidthGraph; BandwidthGraph* _bandwidthGraph;
PreferencesWindow* _preferencesWindow; RSettingsWin *_settingsWindow;
/** A RetroShareSettings object used for saving/loading settings */ /** A RetroShareSettings object used for saving/loading settings */
RshareSettings* _settings; RshareSettings* _settings;