Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

switched to new (unifinished) friendlist code

Browse Source
This commit is contained in:
csoler 2019-06-25 23:11:12 +02:00
parent 38f6657c2f
commit 081a3a7023
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -199,7 +199,7 @@
</widget>
</item>
<item>
<widget class="FriendList" name="friendList" native="true">
<widget class="NewFriendList" name="friendList" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -353,11 +353,6 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>AvatarWidget</class>
<extends>QLabel</extends>
@ -365,9 +360,14 @@
<container>1</container>
</customwidget>
<customwidget>
<class>FriendList</class>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>ChatWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendList.h</header>
<header location="global">gui/chat/ChatWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
@ -382,9 +382,9 @@
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget>
<class>ChatWidget</class>
<class>NewFriendList</class>
<extends>QWidget</extends>
<header location="global">gui/chat/ChatWidget.h</header>
<header>NewFriendList.h</header>
<container>1</container>
</customwidget>
</customwidgets>

0
retroshare-gui/src/gui/common/FriendModel.cpp → retroshare-gui/src/gui/common/FriendListModel.cpp
View File

0
retroshare-gui/src/gui/common/FriendModel.h → retroshare-gui/src/gui/common/FriendListModel.h
View File

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -524,6 +524,8 @@ HEADERS += rshare.h \
gui/common/RSTreeView.h \
gui/common/AvatarWidget.h \
gui/common/FriendList.h \
gui/common/FriendListModel.h \
gui/common/NewFriendList.h \
gui/common/FriendSelectionWidget.h \
gui/common/FriendSelectionDialog.h \
gui/common/HashBox.h \
@ -844,6 +846,8 @@ SOURCES += main.cpp \
gui/common/RSTreeView.cpp \
gui/common/AvatarWidget.cpp \
gui/common/FriendList.cpp \
gui/common/FriendListModel.cpp \
gui/common/NewFriendList.cpp \
gui/common/FriendSelectionWidget.cpp \
gui/common/FriendSelectionDialog.cpp \
gui/common/HashBox.cpp \