mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-07 14:12:43 -04:00
Removed maximum value from chat lobby participants list.
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:
parent
30ead08a1d
commit
735a27f8da
6 changed files with 9 additions and 109 deletions
4
TODO.txt
4
TODO.txt
|
@ -71,10 +71,12 @@ To be done
|
||||||
the big subscribe button on the top, but never used.
|
the big subscribe button on the top, but never used.
|
||||||
generally,we have 2 panels here, both semi-empty. need to compact all the stuff
|
generally,we have 2 panels here, both semi-empty. need to compact all the stuff
|
||||||
|
|
||||||
0031 [ ] chats - participant list can't be extended in wide.
|
0031 [X] chats - participant list can't be extended in wide.
|
||||||
show/hide button is almost invisible. make it more big. but it takes space in width, so move it to bar with lobby name.
|
show/hide button is almost invisible. make it more big. but it takes space in width, so move it to bar with lobby name.
|
||||||
however, the lobby name bar also seems redundant. so maybe the button's final place must domewhere in the lower button bar.
|
however, the lobby name bar also seems redundant. so maybe the button's final place must domewhere in the lower button bar.
|
||||||
|
|
||||||
|
0031a[ ] ... the lobby name bar also seems redundant ....
|
||||||
|
|
||||||
0032 [ ] In Network->friend list. Remove "[Connected]" to location names. Takes room and isn't useful since the text is in bold
|
0032 [ ] In Network->friend list. Remove "[Connected]" to location names. Takes room and isn't useful since the text is in bold
|
||||||
when connected. Also put the avatar column first. Remove the "Busy" and "Idle" text since they are shown as icon already and
|
when connected. Also put the avatar column first. Remove the "Busy" and "Idle" text since they are shown as icon already and
|
||||||
set them as tooltip => lots of saved space.
|
set them as tooltip => lots of saved space.
|
||||||
|
|
|
@ -56,7 +56,6 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
|
||||||
/* Invoke Qt Designer generated QObject setup routine */
|
/* Invoke Qt Designer generated QObject setup routine */
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
|
|
||||||
connect(ui.participantsFrameButton, SIGNAL(toggled(bool)), this, SLOT(showParticipantsFrame(bool)));
|
|
||||||
//connect(ui.actionChangeNickname, SIGNAL(triggered()), this, SLOT(changeNickname()));
|
//connect(ui.actionChangeNickname, SIGNAL(triggered()), this, SLOT(changeNickname()));
|
||||||
connect(ui.participantsList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(participantsTreeWidgetCustomPopupMenu(QPoint)));
|
connect(ui.participantsList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(participantsTreeWidgetCustomPopupMenu(QPoint)));
|
||||||
connect(ui.participantsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(participantsTreeWidgetDoubleClicked(QTreeWidgetItem*,int)));
|
connect(ui.participantsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(participantsTreeWidgetDoubleClicked(QTreeWidgetItem*,int)));
|
||||||
|
@ -224,9 +223,6 @@ void ChatLobbyDialog::init()
|
||||||
|
|
||||||
lastUpdateListTime = 0;
|
lastUpdateListTime = 0;
|
||||||
|
|
||||||
/* Hide or show the participants frames */
|
|
||||||
showParticipantsFrame(PeerSettings->getShowParticipantsFrame(ChatId(lobbyId)));
|
|
||||||
|
|
||||||
// add to window
|
// add to window
|
||||||
|
|
||||||
dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->addChatPage(this) ;
|
dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->addChatPage(this) ;
|
||||||
|
@ -268,8 +264,14 @@ void ChatLobbyDialog::processSettings(bool load)
|
||||||
|
|
||||||
if (load) {
|
if (load) {
|
||||||
// load settings
|
// load settings
|
||||||
|
|
||||||
|
// state of splitter
|
||||||
|
ui.splitter->restoreState(Settings->value("splitter").toByteArray());
|
||||||
} else {
|
} else {
|
||||||
// save settings
|
// save settings
|
||||||
|
|
||||||
|
// state of splitter
|
||||||
|
Settings->setValue("splitter", ui.splitter->saveState());
|
||||||
}
|
}
|
||||||
|
|
||||||
Settings->endGroup();
|
Settings->endGroup();
|
||||||
|
@ -695,19 +697,3 @@ void ChatLobbyDialog::showDialog(uint chatflags)
|
||||||
dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->setCurrentChatPage(this) ;
|
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);
|
|
||||||
}
|
|
||||||
|
|
|
@ -48,7 +48,6 @@ public:
|
||||||
ChatLobbyId id() const { return lobbyId ;}
|
ChatLobbyId id() const { return lobbyId ;}
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void showParticipantsFrame(bool show);
|
|
||||||
void participantsTreeWidgetCustomPopupMenu( QPoint point );
|
void participantsTreeWidgetCustomPopupMenu( QPoint point );
|
||||||
void inviteFriends() ;
|
void inviteFriends() ;
|
||||||
void leaveLobby() ;
|
void leaveLobby() ;
|
||||||
|
|
|
@ -52,12 +52,6 @@
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>140</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<property name="leftMargin">
|
<property name="leftMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
|
@ -85,12 +79,6 @@
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>140</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="contextMenuPolicy">
|
<property name="contextMenuPolicy">
|
||||||
<enum>Qt::CustomContextMenu</enum>
|
<enum>Qt::CustomContextMenu</enum>
|
||||||
</property>
|
</property>
|
||||||
|
@ -132,68 +120,6 @@
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
<action name="actionChangeNickname">
|
<action name="actionChangeNickname">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|
|
@ -240,16 +240,6 @@ void RsharePeerSettings::setShowAvatarFrame(const ChatId& chatId, bool value)
|
||||||
return set(chatId, "ShowAvatarFrame", 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)
|
void RsharePeerSettings::getStyle(const ChatId& chatId, const QString &name, RSStyle &style)
|
||||||
{
|
{
|
||||||
std::string settingsId;
|
std::string settingsId;
|
||||||
|
|
|
@ -50,9 +50,6 @@ public:
|
||||||
bool getShowAvatarFrame(const ChatId& chatId);
|
bool getShowAvatarFrame(const ChatId& chatId);
|
||||||
void setShowAvatarFrame(const ChatId& chatId, bool value);
|
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 getStyle(const ChatId& chatId, const QString &name, RSStyle &style);
|
||||||
void setStyle(const ChatId& chatId, const QString &name, RSStyle &style);
|
void setStyle(const ChatId& chatId, const QString &name, RSStyle &style);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue