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

added a forgotten time(NULL) in notifyqt.cpp

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-03-01 15:18:34 +00:00
parent 14dc2fbf7e
commit 56b3370cd1
5 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
CONFIG += qt gui uic qrc uitools CONFIG += qt gui uic qrc resources uitools
QT += network xml script QT += network xml script
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare TARGET = RetroShare
@ -16,6 +16,7 @@ linux-g++ {
LIBS += ../../../../lib/linux-g++/libminiupnpc.a LIBS += ../../../../lib/linux-g++/libminiupnpc.a
LIBS += ../../../../lib/linux-g++/libssl.a LIBS += ../../../../lib/linux-g++/libssl.a
LIBS += ../../../../lib/linux-g++/libcrypto.a LIBS += ../../../../lib/linux-g++/libcrypto.a
LIBS += -lQtUiTools
LIBS += -lz LIBS += -lz
} }
linux-g++-64 { linux-g++-64 {
@ -39,9 +40,12 @@ win32-x-g++ {
LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a
LIBS += ../../../../lib/win32-x-g++/libz.a LIBS += ../../../../lib/win32-x-g++/libz.a
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2 LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
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 *= WIN32
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
} }

10
retroshare-gui/src/gui/Preferences/rsharesettings.cpp
View file

@ -54,6 +54,7 @@
#define SETTING_NEWSFEED_FLAGS "NewsFeedFlags" #define SETTING_NEWSFEED_FLAGS "NewsFeedFlags"
#define SETTING_CHAT_FLAGS "ChatFlags" #define SETTING_CHAT_FLAGS "ChatFlags"
#define SETTING_NOTIFY_FLAGS "NotifyFlags" #define SETTING_NOTIFY_FLAGS "NotifyFlags"
#define SETTING_CHAT_AVATAR "ChatAvatar"
/* Default Retroshare Settings */ /* Default Retroshare Settings */
#define DEFAULT_OPACITY 100 #define DEFAULT_OPACITY 100
@ -114,6 +115,15 @@ RshareSettings::RshareSettings()
} }
/** Gets/sets the currently saved chat avatar. */
QImage RshareSettings::getChatAvatar() const
{
return value(SETTING_CHAT_AVATAR).value<QImage>();
}
void RshareSettings::setChatAvatar(const QImage& I)
{
setValue(SETTING_CHAT_AVATAR,I) ;
}
/** Gets the currently preferred language code for Rshare. */ /** Gets the currently preferred language code for Rshare. */
QString RshareSettings::getLanguageCode() QString RshareSettings::getLanguageCode()

15
retroshare-gui/src/gui/Preferences/rsharesettings.h
View file

@ -1,7 +1,7 @@
/**************************************************************** /****************************************************************
* This file is distributed under the following license: * This file is distributed under the following license:
* *
* Copyright (c) 2006-2007, crypton * Copyright (c) 2006-2007, crypton
* Copyright (c) 2006, Matt Edman, Justin Hipple * Copyright (c) 2006, Matt Edman, Justin Hipple
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -75,8 +75,15 @@ public:
/** Returns true if RetroShare should start on system boot. */ /** Returns true if RetroShare should start on system boot. */
bool runRetroshareOnBoot(); bool runRetroshareOnBoot();
/** Set whether to run RetroShare on system boot. */ /** Set whether to run RetroShare on system boot. */
void setRunRetroshareOnBoot(bool run); void setRunRetroshareOnBoot(bool run);
/** Returns the chat avatar. Returns a null image if no avatar is saved. */
QImage getChatAvatar() const ;
/** set the chat avatar. Returns a null image if no avatar is saved. */
void setChatAvatar(const QImage&) ;
/* Get the destination log file. */ /* Get the destination log file. */

3
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -86,7 +86,7 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
// Create the status bar // Create the status bar
std::ostringstream statusstr; std::ostringstream statusstr;
statusstr << "Chatting with: " << dialogName << " !!! " << id; statusstr << "Chatting with " << dialogName << " (" << id << ")" ;
statusBar()->showMessage(QString::fromStdString(statusstr.str())); statusBar()->showMessage(QString::fromStdString(statusstr.str()));
ui.textBrowser->setOpenExternalLinks ( false ); ui.textBrowser->setOpenExternalLinks ( false );
@ -606,6 +606,7 @@ void PopupChatDialog::updateAvatar()
void PopupChatDialog::getAvatar() void PopupChatDialog::getAvatar()
{ {
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)"); QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
if(!fileName.isEmpty()) if(!fileName.isEmpty())
{ {
picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio); picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio);

2
retroshare-gui/src/rsiface/notifyqt.cpp
View file

@ -144,6 +144,8 @@ void NotifyQt::UpdateGUI()
displayChannels(); displayChannels();
} }
lastTs = time(NULL) ;
static bool already_updated = false ; // these only update once at start because they may already have been set before static bool already_updated = false ; // these only update once at start because they may already have been set before
// the gui is running, then they get updated by callbacks. // the gui is running, then they get updated by callbacks.
if(!already_updated) if(!already_updated)