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

Removed maximum value from chat lobby participants list.

Browse source 
Saved size of participants list in profile.
Removed show/hide button to get more space. The participants list can be colapsed by moving the splitter to the right frame border.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-05-02 00:22:30 +00:00
parent 30ead08a1d
commit 735a27f8da
6 changed files with 9 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

26
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -56,7 +56,6 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
connect(ui.participantsFrameButton, SIGNAL(toggled(bool)), this, SLOT(showParticipantsFrame(bool)));
//connect(ui.actionChangeNickname, SIGNAL(triggered()), this, SLOT(changeNickname()));
connect(ui.participantsList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(participantsTreeWidgetCustomPopupMenu(QPoint)));
connect(ui.participantsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(participantsTreeWidgetDoubleClicked(QTreeWidgetItem*,int)));
@ -224,9 +223,6 @@ void ChatLobbyDialog::init()
lastUpdateListTime = 0;
/* Hide or show the participants frames */
showParticipantsFrame(PeerSettings->getShowParticipantsFrame(ChatId(lobbyId)));
// add to window
dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->addChatPage(this) ;
@ -268,8 +264,14 @@ void ChatLobbyDialog::processSettings(bool load)
if (load) {
// load settings
// state of splitter
ui.splitter->restoreState(Settings->value("splitter").toByteArray());
} else {
// save settings
// state of splitter
Settings->setValue("splitter", ui.splitter->saveState());
}
Settings->endGroup();
@ -695,19 +697,3 @@ void ChatLobbyDialog::showDialog(uint chatflags)
dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->setCurrentChatPage(this) ;
}
}
void ChatLobbyDialog::showParticipantsFrame(bool show)
{
ui.participantsFrame->setVisible(show);
ui.participantsFrameButton->setChecked(show);
if (show) {
ui.participantsFrameButton->setToolTip(tr("Hide Participants"));
ui.participantsFrameButton->setIcon(QIcon(":images/show_toolbox_frame.png"));
} else {
ui.participantsFrameButton->setToolTip(tr("Show Participants"));
ui.participantsFrameButton->setIcon(QIcon(":images/hide_toolbox_frame.png"));
}
PeerSettings->setShowParticipantsFrame(ChatId(lobbyId), show);
}

1
retroshare-gui/src/gui/chat/ChatLobbyDialog.h
View file

@ -48,7 +48,6 @@ public:
ChatLobbyId id() const { return lobbyId ;}
private slots:
void showParticipantsFrame(bool show);
void participantsTreeWidgetCustomPopupMenu( QPoint point );
void inviteFriends() ;
void leaveLobby() ;

74
retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
View file

@ -52,12 +52,6 @@
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
@ -85,12 +79,6 @@
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -132,68 +120,6 @@
</widget>
</widget>
</item>
<item>
<widget class="QFrame" name="leftsideFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>14</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="participantsFrameButton">
<property name="minimumSize">
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>14</width>
<height>31</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>31</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>12</width>
<height>335</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
<action name="actionChangeNickname">
<property name="text">

10
retroshare-gui/src/gui/settings/RsharePeerSettings.cpp
View file

@ -240,16 +240,6 @@ void RsharePeerSettings::setShowAvatarFrame(const ChatId& chatId, bool value)
return set(chatId, "ShowAvatarFrame", value);
}
bool RsharePeerSettings::getShowParticipantsFrame(const ChatId& chatId)
{
return get(chatId, "ShowParticipantsFrame", true).toBool();
}
void RsharePeerSettings::setShowParticipantsFrame(const ChatId& chatId, bool value)
{
return set(chatId, "ShowParticipantsFrame", value);
}
void RsharePeerSettings::getStyle(const ChatId& chatId, const QString &name, RSStyle &style)
{
std::string settingsId;

3
retroshare-gui/src/gui/settings/RsharePeerSettings.h
View file

@ -50,9 +50,6 @@ public:
bool getShowAvatarFrame(const ChatId& chatId);
void setShowAvatarFrame(const ChatId& chatId, bool value);
bool getShowParticipantsFrame(const ChatId& chatId);
void setShowParticipantsFrame(const ChatId& chatId, bool value);
void getStyle(const ChatId& chatId, const QString &name, RSStyle &style);
void setStyle(const ChatId& chatId, const QString &name, RSStyle &style);