Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Disabled own location display on Friends Frame.

Browse Source 
* Removed the Fixed size for Messages ListWidget
* Update stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-12-14 15:46:20 +00:00
parent ba6903150d
commit 2036f379de
11 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/FriendsDialog.cpp
View File

@ -215,7 +215,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
// add self nick and Avatar to Friends.
RsPeerDetails pd ;
if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) {
ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd));
ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()));
}
QString hlp_str = tr(

4
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -229,8 +229,10 @@ MessagesDialog::MessagesDialog(QWidget *parent)
QMenu *viewmenu = new QMenu();
viewmenu->addAction(ui.actionTextBesideIcon);
viewmenu->addAction(ui.actionIconOnly);
//viewmenu->addAction(ui.actionTextUnderIcon);
ui.viewtoolButton->setMenu(viewmenu);
// Set initial size of the splitter
ui.listSplitter->setStretchFactor(0, 0);
/* add filter actions */
ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject"));

29
retroshare-gui/src/gui/MessagesDialog.ui
View File

@ -11,16 +11,7 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -517,12 +508,6 @@
<enum>Qt::Horizontal</enum>
</property>
<widget class="QFrame" name="sideBarFrame">
<property name="maximumSize">
<size>
<width>160</width>
<height>16777215</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="horizontalSpacing">
<number>6</number>
@ -541,12 +526,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>160</width>
<height>130</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
@ -629,12 +608,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>160</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>

4
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -93,9 +93,9 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
{
QIcon icon ;
icon.addPixmap(QPixmap(":/images/exit_32.png")) ;
icon.addPixmap(QPixmap(":/images/door_in.png")) ;
unsubscribeButton->setIcon(icon) ;
unsubscribeButton->setIconSize(QSize(22,22)) ;
unsubscribeButton->setIconSize(QSize(24,24)) ;
}
/* Initialize splitter */

1
retroshare-gui/src/gui/images.qrc
View File

@ -20,6 +20,7 @@
<file>images/browsable_128_blue.png</file>
<file>images/blank_128_green.png</file>
<file>images/blank_128_blue.png</file>
<file>images/door_in.png</file>
<file>images/tor-logo.png</file>
<file>images/help/addafriend.png</file>
<file>images/help/addfriendkey.png</file>

BIN
retroshare-gui/src/gui/images/door_in.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

8
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -156,6 +156,14 @@ ChatLobbyWidget QGroupBox::title#lobbyinfo_groupBox
background: transparent;
}
ChatLobbyWidget QLabel#lobbyInfoLabel {
border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
}
ChatLobbyDialog QFrame#participantsFrame {
border: transparent;
}

8
retroshare-gui/src/qss/blue.qss
View File

@ -10,6 +10,14 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
border: 1px solid #87ADE4;
}
FriendsDialog QFrame#headFrame {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #E3EFFF, stop: 1 #87ADE4);
border: 1px solid #87ADE4;
border: 1px;
border-radius: 4px;
}
HeaderFrame {
background-image: url(:/images/headerFrame.png);
border: 0px;

7
retroshare-gui/src/qss/silver.qss
View File

@ -8,6 +8,13 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
stop: 0 #F9F9FF, stop: 1 #9F9DB9);
}
FriendsDialog QFrame#headFrame {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #F9F9FF, stop: 1 #9F9DB9);
border: 1px;
border-radius: 4px;
}
HeaderFrame {
background-image: url(:/images/headerFrame.png);
border: 0px;

7
retroshare-gui/src/qss/uus.qss
View File

@ -11,7 +11,12 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
border-image: url(qss/uus/uus.png);
}
FriendsDialog QFrame#headFrame {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #BDDF7D, stop: 1 #49881F);
border: 1px;
border-radius: 4px;
}
HeaderFrame {
background-image: url(:/images/headerFrame.png);

7
retroshare-gui/src/qss/yeah.qss
View File

@ -3,6 +3,13 @@
stop:0 lightgray, stop:1 darkgray);
}
FriendsDialog QFrame#headFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FBC957, stop:1 #D79704);
border: 1px;
border-radius: 4px;
}
QFrame#titleBarFrame, QFrame#toolBarFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FBC957, stop:1 #D79704);