mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-07 14:12:43 -04:00
Moved some internal stylesheets to the file Standard.qss.
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:
parent
f9d911fdfb
commit
a82e2960e1
8 changed files with 15 additions and 32 deletions
|
@ -657,10 +657,6 @@
|
||||||
<property name="contextMenuPolicy">
|
<property name="contextMenuPolicy">
|
||||||
<enum>Qt::CustomContextMenu</enum>
|
<enum>Qt::CustomContextMenu</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">QTextEdit#msgText{border: 1px solid #CCCCCC;
|
|
||||||
background: white;}</string>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -196,9 +196,6 @@ QToolButton:pressed {
|
||||||
border-image: url(:/images/closepressed.png)
|
border-image: url(:/images/closepressed.png)
|
||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="autoRaise">
|
<property name="autoRaise">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -64,8 +64,6 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
|
||||||
|
|
||||||
/* add stylesheet to title */
|
/* add stylesheet to title */
|
||||||
QList<int> ids = pageIds();
|
QList<int> ids = pageIds();
|
||||||
for (QList<int>::iterator it = ids.begin(); it != ids.end(); ++it) {
|
for (QList<int>::iterator it = ids.begin(); it != ids.end(); ++it) {
|
||||||
|
@ -302,6 +300,7 @@ void ConnectFriendWizard::initializePage(int id)
|
||||||
{
|
{
|
||||||
std::cerr << "Friend request page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
|
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"));
|
setPixmap(QWizard::LogoPixmap, QPixmap(":/images/user/user_request48.png"));
|
||||||
|
|
||||||
//set the radio button to sign the GPG key
|
//set the radio button to sign the GPG key
|
||||||
|
|
|
@ -535,19 +535,6 @@
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QFrame" name="frame">
|
<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">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="0" column="0" colspan="2">
|
<item row="0" column="0" colspan="2">
|
||||||
<widget class="QLabel" name="fr_label">
|
<widget class="QLabel" name="fr_label">
|
||||||
|
@ -562,7 +549,7 @@ background: white;
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="AvatarWidget" name="avatar">
|
<widget class="AvatarWidget" name="fr_avatar">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>96</width>
|
<width>96</width>
|
||||||
|
@ -575,12 +562,6 @@ background: white;
|
||||||
<height>96</height>
|
<height>96</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">
|
|
||||||
border: 2px solid #CCCCCC;
|
|
||||||
border-radius:6px;
|
|
||||||
background: white;</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
<item row="1" column="1">
|
||||||
|
|
|
@ -332,6 +332,7 @@ void SecurityItem::friendRequest()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
|
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
|
||||||
|
connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
connectFriendWizard->setGpgId(mGpgId, true);
|
connectFriendWizard->setGpgId(mGpgId, true);
|
||||||
connectFriendWizard->show();
|
connectFriendWizard->show();
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ FriendsDialog QFrame#headerFrame > QLabel#nicknameLabel {
|
||||||
color: rgb(50, 205, 50);
|
color: rgb(50, 205, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
FriendsDialog QTextEdit#lineEdit {
|
FriendsDialog QTextEdit#msgText, FriendsDialog QTextEdit#lineEdit {
|
||||||
border: 1px solid #CCCCCC;
|
border: 1px solid #CCCCCC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,3 +160,11 @@ GenCertDialog > QFrame#headerFrame {
|
||||||
GenCertDialog > QFrame#headerFrame > QLabel#headerLabel {
|
GenCertDialog > QFrame#headerFrame > QLabel#headerLabel {
|
||||||
color: rgb(255, 255, 255);
|
color: rgb(255, 255, 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ConnectFriendWizard */
|
||||||
|
|
||||||
|
ConnectFriendWizard QWizardPage#FriendRequestPage > QFrame#frame {
|
||||||
|
border: 2px solid #CCCCCC;
|
||||||
|
border-radius:6px;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
|
@ -114,7 +114,7 @@ void RshareSettings::initSettings()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
|
setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
|
||||||
setDefault(SETTING_SHEETNAME, true);
|
setDefault(SETTING_SHEETNAME, ":Standard");
|
||||||
|
|
||||||
/* defaults here are not ideal.... but dusent matter */
|
/* defaults here are not ideal.... but dusent matter */
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QStri
|
||||||
void FriendRequestToaster::friendrequestButtonSlot()
|
void FriendRequestToaster::friendrequestButtonSlot()
|
||||||
{
|
{
|
||||||
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
|
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
|
||||||
|
connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
connectFriendWizard->setGpgId(mGpgId, true);
|
connectFriendWizard->setGpgId(mGpgId, true);
|
||||||
connectFriendWizard->show();
|
connectFriendWizard->show();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue