mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Reactivate minimal version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
24b2b8ce29
commit
61b57ede65
@ -59,11 +59,15 @@ win32 {
|
|||||||
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
|
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
|
||||||
DESTDIR = lib
|
DESTDIR = lib
|
||||||
|
|
||||||
# Switch off optimization
|
# Switch off optimization for release version
|
||||||
QMAKE_CXXFLAGS_RELEASE -= -O2
|
QMAKE_CXXFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CXXFLAGS_RELEASE += -O0
|
QMAKE_CXXFLAGS_RELEASE += -O0
|
||||||
QMAKE_CFLAGS_RELEASE -= -O2
|
QMAKE_CFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CFLAGS_RELEASE += -O0
|
QMAKE_CFLAGS_RELEASE += -O0
|
||||||
|
|
||||||
|
# Switch on optimization for debug version
|
||||||
|
#QMAKE_CXXFLAGS_DEBUG += -O2
|
||||||
|
#QMAKE_CFLAGS_DEBUG += -O2
|
||||||
}
|
}
|
||||||
|
|
||||||
################################# MacOSX ##########################################
|
################################# MacOSX ##########################################
|
||||||
|
|||||||
@ -9,7 +9,7 @@ TARGET = retroshare
|
|||||||
#CONFIG += minimal
|
#CONFIG += minimal
|
||||||
|
|
||||||
minimal {
|
minimal {
|
||||||
CONFIG -= use_blogs bitdht
|
CONFIG -= use_blogs
|
||||||
|
|
||||||
DEFINES += MINIMAL_LIBRS
|
DEFINES += MINIMAL_LIBRS
|
||||||
}
|
}
|
||||||
@ -236,12 +236,16 @@ win32 {
|
|||||||
DEFINES *= MINIUPNPC_VERSION=13
|
DEFINES *= MINIUPNPC_VERSION=13
|
||||||
DESTDIR = lib
|
DESTDIR = lib
|
||||||
|
|
||||||
# Switch off optimization
|
# Switch off optimization for release version
|
||||||
QMAKE_CXXFLAGS_RELEASE -= -O2
|
QMAKE_CXXFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CXXFLAGS_RELEASE += -O0
|
QMAKE_CXXFLAGS_RELEASE += -O0
|
||||||
QMAKE_CFLAGS_RELEASE -= -O2
|
QMAKE_CFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CFLAGS_RELEASE += -O0
|
QMAKE_CFLAGS_RELEASE += -O0
|
||||||
|
|
||||||
|
# Switch on optimization for debug version
|
||||||
|
#QMAKE_CXXFLAGS_DEBUG += -O2
|
||||||
|
#QMAKE_CFLAGS_DEBUG += -O2
|
||||||
|
|
||||||
DEFINES -= DEBUG_PQISSL
|
DEFINES -= DEBUG_PQISSL
|
||||||
DEFINES += USE_CMD_ARGS
|
DEFINES += USE_CMD_ARGS
|
||||||
|
|
||||||
|
|||||||
@ -1,273 +1,277 @@
|
|||||||
CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs
|
CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs
|
||||||
#CONFIG += use_links
|
#CONFIG += use_links
|
||||||
QT += network xml script opengl
|
QT += network xml script opengl
|
||||||
|
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET = RetroShare
|
TARGET = RetroShare
|
||||||
|
|
||||||
#CONFIG += minimal
|
#CONFIG += minimal
|
||||||
|
|
||||||
DEFINES += RS_RELEASE_VERSION
|
DEFINES += RS_RELEASE_VERSION
|
||||||
RCC_DIR = temp/qrc
|
RCC_DIR = temp/qrc
|
||||||
UI_DIR = temp/ui
|
UI_DIR = temp/ui
|
||||||
MOC_DIR = temp/moc
|
MOC_DIR = temp/moc
|
||||||
|
|
||||||
#CONFIG += debug
|
#CONFIG += debug
|
||||||
debug {
|
debug {
|
||||||
QMAKE_CFLAGS += -g
|
QMAKE_CFLAGS += -g
|
||||||
}
|
}
|
||||||
|
|
||||||
minimal {
|
minimal {
|
||||||
CONFIG -= blogs bitdht
|
CONFIG -= blogs
|
||||||
|
|
||||||
DEFINES += MINIMAL_RSGUI
|
DEFINES += MINIMAL_RSGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
################################# Linux ##########################################
|
################################# Linux ##########################################
|
||||||
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
|
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
|
||||||
linux-* {
|
linux-* {
|
||||||
#CONFIG += version_detail_bash_script
|
#CONFIG += version_detail_bash_script
|
||||||
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
|
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
system(which gpgme-config >/dev/null 2>&1) {
|
system(which gpgme-config >/dev/null 2>&1) {
|
||||||
INCLUDEPATH += $$system(gpgme-config --cflags | sed -e "s/-I//g")
|
INCLUDEPATH += $$system(gpgme-config --cflags | sed -e "s/-I//g")
|
||||||
} else {
|
} else {
|
||||||
message(Could not find gpgme-config on your system, assuming gpgme.h is in /usr/include)
|
message(Could not find gpgme-config on your system, assuming gpgme.h is in /usr/include)
|
||||||
}
|
}
|
||||||
|
|
||||||
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
||||||
|
|
||||||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||||
LIBS += -lssl -lgpgme -lupnp -lXss -lgnome-keyring
|
LIBS += -lssl -lgpgme -lupnp -lXss -lgnome-keyring
|
||||||
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
|
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
|
||||||
DEFINES *= UBUNTU
|
DEFINES *= UBUNTU
|
||||||
}
|
}
|
||||||
|
|
||||||
linux-g++ {
|
linux-g++ {
|
||||||
OBJECTS_DIR = temp/linux-g++/obj
|
OBJECTS_DIR = temp/linux-g++/obj
|
||||||
}
|
}
|
||||||
|
|
||||||
linux-g++-64 {
|
linux-g++-64 {
|
||||||
OBJECTS_DIR = temp/linux-g++-64/obj
|
OBJECTS_DIR = temp/linux-g++-64/obj
|
||||||
}
|
}
|
||||||
|
|
||||||
version_detail_bash_script {
|
version_detail_bash_script {
|
||||||
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
|
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
|
||||||
QMAKE_EXTRA_TARGETS += write_version_detail
|
QMAKE_EXTRA_TARGETS += write_version_detail
|
||||||
PRE_TARGETDEPS = write_version_detail
|
PRE_TARGETDEPS = write_version_detail
|
||||||
write_version_detail.commands = ./version_detail.sh
|
write_version_detail.commands = ./version_detail.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
install_rs {
|
install_rs {
|
||||||
INSTALLS += binary_rs
|
INSTALLS += binary_rs
|
||||||
binary_rs.path = $$(PREFIX)/usr/bin
|
binary_rs.path = $$(PREFIX)/usr/bin
|
||||||
binary_rs.files = ./RetroShare
|
binary_rs.files = ./RetroShare
|
||||||
}
|
}
|
||||||
|
|
||||||
#################### Cross compilation for windows under Linux ###################
|
#################### Cross compilation for windows under Linux ###################
|
||||||
|
|
||||||
win32-x-g++ {
|
win32-x-g++ {
|
||||||
OBJECTS_DIR = temp/win32-x-g++/obj
|
OBJECTS_DIR = temp/win32-x-g++/obj
|
||||||
|
|
||||||
LIBS += ../../libretroshare/src/lib.win32xgcc/libretroshare.a
|
LIBS += ../../libretroshare/src/lib.win32xgcc/libretroshare.a
|
||||||
LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
|
LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
|
||||||
LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
|
LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
|
||||||
LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
|
LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
|
||||||
LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
|
LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
|
||||||
LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
|
LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
|
||||||
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
|
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
|
||||||
LIBS += -lQtUiTools
|
LIBS += -lQtUiTools
|
||||||
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
|
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
|
||||||
LIBS += -lole32 -lwinmm
|
LIBS += -lole32 -lwinmm
|
||||||
|
|
||||||
DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
|
DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
|
||||||
|
|
||||||
INCLUDEPATH += ../../../../gpgme-1.1.8/src/
|
INCLUDEPATH += ../../../../gpgme-1.1.8/src/
|
||||||
INCLUDEPATH += ../../../../libgpg-error-1.7/src/
|
INCLUDEPATH += ../../../../libgpg-error-1.7/src/
|
||||||
|
|
||||||
RC_FILE = gui/images/retroshare_win.rc
|
RC_FILE = gui/images/retroshare_win.rc
|
||||||
}
|
}
|
||||||
|
|
||||||
#################################### Windows #####################################
|
#################################### Windows #####################################
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
# Switch off optimization
|
# Switch off optimization for release version
|
||||||
QMAKE_CXXFLAGS_RELEASE -= -O2
|
QMAKE_CXXFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CXXFLAGS_RELEASE += -O0
|
QMAKE_CXXFLAGS_RELEASE += -O0
|
||||||
QMAKE_CFLAGS_RELEASE -= -O2
|
QMAKE_CFLAGS_RELEASE -= -O2
|
||||||
QMAKE_CFLAGS_RELEASE += -O0
|
QMAKE_CFLAGS_RELEASE += -O0
|
||||||
|
|
||||||
OBJECTS_DIR = temp/obj
|
# Switch on optimization for debug version
|
||||||
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
|
#QMAKE_CXXFLAGS_DEBUG += -O2
|
||||||
#QTPLUGIN += qjpeg
|
#QMAKE_CFLAGS_DEBUG += -O2
|
||||||
|
|
||||||
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
|
OBJECTS_DIR = temp/obj
|
||||||
|
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
|
||||||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
#QTPLUGIN += qjpeg
|
||||||
LIBS += -L"../../../../lib"
|
|
||||||
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
|
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
|
||||||
# added after bitdht
|
|
||||||
# LIBS += -lws2_32
|
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||||
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
|
LIBS += -L"../../../../lib"
|
||||||
LIBS += -lole32 -lwinmm
|
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
|
||||||
RC_FILE = gui/images/retroshare_win.rc
|
# added after bitdht
|
||||||
|
# LIBS += -lws2_32
|
||||||
DEFINES += WINDOWS_SYS
|
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
|
||||||
|
LIBS += -lole32 -lwinmm
|
||||||
GPG_ERROR_DIR = ../../../../libgpg-error-1.7
|
RC_FILE = gui/images/retroshare_win.rc
|
||||||
GPGME_DIR = ../../../../gpgme-1.1.8
|
|
||||||
INCLUDEPATH += . $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
|
DEFINES += WINDOWS_SYS
|
||||||
}
|
|
||||||
|
GPG_ERROR_DIR = ../../../../libgpg-error-1.7
|
||||||
##################################### MacOS ######################################
|
GPGME_DIR = ../../../../gpgme-1.1.8
|
||||||
|
INCLUDEPATH += . $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
|
||||||
macx {
|
}
|
||||||
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
|
|
||||||
# CONFIG += ppc x86
|
##################################### MacOS ######################################
|
||||||
|
|
||||||
CONFIG += version_detail_bash_script
|
macx {
|
||||||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
# ENABLE THIS OPTION FOR Univeral Binary BUILD.
|
||||||
LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
|
# CONFIG += ppc x86
|
||||||
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
|
|
||||||
LIBS += -framework CoreFoundation
|
CONFIG += version_detail_bash_script
|
||||||
|
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||||
|
LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
|
||||||
|
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
|
||||||
|
LIBS += -framework CoreFoundation
|
||||||
LIBS += -framework Security
|
LIBS += -framework Security
|
||||||
|
|
||||||
# LIBS += -framework CoreServices
|
# LIBS += -framework CoreServices
|
||||||
|
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
#DEFINES* = MAC_IDLE # for idle feature
|
#DEFINES* = MAC_IDLE # for idle feature
|
||||||
CONFIG -= uitools
|
CONFIG -= uitools
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
############################## Common stuff ######################################
|
############################## Common stuff ######################################
|
||||||
|
|
||||||
# On Linux systems that alredy have libssl and libcrypto it is advisable
|
# On Linux systems that alredy have libssl and libcrypto it is advisable
|
||||||
# to rename the patched version of SSL to something like libsslxpgp.a and libcryptoxpg.a
|
# to rename the patched version of SSL to something like libsslxpgp.a and libcryptoxpg.a
|
||||||
|
|
||||||
# ###########################################
|
# ###########################################
|
||||||
|
|
||||||
bitdht {
|
bitdht {
|
||||||
LIBS += ../../libbitdht/src/lib/libbitdht.a
|
LIBS += ../../libbitdht/src/lib/libbitdht.a
|
||||||
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
|
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
|
||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
# must be added after bitdht
|
# must be added after bitdht
|
||||||
LIBS += -lws2_32
|
LIBS += -lws2_32
|
||||||
}
|
}
|
||||||
|
|
||||||
DEPENDPATH += . \
|
DEPENDPATH += . \
|
||||||
rsiface \
|
rsiface \
|
||||||
control \
|
control \
|
||||||
gui \
|
gui \
|
||||||
lang \
|
lang \
|
||||||
util \
|
util \
|
||||||
gui\bwgraph \
|
gui\bwgraph \
|
||||||
gui\chat \
|
gui\chat \
|
||||||
gui\connect \
|
gui\connect \
|
||||||
gui\images \
|
gui\images \
|
||||||
gui\common \
|
gui\common \
|
||||||
gui\toaster \
|
gui\toaster \
|
||||||
gui\help\browser \
|
gui\help\browser \
|
||||||
gui\elastic
|
gui\elastic
|
||||||
|
|
||||||
INCLUDEPATH += ../../libretroshare/src/
|
INCLUDEPATH += ../../libretroshare/src/
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
HEADERS += rshare.h \
|
HEADERS += rshare.h \
|
||||||
gui/notifyqt.h \
|
gui/notifyqt.h \
|
||||||
control/bandwidthevent.h \
|
control/bandwidthevent.h \
|
||||||
control/eventtype.h \
|
control/eventtype.h \
|
||||||
gui/QuickStartWizard.h \
|
gui/QuickStartWizard.h \
|
||||||
gui/DetailsDialog.h \
|
gui/DetailsDialog.h \
|
||||||
gui/DLListDelegate.h \
|
gui/DLListDelegate.h \
|
||||||
gui/ULListDelegate.h \
|
gui/ULListDelegate.h \
|
||||||
gui/StartDialog.h \
|
gui/StartDialog.h \
|
||||||
gui/NetworkDialog.h \
|
gui/NetworkDialog.h \
|
||||||
gui/GenCertDialog.h \
|
gui/GenCertDialog.h \
|
||||||
gui/TransfersDialog.h \
|
gui/TransfersDialog.h \
|
||||||
gui/graphframe.h \
|
gui/graphframe.h \
|
||||||
gui/linetypes.h \
|
gui/linetypes.h \
|
||||||
gui/mainpage.h \
|
gui/mainpage.h \
|
||||||
gui/mainpagestack.h \
|
gui/mainpagestack.h \
|
||||||
gui/MainWindow.h \
|
gui/MainWindow.h \
|
||||||
gui/RSHumanReadableDelegate.h \
|
gui/RSHumanReadableDelegate.h \
|
||||||
gui/TurtleRouterDialog.h \
|
gui/TurtleRouterDialog.h \
|
||||||
gui/AboutDialog.h \
|
gui/AboutDialog.h \
|
||||||
gui/ForumsDialog.h \
|
gui/ForumsDialog.h \
|
||||||
gui/forums/ForumDetails.h \
|
gui/forums/ForumDetails.h \
|
||||||
gui/forums/EditForumDetails.h \
|
gui/forums/EditForumDetails.h \
|
||||||
gui/forums/CreateForum.h \
|
gui/forums/CreateForum.h \
|
||||||
gui/forums/CreateForumMsg.h \
|
gui/forums/CreateForumMsg.h \
|
||||||
gui/NetworkView.h \
|
gui/NetworkView.h \
|
||||||
gui/TrustView.h \
|
gui/TrustView.h \
|
||||||
gui/MessengerWindow.h \
|
gui/MessengerWindow.h \
|
||||||
gui/PeersDialog.h \
|
gui/PeersDialog.h \
|
||||||
gui/RemoteDirModel.h \
|
gui/RemoteDirModel.h \
|
||||||
gui/RetroShareLink.h \
|
gui/RetroShareLink.h \
|
||||||
gui/SearchTreeWidget.h \
|
gui/SearchTreeWidget.h \
|
||||||
gui/SearchDialog.h \
|
gui/SearchDialog.h \
|
||||||
gui/SharedFilesDialog.h \
|
gui/SharedFilesDialog.h \
|
||||||
gui/ShareManager.h \
|
gui/ShareManager.h \
|
||||||
gui/ShareDialog.h \
|
gui/ShareDialog.h \
|
||||||
gui/SFListDelegate.h \
|
gui/SFListDelegate.h \
|
||||||
gui/SoundManager.h \
|
gui/SoundManager.h \
|
||||||
gui/FileTransferInfoWidget.h \
|
gui/FileTransferInfoWidget.h \
|
||||||
gui/RsAutoUpdatePage.h \
|
gui/RsAutoUpdatePage.h \
|
||||||
gui/HelpDialog.h \
|
gui/HelpDialog.h \
|
||||||
gui/InfoDialog.h \
|
gui/InfoDialog.h \
|
||||||
gui/LogoBar.h \
|
gui/LogoBar.h \
|
||||||
gui/xprogressbar.h \
|
gui/xprogressbar.h \
|
||||||
gui/plugins/PluginInterface.h \
|
gui/plugins/PluginInterface.h \
|
||||||
gui/im_history/ImHistoryBrowser.h \
|
gui/im_history/ImHistoryBrowser.h \
|
||||||
gui/im_history/IMHistoryKeeper.h \
|
gui/im_history/IMHistoryKeeper.h \
|
||||||
gui/im_history/IMHistoryReader.h \
|
gui/im_history/IMHistoryReader.h \
|
||||||
gui/im_history/IMHistoryItem.h \
|
gui/im_history/IMHistoryItem.h \
|
||||||
gui/im_history/IMHistoryItemDelegate.h \
|
gui/im_history/IMHistoryItemDelegate.h \
|
||||||
gui/im_history/IMHistoryItemPainter.h \
|
gui/im_history/IMHistoryItemPainter.h \
|
||||||
gui/im_history/IMHistoryWriter.h \
|
gui/im_history/IMHistoryWriter.h \
|
||||||
lang/languagesupport.h \
|
lang/languagesupport.h \
|
||||||
util/stringutil.h \
|
util/stringutil.h \
|
||||||
util/win32.h \
|
util/win32.h \
|
||||||
util/RetroStyleLabel.h \
|
util/RetroStyleLabel.h \
|
||||||
util/dllexport.h \
|
util/dllexport.h \
|
||||||
util/NonCopyable.h \
|
util/NonCopyable.h \
|
||||||
util/rsutildll.h \
|
util/rsutildll.h \
|
||||||
util/dllexport.h \
|
util/dllexport.h \
|
||||||
util/global.h \
|
util/global.h \
|
||||||
util/rsqtutildll.h \
|
util/rsqtutildll.h \
|
||||||
util/Interface.h \
|
util/Interface.h \
|
||||||
util/PixmapMerging.h \
|
util/PixmapMerging.h \
|
||||||
util/MouseEventFilter.h \
|
util/MouseEventFilter.h \
|
||||||
util/EventFilter.h \
|
util/EventFilter.h \
|
||||||
util/Widget.h \
|
util/Widget.h \
|
||||||
util/rsversion.h \
|
util/rsversion.h \
|
||||||
util/RsAction.h \
|
util/RsAction.h \
|
||||||
util/printpreview.h \
|
util/printpreview.h \
|
||||||
util/log.h \
|
util/log.h \
|
||||||
util/misc.h \
|
util/misc.h \
|
||||||
gui/bwgraph/bwgraph.h \
|
gui/bwgraph/bwgraph.h \
|
||||||
gui/profile/ProfileView.h \
|
gui/profile/ProfileView.h \
|
||||||
gui/profile/ProfileEdit.h \
|
gui/profile/ProfileEdit.h \
|
||||||
gui/profile/ProfileWidget.h \
|
gui/profile/ProfileWidget.h \
|
||||||
gui/profile/StatusMessage.h \
|
gui/profile/StatusMessage.h \
|
||||||
gui/chat/PopupChatWindow.h \
|
gui/chat/PopupChatWindow.h \
|
||||||
gui/chat/PopupChatDialog.h \
|
gui/chat/PopupChatDialog.h \
|
||||||
gui/chat/HandleRichText.h \
|
gui/chat/HandleRichText.h \
|
||||||
gui/chat/ChatStyle.h \
|
gui/chat/ChatStyle.h \
|
||||||
gui/channels/CreateChannel.h \
|
gui/channels/CreateChannel.h \
|
||||||
gui/channels/ChannelDetails.h \
|
gui/channels/ChannelDetails.h \
|
||||||
gui/channels/CreateChannelMsg.h \
|
gui/channels/CreateChannelMsg.h \
|
||||||
gui/channels/EditChanDetails.h \
|
gui/channels/EditChanDetails.h \
|
||||||
gui/channels/ShareKey.h \
|
gui/channels/ShareKey.h \
|
||||||
gui/connect/ConfCertDialog.h \
|
gui/connect/ConfCertDialog.h \
|
||||||
gui/msgs/MessageComposer.h \
|
gui/msgs/MessageComposer.h \
|
||||||
gui/msgs/textformat.h \
|
gui/msgs/textformat.h \
|
||||||
gui/images/retroshare_win.rc.h \
|
gui/images/retroshare_win.rc.h \
|
||||||
gui/settings/rsharesettings.h \
|
gui/settings/rsharesettings.h \
|
||||||
gui/settings/RsharePeerSettings.h \
|
gui/settings/RsharePeerSettings.h \
|
||||||
gui/settings/rsettings.h \
|
gui/settings/rsettings.h \
|
||||||
gui/settings/rsettingswin.h \
|
gui/settings/rsettingswin.h \
|
||||||
gui/settings/GeneralPage.h \
|
gui/settings/GeneralPage.h \
|
||||||
@ -716,6 +720,8 @@ minimal {
|
|||||||
gui/settings/rsharesettings.cpp \
|
gui/settings/rsharesettings.cpp \
|
||||||
gui/common/rwindow.cpp \
|
gui/common/rwindow.cpp \
|
||||||
gui/common/StatusDefs.cpp \
|
gui/common/StatusDefs.cpp \
|
||||||
|
gui/common/PeerDefs.cpp \
|
||||||
|
gui/common/RSTreeWidgetItem.cpp \
|
||||||
gui/LogoBar.cpp \
|
gui/LogoBar.cpp \
|
||||||
gui/RsAutoUpdatePage.cpp \
|
gui/RsAutoUpdatePage.cpp \
|
||||||
gui/common/vmessagebox.cpp \
|
gui/common/vmessagebox.cpp \
|
||||||
@ -748,6 +754,8 @@ minimal {
|
|||||||
gui/settings/RsharePeerSettings.h \
|
gui/settings/RsharePeerSettings.h \
|
||||||
gui/common/rwindow.h \
|
gui/common/rwindow.h \
|
||||||
gui/common/StatusDefs.h \
|
gui/common/StatusDefs.h \
|
||||||
|
gui/common/PeerDefs.h \
|
||||||
|
gui/common/RSTreeWidgetItem.h \
|
||||||
gui/LogoBar.h \
|
gui/LogoBar.h \
|
||||||
gui/RsAutoUpdatePage.h \
|
gui/RsAutoUpdatePage.h \
|
||||||
gui/common/vmessagebox.h \
|
gui/common/vmessagebox.h \
|
||||||
|
|||||||
@ -35,9 +35,12 @@
|
|||||||
|
|
||||||
#include "gui/help/browser/helpbrowser.h"
|
#include "gui/help/browser/helpbrowser.h"
|
||||||
#include "gui/common/PeerDefs.h"
|
#include "gui/common/PeerDefs.h"
|
||||||
#include "gui/MainWindow.h"
|
|
||||||
#include "gui/common/StatusDefs.h"
|
#include "gui/common/StatusDefs.h"
|
||||||
|
|
||||||
|
#ifndef MINIMAL_RSGUI
|
||||||
|
#include "gui/MainWindow.h"
|
||||||
|
#endif // !MINIMAL_RSGUI
|
||||||
|
|
||||||
static QMap<std::string, ConfCertDialog*> instances;
|
static QMap<std::string, ConfCertDialog*> instances;
|
||||||
|
|
||||||
ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id)
|
ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id)
|
||||||
@ -73,10 +76,12 @@ ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlag
|
|||||||
connect(ui.trusthelpButton, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
|
connect(ui.trusthelpButton, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
|
||||||
connect(ui.signers_listWidget, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( listWidgetContextMenuPopup( QPoint ) ) );
|
connect(ui.signers_listWidget, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( listWidgetContextMenuPopup( QPoint ) ) );
|
||||||
|
|
||||||
|
#ifndef MINIMAL_RSGUI
|
||||||
MainWindow *w = MainWindow::getInstance();
|
MainWindow *w = MainWindow::getInstance();
|
||||||
if (w) {
|
if (w) {
|
||||||
connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
|
connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
|
||||||
}
|
}
|
||||||
|
#endif // !MINIMAL_RSGUI
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfCertDialog::~ConfCertDialog()
|
ConfCertDialog::~ConfCertDialog()
|
||||||
|
|||||||
@ -210,6 +210,8 @@ int main(int argc, char *argv[])
|
|||||||
MessengerWindow::showYourself();
|
MessengerWindow::showYourself();
|
||||||
|
|
||||||
rshare.setQuitOnLastWindowClosed(true);
|
rshare.setQuitOnLastWindowClosed(true);
|
||||||
|
|
||||||
|
splashScreen.hide();
|
||||||
#else
|
#else
|
||||||
Emoticons::load();
|
Emoticons::load();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user