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

rename strings and functions

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-02-28 15:30:13 +00:00
parent 311e783f14
commit 0a25b291f3
3 changed files with 78 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

122
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
View file

@ -49,10 +49,10 @@ BlogsDialog::BlogsDialog(QWidget *parent)
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
setupUi(this); setupUi(this);
connect(actionCreate_Channel, SIGNAL(triggered()), this, SLOT(createChannel())); connect(actionCreate_Blog, SIGNAL(triggered()), this, SLOT(createBlog()));
connect(postButton, SIGNAL(clicked()), this, SLOT(createMsg())); connect(postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
connect(subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeChannel ( void ) ) ); connect(subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeBlog ( void ) ) );
connect(unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) ); connect(unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeBlog ( void ) ) );
mBlogId = ""; mBlogId = "";
@ -82,15 +82,15 @@ BlogsDialog::BlogsDialog(QWidget *parent)
model->appendRow(item3); model->appendRow(item3);
model->appendRow(item4); model->appendRow(item4);
connect(treeView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(selectChannel(const QModelIndex &))); connect(treeView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(selectBlog(const QModelIndex &)));
connect(treeView, SIGNAL(activated(const QModelIndex &)), this, SLOT(toggleSelection(const QModelIndex &))); connect(treeView, SIGNAL(activated(const QModelIndex &)), this, SLOT(toggleSelection(const QModelIndex &)));
connect(treeView, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( channelListCustomPopupMenu( QPoint ) ) ); connect(treeView, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( blogListCustomPopupMenu( QPoint ) ) );
//added from ahead //added from ahead
updateChannelList(); updateBlogList();
mChannelFont = QFont("MS SANS SERIF", 22); mBlogFont = QFont("MS SANS SERIF", 22);
nameLabel->setFont(mChannelFont); nameLabel->setFont(mBlogFont);
nameLabel->setMinimumWidth(20); nameLabel->setMinimumWidth(20);
@ -106,10 +106,10 @@ BlogsDialog::BlogsDialog(QWidget *parent)
item3->setForeground(QBrush(QColor(79, 79, 79))); item3->setForeground(QBrush(QColor(79, 79, 79)));
item4->setForeground(QBrush(QColor(79, 79, 79))); item4->setForeground(QBrush(QColor(79, 79, 79)));
QMenu *channelmenu = new QMenu(); QMenu *blogmenu = new QMenu();
channelmenu->addAction(actionCreate_Channel); blogmenu->addAction(actionCreate_Blog);
channelmenu->addSeparator(); blogmenu->addSeparator();
channelpushButton->setMenu(channelmenu); blogpushButton->setMenu(blogmenu);
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
@ -117,23 +117,23 @@ BlogsDialog::BlogsDialog(QWidget *parent)
timer->start(1000); timer->start(1000);
} }
void BlogsDialog::channelListCustomPopupMenu( QPoint point ) void BlogsDialog::blogListCustomPopupMenu( QPoint point )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
QAction *channeldetailsAct = new QAction(QIcon(":/images/info16.png"), tr( "Show Channel Details" ), this ); QAction *blogdetailsAct = new QAction(QIcon(":/images/info16.png"), tr( "Show Blog Details" ), this );
connect( channeldetailsAct , SIGNAL( triggered() ), this, SLOT( showChannelDetails() ) ); connect( blogdetailsAct , SIGNAL( triggered() ), this, SLOT( showBlogDetails() ) );
contextMnu.clear(); contextMnu.clear();
contextMnu.addAction( channeldetailsAct ); contextMnu.addAction( blogdetailsAct );
contextMnu.exec( mevent->globalPos() ); contextMnu.exec( mevent->globalPos() );
} }
void BlogsDialog::createChannel() void BlogsDialog::createBlog()
{ {
CreateBlog *cf = new CreateBlog(NULL, false); CreateBlog *cf = new CreateBlog(NULL, false);
@ -141,14 +141,14 @@ void BlogsDialog::createChannel()
cf->show(); cf->show();
} }
void BlogsDialog::channelSelection() void BlogsDialog::blogSelection()
{ {
/* which item was selected? */ /* which item was selected? */
/* update mBlogId */ /* update mBlogId */
updateChannelMsgs(); updateBlogMsgs();
} }
@ -168,7 +168,7 @@ void BlogsDialog::openChat(std::string peerId)
void BlogsDialog::openMsg(uint32_t type, std::string grpId, std::string inReplyTo) void BlogsDialog::openMsg(uint32_t type, std::string grpId, std::string inReplyTo)
{ {
#ifdef CHAN_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::openMsg()"; std::cerr << "BlogsDialog::openMsg()";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
@ -195,14 +195,14 @@ void BlogsDialog::createMsg()
return; return;
} }
void BlogsDialog::selectChannel( std::string cId) void BlogsDialog::selectBlog( std::string cId)
{ {
mBlogId = cId; mBlogId = cId;
updateChannelMsgs(); updateBlogMsgs();
} }
void BlogsDialog::selectChannel(const QModelIndex &index) void BlogsDialog::selectBlog(const QModelIndex &index)
{ {
int row = index.row(); int row = index.row();
int col = index.column(); int col = index.column();
@ -212,7 +212,7 @@ void BlogsDialog::selectChannel(const QModelIndex &index)
mBlogId = sibling.data().toString().toStdString(); mBlogId = sibling.data().toString().toStdString();
} else } else
mBlogId = index.data().toString().toStdString(); mBlogId = index.data().toString().toStdString();
updateChannelMsgs(); updateBlogMsgs();
} }
void BlogsDialog::checkUpdate() void BlogsDialog::checkUpdate()
@ -225,18 +225,18 @@ void BlogsDialog::checkUpdate()
if (rsBlogs->blogsChanged(blogIds)) if (rsBlogs->blogsChanged(blogIds))
{ {
/* update Blogs List */ /* update Blogs List */
updateChannelList(); updateBlogList();
it = std::find(blogIds.begin(), blogIds.end(), mBlogId); it = std::find(blogIds.begin(), blogIds.end(), mBlogId);
if (it != blogIds.end()) if (it != blogIds.end())
{ {
updateChannelMsgs(); updateBlogMsgs();
} }
} }
} }
void BlogsDialog::updateChannelList() void BlogsDialog::updateBlogList()
{ {
std::list<BlogInfo> channelList; std::list<BlogInfo> channelList;
@ -319,13 +319,13 @@ void BlogsDialog::updateChannelList()
/* now we have our lists ---> update entries */ /* now we have our lists ---> update entries */
updateChannelListOwn(adminIds); updateBlogListOwn(adminIds);
updateChannelListSub(subIds); updateBlogListSub(subIds);
updateChannelListPop(popIds); updateBlogListPop(popIds);
updateChannelListOther(otherIds); updateBlogListOther(otherIds);
} }
void BlogsDialog::updateChannelListOwn(std::list<std::string> &ids) void BlogsDialog::updateBlogListOwn(std::list<std::string> &ids)
{ {
std::list<std::string>::iterator iit; std::list<std::string>::iterator iit;
@ -333,8 +333,8 @@ void BlogsDialog::updateChannelListOwn(std::list<std::string> &ids)
model->item(OWN)->removeRows(0, model->item(OWN)->rowCount()); model->item(OWN)->removeRows(0, model->item(OWN)->rowCount());
for (iit = ids.begin(); iit != ids.end(); iit ++) { for (iit = ids.begin(); iit != ids.end(); iit ++) {
#ifdef CHAN_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::updateChannelListOwn(): " << *iit << std::endl; std::cerr << "BlogsDialog::updateBlogListOwn(): " << *iit << std::endl;
#endif #endif
QStandardItem *ownGroup = model->item(OWN); QStandardItem *ownGroup = model->item(OWN);
QList<QStandardItem *> channel; QList<QStandardItem *> channel;
@ -359,7 +359,7 @@ void BlogsDialog::updateChannelListOwn(std::list<std::string> &ids)
} }
} }
void BlogsDialog::updateChannelListSub(std::list<std::string> &ids) void BlogsDialog::updateBlogListSub(std::list<std::string> &ids)
{ {
std::list<std::string>::iterator iit; std::list<std::string>::iterator iit;
@ -367,8 +367,8 @@ void BlogsDialog::updateChannelListSub(std::list<std::string> &ids)
model->item(SUBSCRIBED)->removeRows(0, model->item(SUBSCRIBED)->rowCount()); model->item(SUBSCRIBED)->removeRows(0, model->item(SUBSCRIBED)->rowCount());
for (iit = ids.begin(); iit != ids.end(); iit ++) { for (iit = ids.begin(); iit != ids.end(); iit ++) {
#ifdef CHAN_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::updateChannelListSub(): " << *iit << std::endl; std::cerr << "BlogsDialog::updateBlogListSub(): " << *iit << std::endl;
#endif #endif
QStandardItem *ownGroup = model->item(SUBSCRIBED); QStandardItem *ownGroup = model->item(SUBSCRIBED);
QList<QStandardItem *> channel; QList<QStandardItem *> channel;
@ -382,9 +382,9 @@ void BlogsDialog::updateChannelListSub(std::list<std::string> &ids)
item1->setToolTip(tr("Popularity: %1\nFetches: %2\nAvailable: %3" item1->setToolTip(tr("Popularity: %1\nFetches: %2\nAvailable: %3"
).arg(QString::number(ci.pop)).arg(9999).arg(9999)); ).arg(QString::number(ci.pop)).arg(9999).arg(9999));
} else { } else {
item1->setData(QVariant(QString("Unknown Channel")), Qt::DisplayRole); item1->setData(QVariant(QString("Unknown Blog")), Qt::DisplayRole);
item2->setData(QVariant(QString::fromStdString(*iit)), Qt::DisplayRole); item2->setData(QVariant(QString::fromStdString(*iit)), Qt::DisplayRole);
item1->setToolTip("Unknown Channel\nNo Description"); item1->setToolTip("Unknown Blog\nNo Description");
} }
channel.append(item1); channel.append(item1);
@ -394,7 +394,7 @@ void BlogsDialog::updateChannelListSub(std::list<std::string> &ids)
} }
void BlogsDialog::updateChannelListPop(std::list<std::string> &ids) void BlogsDialog::updateBlogListPop(std::list<std::string> &ids)
{ {
std::list<std::string>::iterator iit; std::list<std::string>::iterator iit;
@ -402,8 +402,8 @@ void BlogsDialog::updateChannelListPop(std::list<std::string> &ids)
model->item(POPULAR)->removeRows(0, model->item(POPULAR)->rowCount()); model->item(POPULAR)->removeRows(0, model->item(POPULAR)->rowCount());
for (iit = ids.begin(); iit != ids.end(); iit ++) { for (iit = ids.begin(); iit != ids.end(); iit ++) {
#ifdef CHAN_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::updateChannelListPop(): " << *iit << std::endl; std::cerr << "BlogsDialog::updateBlogListPop(): " << *iit << std::endl;
#endif #endif
QStandardItem *ownGroup = model->item(POPULAR); QStandardItem *ownGroup = model->item(POPULAR);
QList<QStandardItem *> channel; QList<QStandardItem *> channel;
@ -417,9 +417,9 @@ void BlogsDialog::updateChannelListPop(std::list<std::string> &ids)
item1->setToolTip(tr("Popularity: %1\nFetches: %2\nAvailable: %3" item1->setToolTip(tr("Popularity: %1\nFetches: %2\nAvailable: %3"
).arg(QString::number(ci.pop)).arg(9999).arg(9999)); ).arg(QString::number(ci.pop)).arg(9999).arg(9999));
} else { } else {
item1->setData(QVariant(QString("Unknown Channel")), Qt::DisplayRole); item1->setData(QVariant(QString("Unknown Blog")), Qt::DisplayRole);
item2->setData(QVariant(QString::fromStdString(*iit)), Qt::DisplayRole); item2->setData(QVariant(QString::fromStdString(*iit)), Qt::DisplayRole);
item1->setToolTip("Unknown Channel\nNo Description"); item1->setToolTip("Unknown Blog\nNo Description");
} }
channel.append(item1); channel.append(item1);
@ -428,7 +428,7 @@ void BlogsDialog::updateChannelListPop(std::list<std::string> &ids)
} }
} }
void BlogsDialog::updateChannelListOther(std::list<std::string> &ids) void BlogsDialog::updateBlogListOther(std::list<std::string> &ids)
{ {
std::list<std::string>::iterator iit; std::list<std::string>::iterator iit;
@ -436,8 +436,8 @@ void BlogsDialog::updateChannelListOther(std::list<std::string> &ids)
model->item(OTHER)->removeRows(0, model->item(OTHER)->rowCount()); model->item(OTHER)->removeRows(0, model->item(OTHER)->rowCount());
for (iit = ids.begin(); iit != ids.end(); iit ++) { for (iit = ids.begin(); iit != ids.end(); iit ++) {
#ifdef CHAN_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::updateChannelListOther(): " << *iit << std::endl; std::cerr << "BlogsDialog::updateBlogListOther(): " << *iit << std::endl;
#endif #endif
QStandardItem *ownGroup = model->item(OTHER); QStandardItem *ownGroup = model->item(OTHER);
QList<QStandardItem *> channel; QList<QStandardItem *> channel;
@ -462,7 +462,7 @@ void BlogsDialog::updateChannelListOther(std::list<std::string> &ids)
} }
} }
void BlogsDialog::updateChannelMsgs() void BlogsDialog::updateBlogMsgs()
{ {
if (!rsBlogs) if (!rsBlogs)
return; return;
@ -481,12 +481,12 @@ void BlogsDialog::updateChannelMsgs()
iconLabel->setEnabled(true); iconLabel->setEnabled(true);
/* set textcolor for Blog name */ /* set textcolor for Blog name */
QString channelStr("<span style=\"font-size:22pt; font-weight:500;" QString blogStr("<span style=\"font-size:22pt; font-weight:500;"
"color:white;\">%1</span>"); "color:white;\">%1</span>");
/* set Blog name */ /* set Blog name */
QString cname = QString::fromStdWString(ci.blogName); QString bname = QString::fromStdWString(ci.blogName);
nameLabel->setText(channelStr.arg(cname)); nameLabel->setText(blogStr.arg(bname));
/* do buttons */ /* do buttons */
if (ci.blogFlags & RS_DISTRIB_SUBSCRIBED) if (ci.blogFlags & RS_DISTRIB_SUBSCRIBED)
@ -532,31 +532,31 @@ void BlogsDialog::updateChannelMsgs()
} }
void BlogsDialog::unsubscribeChannel() void BlogsDialog::unsubscribeBlog()
{ {
#ifdef BLOG_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::unsubscribeChannel()"; std::cerr << "BlogsDialog::unsubscribeBlog()";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (rsBlogs) if (rsBlogs)
{ {
rsBlogs->blogSubscribe(mBlogId, false); rsBlogs->blogSubscribe(mBlogId, false);
} }
updateChannelMsgs(); updateBlogMsgs();
} }
void BlogsDialog::subscribeChannel() void BlogsDialog::subscribeBlog()
{ {
#ifdef BLOG_DEBUG #ifdef BLOG_DEBUG
std::cerr << "BlogsDialog::subscribeChannel()"; std::cerr << "BlogsDialog::subscribeBlog()";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (rsBlogs) if (rsBlogs)
{ {
rsBlogs->blogSubscribe(mBlogId, true); rsBlogs->blogSubscribe(mBlogId, true);
} }
updateChannelMsgs(); updateBlogMsgs();
} }
@ -567,7 +567,7 @@ void BlogsDialog::toggleSelection(const QModelIndex &index)
selectionModel->select(index, QItemSelectionModel::Toggle); selectionModel->select(index, QItemSelectionModel::Toggle);
} }
void BlogsDialog::showChannelDetails() void BlogsDialog::showBlogDetails()
{ {
if (mBlogId == "") if (mBlogId == "")
{ {
@ -577,9 +577,9 @@ void BlogsDialog::showChannelDetails()
if (!rsBlogs) if (!rsBlogs)
return; return;
//static ChannelDetails *channelui = new ChannelDetails(); //static BlogDetails *blogui = new BlogDetails();
//channelui->showDetails(mBlogId); //blogui->showDetails(mBlogId);
//channelui->show(); //blogui->show();
} }

30
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h
View file

@ -53,37 +53,37 @@ virtual void openMsg(uint32_t type, std::string grpId, std::string inReplyTo);
public slots: public slots:
void selectChannel( std::string ); void selectBlog( std::string );
void selectChannel(const QModelIndex &); void selectBlog(const QModelIndex &);
void toggleSelection(const QModelIndex &); void toggleSelection(const QModelIndex &);
private slots: private slots:
void channelListCustomPopupMenu( QPoint point ); void blogListCustomPopupMenu( QPoint point );
void checkUpdate(); void checkUpdate();
void createChannel(); void createBlog();
//void sendMsg(); //void sendMsg();
void channelSelection(); void blogSelection();
void subscribeChannel(); void subscribeBlog();
void unsubscribeChannel(); void unsubscribeBlog();
void createMsg(); void createMsg();
void showChannelDetails(); void showBlogDetails();
private: private:
void updateChannelList(); void updateBlogList();
void updateChannelListOwn(std::list<std::string> &ids); void updateBlogListOwn(std::list<std::string> &ids);
void updateChannelListSub(std::list<std::string> &ids); void updateBlogListSub(std::list<std::string> &ids);
void updateChannelListPop(std::list<std::string> &ids); void updateBlogListPop(std::list<std::string> &ids);
void updateChannelListOther(std::list<std::string> &ids); void updateBlogListOther(std::list<std::string> &ids);
void updateChannelMsgs(); void updateBlogMsgs();
QStandardItemModel *model; QStandardItemModel *model;
@ -97,7 +97,7 @@ private:
std::list<BlogsMsgItem *> mBlogMsgItems; std::list<BlogsMsgItem *> mBlogMsgItems;
QFont mChannelFont; QFont mBlogFont;
QFont itemFont; QFont itemFont;
}; };

12
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.ui
View file

@ -161,7 +161,7 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="channelpushButton"> <widget class="QPushButton" name="blogpushButton">
<property name="toolTip"> <property name="toolTip">
<string>Add</string> <string>Add</string>
</property> </property>
@ -556,7 +556,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</layout> </layout>
</item> </item>
</layout> </layout>
<action name="actionCreate_Channel"> <action name="actionCreate_Blog">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>:/images/kblogger.png</normaloff>:/images/kblogger.png</iconset> <normaloff>:/images/kblogger.png</normaloff>:/images/kblogger.png</iconset>
@ -571,14 +571,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</widget> </widget>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>