diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui
index 0dcbe9840..0cbdf11e4 100644
--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@@ -657,10 +657,6 @@
Qt::CustomContextMenu
-
- QTextEdit#msgText{border: 1px solid #CCCCCC;
-background: white;}
-
true
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index 7d076e5fa..10d5f4d04 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -196,9 +196,6 @@ QToolButton:pressed {
border-image: url(:/images/closepressed.png)
}
-
-
-
true
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 2f1374813..704c2e985 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -64,8 +64,6 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
{
ui->setupUi(this);
- setAttribute(Qt::WA_DeleteOnClose, true);
-
/* add stylesheet to title */
QList ids = pageIds();
for (QList::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
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index 637d18a38..9faa4c51a 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -535,19 +535,6 @@
-
-
- QFrame#frame{
-border: 2px solid #CCCCCC;
-border-radius:6px;
-background: white;
-}
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
@@ -562,7 +549,7 @@ background: white;
-
-
+
96
@@ -575,12 +562,6 @@ background: white;
96
-
-
-border: 2px solid #CCCCCC;
-border-radius:6px;
-background: white;
-
-
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp
index f29e537b5..23981244a 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp
@@ -332,6 +332,7 @@ void SecurityItem::friendRequest()
#endif
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
+ connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
connectFriendWizard->setGpgId(mGpgId, true);
connectFriendWizard->show();
}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 4f924cec6..e3167fb2f 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -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;
+}
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 1f7034cfc..cc77059c8 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -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 */
diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
index 2eae300b7..cf69baa6b 100644
--- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
+++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
@@ -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();