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

Moved some internal stylesheets to the file Standard.qss.

Browse Source 
Set the built-in stylesheet "Standard" as default for new profiles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-08-29 22:40:16 +00:00
parent f9d911fdfb
commit a82e2960e1
8 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,10 +657,6 @@
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="styleSheet">
<string notr="true">QTextEdit#msgText{border: 1px solid #CCCCCC;
background: white;}</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>

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

@ -196,9 +196,6 @@ QToolButton:pressed {
border-image: url(:/images/closepressed.png)
}</string>
</property>
<property name="text">
<string/>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>

5
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -64,8 +64,6 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
/* add stylesheet to title */
QList<int> ids = pageIds();
for (QList<int>::iterator it = ids.begin(); it != ids.end(); ++it) {
@ -301,7 +299,8 @@ void ConnectFriendWizard::initializePage(int id)
case Page_FriendRequest:
{
std::cerr << "Friend request page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
ui->fr_avatar->setFrameType(AvatarWidget::NORMAL_FRAME);
setPixmap(QWizard::LogoPixmap, QPixmap(":/images/user/user_request48.png"));
//set the radio button to sign the GPG key

21
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -535,19 +535,6 @@
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QFrame#frame{
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">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="fr_label">
@ -562,7 +549,7 @@ background: white;
</widget>
</item>
<item row="1" column="0">
<widget class="AvatarWidget" name="avatar">
<widget class="AvatarWidget" name="fr_avatar">
<property name="minimumSize">
<size>
<width>96</width>
@ -575,12 +562,6 @@ background: white;
<height>96</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;</string>
</property>
</widget>
</item>
<item row="1" column="1">

1
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -332,6 +332,7 @@ void SecurityItem::friendRequest()
#endif
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
connectFriendWizard->setGpgId(mGpgId, true);
connectFriendWizard->show();
}

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

@ -29,7 +29,7 @@ FriendsDialog QFrame#headerFrame > QLabel#nicknameLabel {
color: rgb(50, 205, 50);
}
FriendsDialog QTextEdit#lineEdit {
FriendsDialog QTextEdit#msgText, FriendsDialog QTextEdit#lineEdit {
border: 1px solid #CCCCCC;
}
@ -160,3 +160,11 @@ GenCertDialog > QFrame#headerFrame {
GenCertDialog > QFrame#headerFrame > QLabel#headerLabel {
color: rgb(255, 255, 255);
}
/* ConnectFriendWizard */
ConnectFriendWizard QWizardPage#FriendRequestPage > QFrame#frame {
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
}

2
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -114,7 +114,7 @@ void RshareSettings::initSettings()
#endif
setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
setDefault(SETTING_SHEETNAME, true);
setDefault(SETTING_SHEETNAME, ":Standard");
/* defaults here are not ideal.... but dusent matter */

1
retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
View File

@ -62,6 +62,7 @@ FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QStri
void FriendRequestToaster::friendrequestButtonSlot()
{
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
connectFriendWizard->setGpgId(mGpgId, true);
connectFriendWizard->show();