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

Cleaned PopupChatDialog, NetworkDialog, SearchDialog, TransfersDialog, SharedFilesDialog, ChannelFeeds and updated german translation.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-13 00:27:50 +00:00
parent 5e2921ae98
commit 690194d38f
11 changed files with 3125 additions and 3283 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +126,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
connect(ui.fontButton, SIGNAL(clicked()), this, SLOT(getFont()));
connect(ui.colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
connect(ui.emoteiconButton, SIGNAL(clicked()), this, SLOT(smileyWidget()));
connect(ui.styleButton, SIGNAL(clicked()), SLOT(changeStyle()));
connect(ui.actionSave_Chat_History, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
connect(ui.textBrowser, SIGNAL(anchorClicked(const QUrl &)), SLOT(anchorClicked(const QUrl &)));
@ -134,9 +133,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(const QString&, int)), this, SLOT(updateStatus(const QString&, int)));
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewCustomStateString(const QString&, const QString&)), this, SLOT(updatePeersCustomStateString(const QString&, const QString&)));
// hide until it works
ui.styleButton->setVisible(false);
std::cerr << "Connecting custom context menu" << std::endl;
ui.chattextEdit->setContextMenuPolicy(Qt::CustomContextMenu) ;
connect(ui.chattextEdit,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint)));
@ -157,7 +153,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
ui.textitalicButton->setIcon(QIcon(QString(":/images/edit-italic.png")));
ui.fontButton->setIcon(QIcon(QString(":/images/fonts.png")));
ui.emoteiconButton->setIcon(QIcon(QString(":/images/emoticons/kopete/kopete020.png")));
ui.styleButton->setIcon(QIcon(QString(":/images/looknfeel.png")));
ui.textboldButton->setCheckable(true);
ui.textunderlineButton->setCheckable(true);
@ -165,10 +160,7 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
setAcceptDrops(true);
ui.chattextEdit->setAcceptDrops(false);
/*Disabled style Button when will switch chat style RetroShare will crash need to be fix */
//ui.styleButton->setEnabled(false);
QMenu * toolmenu = new QMenu();
toolmenu->addAction(ui.actionClear_Chat);
toolmenu->addAction(ui.actionSave_Chat_History);
@ -632,7 +624,7 @@ void PopupChatDialog::sendChat()
}
#ifdef CHAT_DEBUG
std::cout << "PopupChatDialog:sendChat " << styleHtm.toStdString() << std::endl;
std::cout << "PopupChatDialog:sendChat " << std::endl;
#endif
addChatMsg(ownId, time(NULL), msg);
@ -653,12 +645,12 @@ void PopupChatDialog::showAvatarFrame(bool show)
ui.avatarframe->setVisible(true);
ui.avatarFrameButton->setChecked(true);
ui.avatarFrameButton->setToolTip(tr("Hide Avatar"));
ui.avatarFrameButton->setIcon(QIcon(tr(":images/hide_toolbox_frame.png")));
ui.avatarFrameButton->setIcon(QIcon(":images/hide_toolbox_frame.png"));
} else {
ui.avatarframe->setVisible(false);
ui.avatarFrameButton->setChecked(false);
ui.avatarFrameButton->setToolTip(tr("Show Avatar"));
ui.avatarFrameButton->setIcon(QIcon(tr(":images/show_toolbox_frame.png")));
ui.avatarFrameButton->setIcon(QIcon(":images/show_toolbox_frame.png"));
}
}
@ -741,31 +733,6 @@ void PopupChatDialog::on_actionClear_Chat_triggered()
ui.textBrowser->clear();
}
void PopupChatDialog::changeStyle()
{
// QString newStyle = QFileDialog::getOpenFileName(this, tr("Open Style"),
// appDir + "/style/chat/",
// tr("Styles (*.htm)"));
// if(!newStyle.isEmpty())
// {
// QString wholeChat;
// styleHtm = newStyle;
//
//
// for(int i = 0; i < history.size(); i+=4)
// {
// QString formatMsg = loadEmptyStyle();
// wholeChat += formatMsg.replace("%timestamp%", history.at(i+1))
// .replace("%name%", history.at(i+2))
// .replace("%message%", history.at(i+3)) + "\n";
// }
// ui.textBrowser->setHtml(wholeChat);
// }
// QTextCursor cursor = ui.textBrowser->textCursor();
// cursor.movePosition(QTextCursor::End);
// ui.textBrowser->setTextCursor(cursor);
}
void PopupChatDialog::updatePeerAvatar(const std::string& peer_id)
{
#ifdef CHAT_DEBUG