mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Remove fixed size issues with the invite/leave buttons on dark stylesheets
Removed fixed size issues with the invite/leave buttons on dark stylesheets Added new context menu icons for Enter & join Chat rooms
This commit is contained in:
parent
c22524d5d1
commit
cdc12c03a4
1486
.gitignore
vendored
1486
.gitignore
vendored
File diff suppressed because it is too large
Load Diff
@ -71,14 +71,14 @@
|
|||||||
#define IMAGE_CREATE ""
|
#define IMAGE_CREATE ""
|
||||||
#define IMAGE_PUBLIC ":/icons/png/chats.png"
|
#define IMAGE_PUBLIC ":/icons/png/chats.png"
|
||||||
#define IMAGE_PRIVATE ":/icons/png/chats-private.png"
|
#define IMAGE_PRIVATE ":/icons/png/chats-private.png"
|
||||||
#define IMAGE_SUBSCRIBE ":/images/edit_add24.png"
|
#define IMAGE_SUBSCRIBE ":/icons/png/enter.png"
|
||||||
#define IMAGE_UNSUBSCRIBE ":/images/cancel.png"
|
#define IMAGE_UNSUBSCRIBE ":/icons/png/leave2.png"
|
||||||
#define IMAGE_PEER_ENTERING ":images/user/add_user24.png"
|
#define IMAGE_PEER_ENTERING ":images/user/add_user24.png"
|
||||||
#define IMAGE_PEER_LEAVING ":images/user/remove_user24.png"
|
#define IMAGE_PEER_LEAVING ":images/user/remove_user24.png"
|
||||||
#define IMAGE_TYPING ":images/typing.png"
|
#define IMAGE_TYPING ":images/typing.png"
|
||||||
#define IMAGE_MESSAGE ":images/chat.png"
|
#define IMAGE_MESSAGE ":images/chat.png"
|
||||||
#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
|
#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
|
||||||
#define IMAGE_COPYRSLINK ":/images/copyrslink.png"
|
#define IMAGE_COPYRSLINK ":/icons/png/copy.png"
|
||||||
|
|
||||||
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
|
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
|
||||||
: RsAutoUpdatePage(5000, parent, flags)
|
: RsAutoUpdatePage(5000, parent, flags)
|
||||||
|
@ -132,8 +132,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
|
|||||||
// Add a button to invite friends.
|
// Add a button to invite friends.
|
||||||
//
|
//
|
||||||
inviteFriendsButton = new QToolButton ;
|
inviteFriendsButton = new QToolButton ;
|
||||||
inviteFriendsButton->setMinimumSize(icon_size);
|
//inviteFriendsButton->setMinimumSize(icon_size);
|
||||||
inviteFriendsButton->setMaximumSize(icon_size);
|
//inviteFriendsButton->setMaximumSize(icon_size);
|
||||||
inviteFriendsButton->setText(QString()) ;
|
inviteFriendsButton->setText(QString()) ;
|
||||||
inviteFriendsButton->setAutoRaise(true) ;
|
inviteFriendsButton->setAutoRaise(true) ;
|
||||||
inviteFriendsButton->setToolTip(tr("Invite friends to this lobby"));
|
inviteFriendsButton->setToolTip(tr("Invite friends to this lobby"));
|
||||||
@ -177,8 +177,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
|
|||||||
connect(ownIdChooser,SIGNAL(currentIndexChanged(int)),this,SLOT(changeNickname())) ;
|
connect(ownIdChooser,SIGNAL(currentIndexChanged(int)),this,SLOT(changeNickname())) ;
|
||||||
|
|
||||||
unsubscribeButton = new QToolButton;
|
unsubscribeButton = new QToolButton;
|
||||||
unsubscribeButton->setMinimumSize(icon_size);
|
//unsubscribeButton->setMinimumSize(icon_size);
|
||||||
unsubscribeButton->setMaximumSize(icon_size);
|
//unsubscribeButton->setMaximumSize(icon_size);
|
||||||
unsubscribeButton->setText(QString()) ;
|
unsubscribeButton->setText(QString()) ;
|
||||||
unsubscribeButton->setAutoRaise(true) ;
|
unsubscribeButton->setAutoRaise(true) ;
|
||||||
unsubscribeButton->setToolTip(tr("Leave this chat room (Unsubscribe)"));
|
unsubscribeButton->setToolTip(tr("Leave this chat room (Unsubscribe)"));
|
||||||
|
@ -807,17 +807,20 @@ border-image: url(:/images/closepressed.png)
|
|||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="pluginTitleFrameHLayout">
|
<layout class="QHBoxLayout" name="pluginTitleFrameHLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
<property name="leftMargin">
|
<property name="leftMargin">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="topMargin">
|
<property name="topMargin">
|
||||||
<number>2</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="rightMargin">
|
<property name="rightMargin">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>2</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -80,6 +80,7 @@
|
|||||||
<file>icons/png/chat-lobbies.png</file>
|
<file>icons/png/chat-lobbies.png</file>
|
||||||
<file>icons/png/circles.png</file>
|
<file>icons/png/circles.png</file>
|
||||||
<file>icons/png/empty-circle.png</file>
|
<file>icons/png/empty-circle.png</file>
|
||||||
|
<file>icons/png/enter.png</file>
|
||||||
<file>icons/png/exit.png</file>
|
<file>icons/png/exit.png</file>
|
||||||
<file>icons/png/feedreader-notify.png</file>
|
<file>icons/png/feedreader-notify.png</file>
|
||||||
<file>icons/png/feedreader.png</file>
|
<file>icons/png/feedreader.png</file>
|
||||||
@ -98,6 +99,7 @@
|
|||||||
<file>icons/png/invite.png</file>
|
<file>icons/png/invite.png</file>
|
||||||
<file>icons/png/keyring.png</file>
|
<file>icons/png/keyring.png</file>
|
||||||
<file>icons/png/leave.png</file>
|
<file>icons/png/leave.png</file>
|
||||||
|
<file>icons/png/leave2.png</file>
|
||||||
<file>icons/png/messages-notify.png</file>
|
<file>icons/png/messages-notify.png</file>
|
||||||
<file>icons/png/messages.png</file>
|
<file>icons/png/messages.png</file>
|
||||||
<file>icons/png/microphone_mute.png</file>
|
<file>icons/png/microphone_mute.png</file>
|
||||||
|
BIN
retroshare-gui/src/gui/icons/png/enter.png
Normal file
BIN
retroshare-gui/src/gui/icons/png/enter.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
BIN
retroshare-gui/src/gui/icons/png/leave2.png
Normal file
BIN
retroshare-gui/src/gui/icons/png/leave2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in New Issue
Block a user