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

Moved some internal stylesheets to the file Standard.qss.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-08-27 21:48:00 +00:00
parent 42781f6a3e
commit 6675bfe35e
21 changed files with 803 additions and 1056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -485,8 +485,8 @@ void ChannelFeed::updateChannelMsgs()
if (!rsChannels->getChannelInfo(mChannelId, ci)) { if (!rsChannels->getChannelInfo(mChannelId, ci)) {
postButton->setEnabled(false); postButton->setEnabled(false);
nameLabel->setText(tr("No Channel Selected")); nameLabel->setText(tr("No Channel Selected"));
iconLabel->setPixmap(QPixmap(":/images/channels.png")); logoLabel->setPixmap(QPixmap(":/images/channels.png"));
iconLabel->setEnabled(false); logoLabel->setEnabled(false);
return; return;
} }
@ -496,8 +496,8 @@ void ChannelFeed::updateChannelMsgs()
} else { } else {
chanImage = QPixmap(CHAN_DEFAULT_IMAGE); chanImage = QPixmap(CHAN_DEFAULT_IMAGE);
} }
iconLabel->setPixmap(chanImage); logoLabel->setPixmap(chanImage);
iconLabel->setEnabled(true); logoLabel->setEnabled(true);
/* set Channel name */ /* set Channel name */
nameLabel->setText(QString::fromStdWString(ci.channelName)); nameLabel->setText(QString::fromStdWString(ci.channelName));

37
retroshare-gui/src/gui/ChannelFeed.ui
View File

@ -23,15 +23,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#chanFrame{border: none;}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>2</number> <number>2</number>
@ -174,7 +165,7 @@
<number>4</number> <number>4</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="iconLabel"> <widget class="QLabel" name="logoLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -242,7 +233,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>398</width> <width>413</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -289,12 +280,6 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QFrame" name="toolBarFrame"> <widget class="QFrame" name="toolBarFrame">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -307,24 +292,6 @@
</property> </property>
<item> <item>
<widget class="QToolButton" name="postButton"> <widget class="QToolButton" name="postButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>

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

@ -17,7 +17,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="friendListLayout">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>6</number> <number>6</number>
</property> </property>
@ -160,7 +160,7 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="layoutWidget_1"> <widget class="QWidget" name="layoutWidget_1">
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="tabLayout">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>1</number> <number>1</number>
</property> </property>
@ -886,6 +886,18 @@ background: white;}</string>
</action> </action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>AvatarWidget</class>
<extends>QLabel</extends>
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>FriendList</class>
<extends>QWidget</extends>
<header>gui/common/FriendList.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LinkTextBrowser</class> <class>LinkTextBrowser</class>
<extends>QTextBrowser</extends> <extends>QTextBrowser</extends>
@ -903,18 +915,6 @@ background: white;}</string>
<header location="global">gui/chat/ChatTabWidget.h</header> <header location="global">gui/chat/ChatTabWidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>AvatarWidget</class>
<extends>QLabel</extends>
<header>gui/common/AvatarWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>FriendList</class>
<extends>QWidget</extends>
<header>gui/common/FriendList.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="images.qrc"/> <include location="images.qrc"/>

62
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -33,15 +33,6 @@
<height>82</height> <height>82</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin"> <property name="margin">
<number>6</number> <number>6</number>
@ -79,9 +70,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text">
<string/>
</property>
<property name="popupMode"> <property name="popupMode">
<enum>QToolButton::InstantPopup</enum> <enum>QToolButton::InstantPopup</enum>
</property> </property>
@ -155,24 +143,9 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="addIMAccountButton"> <widget class="QToolButton" name="addIMAccountButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Add a Friend</string> <string>Add a Friend</string>
</property> </property>
<property name="text">
<string/>
</property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/user/add_user24.png</normaloff>:/images/user/add_user24.png</iconset> <normaloff>:/images/user/add_user24.png</normaloff>:/images/user/add_user24.png</iconset>
@ -183,9 +156,6 @@
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -193,21 +163,9 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="shareButton"> <widget class="QToolButton" name="shareButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Share Files for your Friends</string> <string>Share Files for your Friends</string>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/friendsfolder24.png</normaloff>:/images/friendsfolder24.png</iconset> <normaloff>:/images/friendsfolder24.png</normaloff>:/images/friendsfolder24.png</iconset>
@ -247,20 +205,13 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="LogoBar" name="logoframe"> <widget class="LogoBar" name="logoFrame">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>65</height> <height>65</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#logoframe{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -270,14 +221,11 @@ border: 1px solid #CCCCCC;}</string>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QFrame" name="frame_2"> <widget class="QFrame" name="friendListFrame">
<property name="styleSheet">
<string notr="true">QFrame#frame_2{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
}</string>
</property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>3</number>
</property>
<item row="1" column="0"> <item row="1" column="0">
<widget class="FriendList" name="friendList" native="true"> <widget class="FriendList" name="friendList" native="true">
<property name="sizePolicy"> <property name="sizePolicy">

63
retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui
View File

@ -29,53 +29,6 @@
<height>130</height> <height>130</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#frame{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}
QToolButton, QPushButton, QComboBox {
border-image: url(:/images/btn_26.png) 4;
border-width: 4;
padding: 0px 6px;
font-size: 12px;
}
*{
color: black;
}
QComboBox QAbstractItemView {
background-color:white;
}
QComboBox::down-arrow {
image: url(:/images/combobox_arrow.png);
}
QComboBox:drop-down
{
subcontrol-origin: padding;
subcontrol-position: top right;
border-left-style: none;
border-top-right-radius: 1px;
border-bottom-right-radius: 1px;
}
QToolButton:hover, QPushButton:hover, QComboBox:hover {
border-image: url(:/images/btn_26_hover.png) 4;
}
QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
color:gray;
}
QToolButton:pressed, QPushButton:pressed{
border-image: url(:/images/btn_26_pressed.png) 4;
}</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -100,13 +53,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet">
<string notr="true">QWidget#frame{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}</string>
</property>
<property name="title"> <property name="title">
<string>Search Criteria</string> <string>Search Criteria</string>
</property> </property>
@ -137,12 +83,6 @@ border: 1px solid #CCCCCC;}</string>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -174,9 +114,6 @@ border: 1px solid #CCCCCC;}</string>
<property name="toolTip"> <property name="toolTip">
<string>Add a further search criterion.</string> <string>Add a further search criterion.</string>
</property> </property>
<property name="text">
<string/>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset> <normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset>

43
retroshare-gui/src/gui/advsearch/expressionwidget.ui
View File

@ -31,10 +31,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Expression Widget</string> <string>Expression Widget</string>
</property> </property>
<property name="styleSheet">
<string notr="true">QWidget#ExpressionWidget{
background: transparent;}</string>
</property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -56,12 +52,6 @@ background: transparent;}</string>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -78,12 +68,6 @@ background: transparent;}</string>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -100,12 +84,6 @@ background: transparent;}</string>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -122,34 +100,13 @@ background: transparent;}</string>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="deleteExprButton"> <widget class="QPushButton" name="deleteExprButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Delete this expression</string> <string>Delete this expression</string>
</property> </property>
<property name="text">
<string/>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset> <normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>

5
retroshare-gui/src/gui/channels/CreateChannel.cpp
View File

@ -47,8 +47,7 @@ CreateChannel::CreateChannel(QWidget *parent)
connect( ui.cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancelChannel( ) ) ); connect( ui.cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancelChannel( ) ) );
connect( ui.createButton, SIGNAL( clicked ( bool ) ), this, SLOT( createChannel( ) ) ); connect( ui.createButton, SIGNAL( clicked ( bool ) ), this, SLOT( createChannel( ) ) );
connect( ui.LogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); connect( ui.logoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo()));
connect( ui.ChannelLogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo()));
connect( ui.pubKeyShare_cb, SIGNAL( clicked() ), this, SLOT( setShareList( ) )); connect( ui.pubKeyShare_cb, SIGNAL( clicked() ), this, SLOT( setShareList( ) ));
if (!ui.pubKeyShare_cb->isChecked()) { if (!ui.pubKeyShare_cb->isChecked()) {
@ -150,5 +149,5 @@ void CreateChannel::addChannelLogo() // the same function as in EditChanDetails
picture = img; picture = img;
// to show the selected // to show the selected
ui.ChannelLogoButton->setIcon(picture); ui.logoLabel->setPixmap(picture);
} }

49
retroshare-gui/src/gui/channels/CreateChannel.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>696</width> <width>703</width>
<height>509</height> <height>611</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,24 +17,18 @@
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <property name="margin">
<number>0</number>
</property>
<item>
<widget class="HeaderFrame" name="headerFrame"/> <widget class="HeaderFrame" name="headerFrame"/>
</item> </item>
<item row="2" column="0"> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -284,7 +278,7 @@
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QToolButton" name="ChannelLogoButton"> <widget class="QLabel" name="logoLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -297,29 +291,22 @@
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="frameShape">
<string notr="true"> <enum>QFrame::StyledPanel</enum>
border: 2px solid white;
border-radius: 10px;
</string>
</property> </property>
<property name="text"> <property name="frameShadow">
<string/> <enum>QFrame::Raised</enum>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../images.qrc"> <pixmap resource="../images.qrc">:/images/channels.png</pixmap>
<normaloff>:/images/channels.png</normaloff>:/images/channels.png</iconset>
</property> </property>
<property name="iconSize"> <property name="scaledContents">
<size> <bool>true</bool>
<width>64</width>
<height>64</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="LogoButton"> <widget class="QPushButton" name="logoButton">
<property name="text"> <property name="text">
<string>Add Channel Logo</string> <string>Add Channel Logo</string>
</property> </property>

15
retroshare-gui/src/gui/channels/CreateChannelMsg.ui
View File

@ -139,9 +139,6 @@ p, li { white-space: pre-wrap; }
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text">
<string/>
</property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/thumb-default-video.png</pixmap> <pixmap resource="../images.qrc">:/images/thumb-default-video.png</pixmap>
</property> </property>
@ -298,7 +295,7 @@ p, li { white-space: pre-wrap; }
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>511</width> <width>511</width>
<height>28</height> <height>24</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -328,16 +325,6 @@ p, li { white-space: pre-wrap; }
<property name="toolTip"> <property name="toolTip">
<string>Drag and Drop Files from Search Results</string> <string>Drag and Drop Files from Search Results</string>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#fileFrame{border: 2px solid black;
background: white;}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3"/> <layout class="QGridLayout" name="gridLayout_3"/>
</widget> </widget>
</item> </item>

41
retroshare-gui/src/gui/channels/EditChanDetails.cpp
View File

@ -43,32 +43,12 @@ EditChanDetails::EditChanDetails(QWidget *parent, Qt::WFlags flags, std::string
connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog())); connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog()));
connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg()));
connect( ui.LogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo())); connect( ui.logoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo()));
connect( ui.ChannelLogoButton, SIGNAL(clicked() ), this , SLOT(addChannelLogo()));
ui.ChannelLogoButton->setDisabled(true); ui.logoButton->setDisabled(true);
ui.LogoButton->setDisabled(true); ui.logoLabel->setDisabled(true);
loadChannel(); loadChannel();
}
/**
Overloads the default show() slot so we can set opacity*/
void EditChanDetails::show()
{
if(!this->isVisible()) {
QDialog::show();
}
}
void EditChanDetails::closeEvent (QCloseEvent * event)
{
QWidget::closeEvent(event);
} }
void EditChanDetails::closeinfodlg() void EditChanDetails::closeinfodlg()
@ -76,10 +56,8 @@ void EditChanDetails::closeinfodlg()
close(); close();
} }
void EditChanDetails::loadChannel() void EditChanDetails::loadChannel()
{ {
if (!rsChannels) if (!rsChannels)
{ {
return; return;
@ -95,23 +73,21 @@ void EditChanDetails::loadChannel()
ui.DescriptiontextEdit->setText(QString::fromStdWString(ci.channelDesc)); ui.DescriptiontextEdit->setText(QString::fromStdWString(ci.channelDesc));
// Set Channel Logo // Set Channel Logo
QPixmap chanImage;
if(ci.pngImageLen != 0) if(ci.pngImageLen != 0)
{ {
QPixmap chanImage;
chanImage.loadFromData(ci.pngChanImage, ci.pngImageLen, "PNG"); chanImage.loadFromData(ci.pngChanImage, ci.pngImageLen, "PNG");
ui.ChannelLogoButton->setIcon(QIcon(chanImage));
} }
else else
{ {
QPixmap defaulImage(CHAN_DEFAULT_IMAGE); chanImage = QPixmap(CHAN_DEFAULT_IMAGE);
ui.ChannelLogoButton->setIcon(QIcon(defaulImage));
} }
ui.logoLabel->setPixmap(chanImage);
} }
void EditChanDetails::applyDialog() void EditChanDetails::applyDialog()
{ {
if(!rsChannels) if(!rsChannels)
return; return;
@ -124,7 +100,6 @@ void EditChanDetails::applyDialog()
ci.channelName = misc::removeNewLine(ui.nameline->text()).toStdWString(); ci.channelName = misc::removeNewLine(ui.nameline->text()).toStdWString();
ci.channelDesc = ui.DescriptiontextEdit->document()->toPlainText().toStdWString(); ci.channelDesc = ui.DescriptiontextEdit->document()->toPlainText().toStdWString();
/* reload now */ /* reload now */
rsChannels->channelEditInfo(mChannelId, ci); rsChannels->channelEditInfo(mChannelId, ci);
@ -134,7 +109,6 @@ void EditChanDetails::applyDialog()
return; return;
} }
void EditChanDetails::addChannelLogo() // the same function as in CreateChannel void EditChanDetails::addChannelLogo() // the same function as in CreateChannel
{ {
QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load channel logo"), 64, 64); QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load channel logo"), 64, 64);
@ -145,6 +119,5 @@ void EditChanDetails::addChannelLogo() // the same function as in CreateChannel
picture = img; picture = img;
// to show the selected // to show the selected
ui.ChannelLogoButton->setIcon(picture); ui.logoLabel->setPixmap(picture);
} }

16
retroshare-gui/src/gui/channels/EditChanDetails.h
View File

@ -31,40 +31,26 @@ class EditChanDetails : public QDialog
Q_OBJECT Q_OBJECT
public: public:
/** Default constructor */ /** Default constructor */
EditChanDetails(QWidget *parent = 0, Qt::WFlags flags = 0, std::string cId = ""); EditChanDetails(QWidget *parent = 0, Qt::WFlags flags = 0, std::string cId = "");
/** Default destructor */ /** Default destructor */
signals: signals:
void configChanged() ; void configChanged();
public slots:
/** Overloaded QWidget.show */
void show();
protected:
void closeEvent (QCloseEvent * event);
private slots: private slots:
void closeinfodlg(); void closeinfodlg();
void applyDialog(); void applyDialog();
void addChannelLogo(); void addChannelLogo();
private: private:
void loadChannel(); void loadChannel();
std::string mChannelId; std::string mChannelId;
QPixmap picture; QPixmap picture;
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::EditChanDetails ui; Ui::EditChanDetails ui;
}; };
#endif #endif

27
retroshare-gui/src/gui/channels/EditChanDetails.ui
View File

@ -116,7 +116,7 @@
</spacer> </spacer>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="LogoButton"> <widget class="QPushButton" name="logoButton">
<property name="text"> <property name="text">
<string>Add Channel Logo</string> <string>Add Channel Logo</string>
</property> </property>
@ -127,7 +127,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QToolButton" name="ChannelLogoButton"> <widget class="QLabel" name="logoLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -140,24 +140,17 @@
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="frameShape">
<string notr="true"> <enum>QFrame::StyledPanel</enum>
border: 2px solid white;
border-radius: 10px;
</string>
</property> </property>
<property name="text"> <property name="frameShadow">
<string/> <enum>QFrame::Raised</enum>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../images.qrc"> <pixmap resource="../images.qrc">:/images/channels.png</pixmap>
<normaloff>:/images/channels.png</normaloff>:/images/channels.png</iconset>
</property> </property>
<property name="iconSize"> <property name="scaledContents">
<size> <bool>true</bool>
<width>64</width>
<height>64</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>

30
retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
View File

@ -32,7 +32,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="leftsideframe"> <widget class="QFrame" name="leftsideFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -45,15 +45,6 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#frame{border: transparent}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
@ -110,15 +101,6 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">border: transparent;</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</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>
@ -133,15 +115,7 @@
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="QListWidget" name="participantsList"> <widget class="QListWidget" name="participantsList"/>
<property name="styleSheet">
<string notr="true">QListWidget{
border: 1px solid #B8B6B1;
border-radius: 6px;
background: white;
}</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

68
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -91,15 +91,15 @@ ChatWidget::ChatWidget(QWidget *parent) :
connect(ui->textBrowser, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTextBrowser(QPoint))); connect(ui->textBrowser, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTextBrowser(QPoint)));
connect(ui->chattextEdit, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); connect(ui->chatTextEdit, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint)));
// reset text and color after removing all characters from the QTextEdit and after calling QTextEdit::clear // reset text and color after removing all characters from the QTextEdit and after calling QTextEdit::clear
connect(ui->chattextEdit, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(chatCharFormatChanged())); connect(ui->chatTextEdit, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(chatCharFormatChanged()));
ui->infoframe->setVisible(false); ui->infoFrame->setVisible(false);
ui->statusmessagelabel->hide(); ui->statusMessageLabel->hide();
setAcceptDrops(true); setAcceptDrops(true);
ui->chattextEdit->setAcceptDrops(false); ui->chatTextEdit->setAcceptDrops(false);
ui->hashBox->setDropWidget(this); ui->hashBox->setDropWidget(this);
ui->hashBox->setAutoHide(true); ui->hashBox->setAutoHide(true);
@ -115,7 +115,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
menu->addAction(ui->actionMessageHistory); menu->addAction(ui->actionMessageHistory);
ui->pushtoolsButton->setMenu(menu); ui->pushtoolsButton->setMenu(menu);
ui->chattextEdit->installEventFilter(this); ui->chatTextEdit->installEventFilter(this);
#ifdef RS_RELEASE_VERSION #ifdef RS_RELEASE_VERSION
ui->attachPictureButton->setVisible(false); ui->attachPictureButton->setVisible(false);
@ -133,7 +133,7 @@ ChatWidget::~ChatWidget()
void ChatWidget::addChatButton(QPushButton *button) void ChatWidget::addChatButton(QPushButton *button)
{ {
ui->chatButtonLayout->addWidget(button) ; ui->toolBarFrame->layout()->addWidget(button) ;
} }
void ChatWidget::init(const std::string &peerId, const QString &title) void ChatWidget::init(const std::string &peerId, const QString &title)
@ -220,7 +220,7 @@ void ChatWidget::processSettings(bool load)
bool ChatWidget::eventFilter(QObject *obj, QEvent *event) bool ChatWidget::eventFilter(QObject *obj, QEvent *event)
{ {
if (obj == ui->chattextEdit) { if (obj == ui->chatTextEdit) {
if (event->type() == QEvent::KeyPress) { if (event->type() == QEvent::KeyPress) {
updateStatusTyping(); updateStatusTyping();
@ -236,7 +236,7 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event)
} else { } else {
if (keyEvent->modifiers() & Qt::ControlModifier) { if (keyEvent->modifiers() & Qt::ControlModifier) {
// insert return // insert return
ui->chattextEdit->textCursor().insertText("\n"); ui->chatTextEdit->textCursor().insertText("\n");
} else { } else {
// send message with Enter // send message with Enter
sendChat(); sendChat();
@ -296,7 +296,7 @@ void ChatWidget::removeFromParent(QWidget *oldParent)
void ChatWidget::focusDialog() void ChatWidget::focusDialog()
{ {
ui->chattextEdit->setFocus(); ui->chatTextEdit->setFocus();
} }
void ChatWidget::setWelcomeMessage(QString &text) void ChatWidget::setWelcomeMessage(QString &text)
@ -363,7 +363,7 @@ bool ChatWidget::isActive()
void ChatWidget::pasteLink() void ChatWidget::pasteLink()
{ {
std::cerr << "In paste link" << std::endl; std::cerr << "In paste link" << std::endl;
ui->chattextEdit->insertHtml(RSLinkClipboard::toHtml()); ui->chatTextEdit->insertHtml(RSLinkClipboard::toHtml());
} }
void ChatWidget::pasteOwnCertificateLink() void ChatWidget::pasteOwnCertificateLink()
@ -373,7 +373,7 @@ void ChatWidget::pasteOwnCertificateLink()
std::string ownId = rsPeers->getOwnId() ; std::string ownId = rsPeers->getOwnId() ;
if( link.createCertificate(ownId) ) { if( link.createCertificate(ownId) ) {
ui->chattextEdit->insertHtml(link.toHtml() + " "); ui->chatTextEdit->insertHtml(link.toHtml() + " ");
} }
} }
@ -381,7 +381,7 @@ void ChatWidget::contextMenu(QPoint /*point*/)
{ {
std::cerr << "In context menu" << std::endl; std::cerr << "In context menu" << std::endl;
QMenu *contextMnu = ui->chattextEdit->createStandardContextMenu(); QMenu *contextMnu = ui->chatTextEdit->createStandardContextMenu();
contextMnu->addSeparator(); contextMnu->addSeparator();
QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
@ -413,7 +413,7 @@ void ChatWidget::chatCharFormatChanged()
// Reset font and color before inserting a character if edit box is empty // Reset font and color before inserting a character if edit box is empty
// (color info disappears when the user deletes all text) // (color info disappears when the user deletes all text)
if (ui->chattextEdit->toPlainText().isEmpty()) { if (ui->chatTextEdit->toPlainText().isEmpty()) {
setColorAndFont(); setColorAndFont();
} }
@ -445,7 +445,7 @@ void ChatWidget::updateStatusTyping()
void ChatWidget::sendChat() void ChatWidget::sendChat()
{ {
QTextEdit *chatWidget = ui->chattextEdit; QTextEdit *chatWidget = ui->chatTextEdit;
if (chatWidget->toPlainText().isEmpty()) { if (chatWidget->toPlainText().isEmpty()) {
// nothing to send // nothing to send
@ -478,13 +478,13 @@ void ChatWidget::sendChat()
void ChatWidget::on_closeInfoFrameButton_clicked() void ChatWidget::on_closeInfoFrameButton_clicked()
{ {
ui->infoframe->setVisible(false); ui->infoFrame->setVisible(false);
} }
void ChatWidget::chooseColor() void ChatWidget::chooseColor()
{ {
bool ok; bool ok;
QRgb color = QColorDialog::getRgba(ui->chattextEdit->textColor().rgba(), &ok, window()); QRgb color = QColorDialog::getRgba(ui->chatTextEdit->textColor().rgba(), &ok, window());
if (ok) { if (ok) {
currentColor = QColor(color); currentColor = QColor(color);
PeerSettings->setPrivateChatColor(peerId, currentColor.name()); PeerSettings->setPrivateChatColor(peerId, currentColor.name());
@ -531,10 +531,10 @@ void ChatWidget::setColorAndFont()
currentFont.setUnderline(ui->textunderlineButton->isChecked()); currentFont.setUnderline(ui->textunderlineButton->isChecked());
currentFont.setItalic(ui->textitalicButton->isChecked()); currentFont.setItalic(ui->textitalicButton->isChecked());
ui->chattextEdit->setFont(currentFont); ui->chatTextEdit->setFont(currentFont);
ui->chattextEdit->setTextColor(currentColor); ui->chatTextEdit->setTextColor(currentColor);
ui->chattextEdit->setFocus(); ui->chatTextEdit->setFocus();
} }
void ChatWidget::setFont() void ChatWidget::setFont()
@ -550,7 +550,7 @@ void ChatWidget::smileyWidget()
void ChatWidget::addSmiley() void ChatWidget::addSmiley()
{ {
ui->chattextEdit->textCursor().insertText(qobject_cast<QPushButton*>(sender())->toolTip().split("|").first()); ui->chatTextEdit->textCursor().insertText(qobject_cast<QPushButton*>(sender())->toolTip().split("|").first());
} }
void ChatWidget::clearChatHistory() void ChatWidget::clearChatHistory()
@ -568,7 +568,7 @@ void ChatWidget::deleteChatHistory()
void ChatWidget::messageHistory() void ChatWidget::messageHistory()
{ {
ImHistoryBrowser imBrowser(peerId, ui->chattextEdit, window()); ImHistoryBrowser imBrowser(peerId, ui->chatTextEdit, window());
imBrowser.exec(); imBrowser.exec();
} }
@ -686,27 +686,27 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
switch (status) { switch (status) {
case RS_STATUS_OFFLINE: case RS_STATUS_OFFLINE:
ui->infoframe->setVisible(true); ui->infoFrame->setVisible(true);
ui->infolabel->setText(peerName + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online")); ui->infoLabel->setText(peerName + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online"));
break; break;
case RS_STATUS_INACTIVE: case RS_STATUS_INACTIVE:
ui->infoframe->setVisible(true); ui->infoFrame->setVisible(true);
ui->infolabel->setText(peerName + " " + tr("is Idle and may not reply")); ui->infoLabel->setText(peerName + " " + tr("is Idle and may not reply"));
break; break;
case RS_STATUS_ONLINE: case RS_STATUS_ONLINE:
ui->infoframe->setVisible(false); ui->infoFrame->setVisible(false);
break; break;
case RS_STATUS_AWAY: case RS_STATUS_AWAY:
ui->infolabel->setText(peerName + " " + tr("is Away and may not reply")); ui->infoLabel->setText(peerName + " " + tr("is Away and may not reply"));
ui->infoframe->setVisible(true); ui->infoFrame->setVisible(true);
break; break;
case RS_STATUS_BUSY: case RS_STATUS_BUSY:
ui->infolabel->setText(peerName + " " + tr("is Busy and may not reply")); ui->infoLabel->setText(peerName + " " + tr("is Busy and may not reply"));
ui->infoframe->setVisible(true); ui->infoFrame->setVisible(true);
break; break;
} }
@ -747,11 +747,11 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr
if (stdPeerId == peerId) { if (stdPeerId == peerId) {
// the peers status string has changed // the peers status string has changed
if (status_string.isEmpty()) { if (status_string.isEmpty()) {
ui->statusmessagelabel->hide(); ui->statusMessageLabel->hide();
} else { } else {
ui->statusmessagelabel->show(); ui->statusMessageLabel->show();
status_text = RsHtml().formatText(NULL, status_string, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); status_text = RsHtml().formatText(NULL, status_string, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS);
ui->statusmessagelabel->setText(status_text); ui->statusMessageLabel->setText(status_text);
} }
} }
} }

110
retroshare-gui/src/gui/chat/ChatWidget.ui
View File

@ -51,7 +51,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="statusmessagelabel"> <widget class="QLabel" name="statusMessageLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family> <family>Arial</family>
@ -66,26 +66,83 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="infoframe"> <widget class="QFrame" name="infoFrame">
<property name="styleSheet"> <property name="palette">
<string notr="true">QFrame#infoframe{border: 1px solid #DCDC41; <palette>
border-radius: 6px; <active>
background: #FFFFD7; <colorrole role="Base">
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, <brush brushstyle="SolidPattern">
stop:0 #FFFFD7, stop:1 #FFFFB2);}</string> <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin"> <property name="margin">
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="infoPixmap">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
@ -104,7 +161,7 @@ stop:0 #FFFFD7, stop:1 #FFFFB2);}</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="infolabel"> <widget class="QLabel" name="infoLabel">
<property name="text"> <property name="text">
<string notr="true">TextLabel</string> <string notr="true">TextLabel</string>
</property> </property>
@ -183,11 +240,6 @@ border-image: url(:/images/closepressed.png)
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="styleSheet">
<string notr="true">QTextBrowser{border: 1px solid #B8B6B1;
border-radius: 6px;
background: white;}</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -211,7 +263,7 @@ background: white;}</string>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QTextEdit" name="chattextEdit"> <widget class="QTextEdit" name="chatTextEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -227,11 +279,6 @@ background: white;}</string>
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="styleSheet">
<string notr="true">QTextEdit{border: 1px solid #B8B6B1;
border-radius: 6px;
background: white;}</string>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
@ -261,7 +308,17 @@ background: white;}</string>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="chatButtonLayout"> <widget class="QFrame" name="toolBarFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<number>2</number>
</property>
<item> <item>
<widget class="QToolButton" name="emoteiconButton"> <widget class="QToolButton" name="emoteiconButton">
<property name="sizePolicy"> <property name="sizePolicy">
@ -573,6 +630,7 @@ background: white;}</string>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<widget class="HashBox" name="hashBox"> <widget class="HashBox" name="hashBox">

2
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View File

@ -65,6 +65,8 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list<std::string>& peer_list, in
} }
checkTextFields(); checkTextFields();
ui->lobbyName_LE->setFocus();
} }
CreateLobbyDialog::~CreateLobbyDialog() CreateLobbyDialog::~CreateLobbyDialog()

234
retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
View File

@ -17,42 +17,21 @@
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/user/agt_forum24.png</normaloff>:/images/user/agt_forum24.png</iconset> <normaloff>:/images/user/agt_forum24.png</normaloff>:/images/user/agt_forum24.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0">
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <item>
<number>0</number>
</property>
<item row="0" column="0">
<widget class="HeaderFrame" name="headerFrame"/> <widget class="HeaderFrame" name="headerFrame"/>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QFrame" name="frame_3"> <widget class="QFrame" name="frame">
<property name="frameShape"> <layout class="QVBoxLayout" name="verticalLayout_3">
<enum>QFrame::StyledPanel</enum> <item>
</property> <widget class="QLabel" name="label">
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="font"> <property name="font">
<font> <font>
<pointsize>12</pointsize> <pointsize>12</pointsize>
@ -66,7 +45,95 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QFrame" name="lobbyFrame">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Lobby name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="lobbyName_LE"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Lobby topic:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="lobbyTopic_LE"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Your nick name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLineEdit" name="nickName_LE"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Security policy:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="security_CB">
<item>
<property name="text">
<string>Public (Visible by friends)</string>
</property>
</item>
<item>
<property name="text">
<string>Private (Works on invitation only)</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -161,115 +228,9 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<widget class="QFrame" name="frame_4">
<property name="styleSheet">
<string notr="true">QFrame#frame_4{
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
}
</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Lobby name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Lobby topic:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Your nick name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Security policy:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLineEdit" name="lobbyName_LE"/>
</item>
<item>
<widget class="QLineEdit" name="lobbyTopic_LE"/>
</item>
<item>
<widget class="QLineEdit" name="nickName_LE"/>
</item>
<item>
<widget class="QComboBox" name="security_CB">
<item>
<property name="text">
<string>Public (Visible by friends)</string>
</property>
</item>
<item>
<property name="text">
<string>Private (Works on invitation only)</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
@ -311,9 +272,6 @@ background: white;
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>HeaderFrame</class> <class>HeaderFrame</class>

9
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View File

@ -45,15 +45,6 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QFrame#frame{border: transparent}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>

3
retroshare-gui/src/gui/chat/PopupChatWindow.ui
View File

@ -14,9 +14,6 @@
<string notr="true">MainWindow</string> <string notr="true">MainWindow</string>
</property> </property>
<widget class="QWidget" name="chatcentralwidget"> <widget class="QWidget" name="chatcentralwidget">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>5</number> <number>5</number>

37
retroshare-gui/src/gui/forums/CreateForum.ui
View File

@ -17,31 +17,18 @@
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <property name="margin">
<widget class="HeaderFrame" name="headerFrame"> <number>0</number>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <item>
<enum>QFrame::Raised</enum> <widget class="HeaderFrame" name="headerFrame"/>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -307,18 +294,18 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendSelectionWidget.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>HeaderFrame</class> <class>HeaderFrame</class>
<extends>QFrame</extends> <extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header> <header>gui/common/HeaderFrame.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
<header>gui/common/FriendSelectionWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>

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

@ -13,32 +13,38 @@ HeaderFrame {
background-image: url(:/images/headerFrame.png); background-image: url(:/images/headerFrame.png);
border: 0px; border: 0px;
} }
HeaderFrame QLabel#headerLabel { HeaderFrame > QLabel#headerLabel {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
} }
/* FriendsDialog */ /* FriendsDialog */
FriendsDialog QLabel#nicknameLabel {
color: rgb(50, 205, 50);
}
FriendsDialog QFrame#headerFrame { FriendsDialog QFrame#headerFrame {
background-image: url(:/images/headerFrame.png); background-image: url(:/images/headerFrame.png);
border: 0px; border: 0px;
} }
/* ChannelFeed */ FriendsDialog QFrame#headerFrame > QLabel#nicknameLabel {
color: rgb(50, 205, 50);
}
/* Channels */
ChannelFeed QFrame#headerFrame { ChannelFeed QFrame#headerFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F2F2F2, stop:1 #E6E6E6); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F2F2F2, stop:1 #E6E6E6);
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
} }
ChannelFeed QFrame#headerFrame QLabel#iconLabel { ChannelFeed QLabel#logoLabel, EditChanDetails QLabel#logoLabel, CreateChannel QLabel#logoLabel {
border: 2px solid white; border: 2px solid white;
} }
/* ForumsDialog */ CreateChannelMsg QFrame#fileFrame {
border: 2px solid black;
background: white;
}
/* Forums */
ForumsDialog QLabel#forumName, ForumsDialog QLabel#threadTitle ForumsDialog QLabel#forumName, ForumsDialog QLabel#threadTitle
{ {
@ -53,3 +59,43 @@ ForumsDialog2 QLabel#forumName, ForumsDialog2 QLabel#threadTitle
border-radius:6px; border-radius:6px;
background: white; background: white;
} }
/* MessengerWindow */
MessengerWindow QFrame#logoFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;
}
/* Chat lobby */
ChatLobbyDialog QFrame#participantsFrame {
border: transparent;
}
ChatLobbyDialog QListWidget#participantsList {
border: 1px solid #B8B6B1;
border-radius: 6px;
background: white;
}
CreateLobbyDialog QFrame#lobbyFrame {
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
}
/* Chat */
ChatWidget QTextEdit#chatTextEdit, ChatWidget QTextBrowser#textBrowser {
border: 1px solid #B8B6B1;
border-radius: 6px;
background: white;
}
ChatWidget QFrame#infoFrame {
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);
}