forgot to commit changes related to Settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-05-17 13:59:39 +00:00
parent 8f024fd08d
commit 02a56a10e1

View File

@ -94,7 +94,7 @@ DEPENDPATH += . \
gui\Preferences \ gui\Preferences \
gui\common \ gui\common \
gui\library \ gui\library \
gui\Settings \ # gui\Settings \
gui\toaster \ gui\toaster \
gui\help\browser \ gui\help\browser \
gui\elastic gui\elastic
@ -207,11 +207,11 @@ HEADERS += rshare.h \
gui/MessagesPopupDialog.h \ gui/MessagesPopupDialog.h \
gui/help/browser/helpbrowser.h \ gui/help/browser/helpbrowser.h \
gui/help/browser/helptextbrowser.h \ gui/help/browser/helptextbrowser.h \
gui/Settings/gsettingswin.h \ # gui/Settings/gsettingswin.h \
gui/Settings/GeneralPage.h \ # gui/Settings/GeneralPage.h \
gui/Settings/DirectoriesPage.h \ # gui/Settings/DirectoriesPage.h \
gui/Settings/ServerPage.h \ # gui/Settings/ServerPage.h \
gui/Settings/NetworkPage.h \ # gui/Settings/NetworkPage.h \
gui/statusbar/peerstatus.h \ gui/statusbar/peerstatus.h \
gui/statusbar/dhtstatus.h \ gui/statusbar/dhtstatus.h \
gui/statusbar/natstatus.h \ gui/statusbar/natstatus.h \
@ -301,11 +301,11 @@ FORMS += gui/BlogDialog.ui \
gui/toaster/ChatToaster.ui \ gui/toaster/ChatToaster.ui \
gui/toaster/MessageToaster.ui \ gui/toaster/MessageToaster.ui \
gui/toaster/OnlineToaster.ui \ gui/toaster/OnlineToaster.ui \
gui/Settings/settings.ui \ # gui/Settings/settings.ui \
gui/Settings/GeneralPage.ui \ # gui/Settings/GeneralPage.ui \
gui/Settings/DirectoriesPage.ui \ # gui/Settings/DirectoriesPage.ui \
gui/Settings/ServerPage.ui \ # gui/Settings/ServerPage.ui \
gui/Settings/NetworkPage.ui \ # gui/Settings/NetworkPage.ui \
gui/advsearch/AdvancedSearchDialog.ui \ gui/advsearch/AdvancedSearchDialog.ui \
gui/advsearch/expressionwidget.ui \ gui/advsearch/expressionwidget.ui \
gui/channels/ChannelsDialog.ui \ gui/channels/ChannelsDialog.ui \
@ -415,11 +415,11 @@ SOURCES += main.cpp \
gui/common/rwindow.cpp \ gui/common/rwindow.cpp \
gui/common/html.cpp \ gui/common/html.cpp \
gui/library/FindWindow.cpp \ gui/library/FindWindow.cpp \
gui/Settings/gsettingswin.cpp \ # gui/Settings/gsettingswin.cpp \
gui/Settings/GeneralPage.cpp \ # gui/Settings/GeneralPage.cpp \
gui/Settings/DirectoriesPage.cpp \ # gui/Settings/DirectoriesPage.cpp \
gui/Settings/ServerPage.cpp \ # gui/Settings/ServerPage.cpp \
gui/Settings/NetworkPage.cpp \ # gui/Settings/NetworkPage.cpp \
gui/statusbar/peerstatus.cpp \ gui/statusbar/peerstatus.cpp \
gui/statusbar/dhtstatus.cpp \ gui/statusbar/dhtstatus.cpp \
gui/statusbar/natstatus.cpp \ gui/statusbar/natstatus.cpp \