Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile minimal version.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-12 15:20:46 +00:00
parent 60746b5702
commit 64ff88ce72
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,6 +651,7 @@ minimal {
gui/help/browser/helpbrowser.cpp \ gui/help/browser/helpbrowser.cpp \
gui/help/browser/helptextbrowser.cpp \ gui/help/browser/helptextbrowser.cpp \
gui/settings/rsettings.cpp \ gui/settings/rsettings.cpp \
gui/settings/RsharePeerSettings.cpp \
gui/settings/rsharesettings.cpp \ gui/settings/rsharesettings.cpp \
gui/common/rwindow.cpp \ gui/common/rwindow.cpp \
gui/common/StatusDefs.cpp \ gui/common/StatusDefs.cpp \
@ -683,6 +684,7 @@ minimal {
gui/help/browser/helptextbrowser.h \ gui/help/browser/helptextbrowser.h \
gui/settings/rsettings.h \ gui/settings/rsettings.h \
gui/settings/rsharesettings.h \ gui/settings/rsharesettings.h \
gui/settings/RsharePeerSettings.h \
gui/common/rwindow.h \ gui/common/rwindow.h \
gui/common/StatusDefs.h \ gui/common/StatusDefs.h \
gui/LogoBar.h \ gui/LogoBar.h \

15
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -462,7 +462,9 @@ void MessengerWindow::insertPeers()
} }
std::list<std::string> privateChatIds; std::list<std::string> privateChatIds;
#ifndef MINIMAL_RSGUI
rsMsgs->getPrivateChatQueueIds(privateChatIds); rsMsgs->getPrivateChatQueueIds(privateChatIds);
#endif // MINIMAL_RSGUI
rsPeers->getGPGAcceptedList(gpgFriends); rsPeers->getGPGAcceptedList(gpgFriends);
@ -615,13 +617,14 @@ void MessengerWindow::insertPeers()
QFont font1; QFont font1;
font1.setBold(true); font1.setBold(true);
gpg_item->setIcon(COLUMN_NAME,(StatusDefs::images(RS_STATUS_ONLINE)));
gpg_item->setToolTip(COLUMN_NAME, StatusDefs::tooltip(RS_STATUS_ONLINE)); gpg_item->setToolTip(COLUMN_NAME, StatusDefs::tooltip(RS_STATUS_ONLINE));
gpg_item->setData(COLUMN_NAME, ROLE_SORT, BuildStateSortString(sortState, gpg_item->text(COLUMN_NAME), PEER_STATE_ONLINE)); gpg_item->setData(COLUMN_NAME, ROLE_SORT, BuildStateSortString(sortState, gpg_item->text(COLUMN_NAME), PEER_STATE_ONLINE));
for(i = 0; i < COLUMN_COUNT; i++) { QColor textColor = StatusDefs::textColor(RS_STATUS_ONLINE);
gpg_item->setTextColor(i,(Qt::darkBlue)); QFont font = StatusDefs::font(RS_STATUS_ONLINE);
gpg_item->setFont(i,font1); for(int i = 0; i < COLUMN_COUNT; i++) {
gpg_item -> setTextColor(i, textColor);
gpg_item -> setFont(i, font);
} }
#endif // MINIMAL_RSGUI #endif // MINIMAL_RSGUI
@ -675,7 +678,9 @@ void MessengerWindow::insertPeers()
if (gpg_connected) { if (gpg_connected) {
gpg_item->setHidden(false); gpg_item->setHidden(false);
#ifndef MINIMAL_RSGUI #ifdef MINIMAL_RSGUI
gpgIcon = QIcon(StatusDefs::imageIM(RS_STATUS_ONLINE));
#else
int bestPeerState = 0; // for gpg item int bestPeerState = 0; // for gpg item
std::string bestSslId; // for gpg item std::string bestSslId; // for gpg item
unsigned int bestRSState = 0; // for gpg item unsigned int bestRSState = 0; // for gpg item