From 22bfc3e821259e2e0f89b1de0cea57123b8518f0 Mon Sep 17 00:00:00 2001 From: drbob Date: Sat, 24 May 2008 23:11:37 +0000 Subject: [PATCH] Final Changes for V0.4.08a release: * Updated Version numbers. * Added chat styles to installer. * Fixed .at() call on map -> doesn't work on windows/MacOSX. * Tweaked default font back to 10 for chat. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@564 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/BlogDialog.cpp | 2 +- retroshare-gui/src/gui/chat/PopupChatDialog.cpp | 2 +- retroshare-gui/src/retroshare.nsi | 6 +++++- retroshare-gui/src/util/rsversion.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/BlogDialog.cpp b/retroshare-gui/src/gui/BlogDialog.cpp index d2e84e279..860c2e7f6 100644 --- a/retroshare-gui/src/gui/BlogDialog.cpp +++ b/retroshare-gui/src/gui/BlogDialog.cpp @@ -170,7 +170,7 @@ void BlogDialog::update(void) std::multimap::reverse_iterator blogIt = blogs[*it].rbegin(); addUser(*it); // add usr to Qwidget tree - if(blogs.at(*it).empty()) + if(blogs[*it].empty()) continue; for( ; blogIt != blogs[*it].rend(); blogIt++) diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 902bd7fc0..eb58211b8 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -111,7 +111,7 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name, ui.fontButton->setMenu(fontmenu);*/ mCurrentColor = Qt::black; - mCurrentFont = QFont("Comic Sans MS", 12); + mCurrentFont = QFont("Comic Sans MS", 10); colorChanged(mCurrentColor); setFont(); diff --git a/retroshare-gui/src/retroshare.nsi b/retroshare-gui/src/retroshare.nsi index 824fbe278..cb4ccddcc 100644 --- a/retroshare-gui/src/retroshare.nsi +++ b/retroshare-gui/src/retroshare.nsi @@ -2,7 +2,7 @@ ; Define your application name !define APPNAME "RetroShare" -!define VERSION "0.4.07a" +!define VERSION "0.4.08a" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}" ; Main Install settings @@ -177,6 +177,10 @@ Section $(sec_data) sec_data SetOutPath "$INSTDIR\emoticons\kopete\" File /r release\emoticons\kopete\*.* + ; Add Chat Style + SetOutPath "$INSTDIR\style\" + File /r release\style\*.* + SectionEnd Section $(sec_mplayer) sec_mplayer diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsversion.cpp index e601a8195..618740817 100644 --- a/retroshare-gui/src/util/rsversion.cpp +++ b/retroshare-gui/src/util/rsversion.cpp @@ -23,7 +23,7 @@ //#define USE_SVN_VERSIONS 1 -#define VERSION "0.4.07a" +#define VERSION "0.4.08a" #if USE_SVN_VERSIONS #include "svn_revision.h"