diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index 40340605b..a0eacd060 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -60,8 +60,8 @@ CreateCircleDialog::CreateCircleDialog() connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember())); connect(ui.removeButton, SIGNAL(clicked()), this, SLOT(removeMember())); - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(createCircle())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close())); + connect(ui.createButton, SIGNAL(clicked()), this, SLOT(createCircle())); + connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close())); connect(ui.treeWidget_membership, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(selectedMember(QTreeWidgetItem*, QTreeWidgetItem*))); connect(ui.treeWidget_IdList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(selectedId(QTreeWidgetItem*, QTreeWidgetItem*))); @@ -146,15 +146,15 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool ui.idChooser->setVisible(true) ; } - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Update")); + ui.createButton->setText(tr("Update")); ui.addButton->setEnabled(!readonly) ; ui.removeButton->setEnabled(!readonly) ; if(readonly) { - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel); - ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close")); + ui.createButton->hide() ; + ui.cancelButton->setText(tr("Close")); ui.peersSelection_GB->hide() ; ui.addButton->hide() ; ui.removeButton->hide() ; @@ -175,7 +175,7 @@ void CreateCircleDialog::editNewId(bool isExternal) { setupForExternalCircle(); ui.headerFrame->setHeaderText(tr("Create New Circle")); - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create")); + ui.createButton->setText(tr("Create")); } else { diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui index 61923d757..54e1fe80f 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui @@ -48,199 +48,7 @@ QFrame::Raised - - - - - - Invited Members - - - - - - Qt::CustomContextMenu - - - <html><head/><body><p>Members of this list will be automatically proposed to join the circle (by accepting membership). They will</p><p>not receive data that is restricted to this circle until they do so.</p></body></html> - - - true - - - - Name - - - - - IDs - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 188 - - - - - - - - Add - - - - - - - :/icons/png/arrow-left.png:/icons/png/arrow-left.png - - - - - - - Remove - - - - - - - :/icons/png/arrow-right.png:/icons/png/arrow-right.png - - - - - - - Qt::Vertical - - - - 20 - 178 - - - - - - - - - - Known People - - - - - - Qt::CustomContextMenu - - - true - - - - Nickname - - - - - Profile - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - All - - - - - - - Signed - - - - - - - Signed by friend node - - - - - - - - - - - - Filter - - - - - - - - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - + Circle Details @@ -444,6 +252,218 @@ + + + + + + Invited Members + + + + + + Qt::CustomContextMenu + + + <html><head/><body><p>Members of this list will be automatically proposed to join the circle (by accepting membership). They will</p><p>not receive data that is restricted to this circle until they do so.</p></body></html> + + + true + + + + Name + + + + + IDs + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 188 + + + + + + + + Add + + + + + + + :/icons/png/arrow-left.png:/icons/png/arrow-left.png + + + + + + + Remove + + + + + + + :/icons/png/arrow-right.png:/icons/png/arrow-right.png + + + + + + + Qt::Vertical + + + + 20 + 178 + + + + + + + + + + Known People + + + + + + Qt::CustomContextMenu + + + true + + + + Nickname + + + + + Profile + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + All + + + + + + + Signed + + + + + + + Signed by friend node + + + + + + + + + + + + Filter + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 536 + 20 + + + + + + + + Create + + + + + + + Cancel + + + diff --git a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.cpp index 038a62ae1..baa75c667 100644 --- a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.cpp @@ -31,7 +31,7 @@ #define COLUMN_FILE_TIME 3 BannedFilesDialog::BannedFilesDialog(QWidget *parent) - : QDialog(parent) + : QDialog(parent, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint) { ui.setupUi(this); diff --git a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.ui index 78d81df79..9a5493d94 100644 --- a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.ui @@ -7,7 +7,7 @@ 0 0 923 - 810 + 489 diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index b4c855c1d..1d9dd05b0 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -75,8 +75,8 @@ IdEditDialog::IdEditDialog(QWidget *parent) : /* Connect signals */ connect(ui->radioButton_GpgId, SIGNAL(toggled(bool)), this, SLOT(idTypeToggled(bool))); connect(ui->radioButton_Pseudo, SIGNAL(toggled(bool)), this, SLOT(idTypeToggled(bool))); - connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(submit())); - connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + connect(ui->createButton, SIGNAL(clicked()), this, SLOT(submit())); + connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(reject())); connect(ui->plainTextEdit_Tag, SIGNAL(textChanged()), this, SLOT(checkNewTag())); connect(ui->pushButton_Tag, SIGNAL(clicked(bool)), this, SLOT(addRecognTag())); @@ -202,6 +202,7 @@ void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId) setWindowTitle(tr("Edit identity")); ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/person.png")); ui->headerFrame->setHeaderText(tr("Edit identity")); + ui->createButton->setText(tr("Update")); mStateHelper->setLoading(IDEDITDIALOG_LOADID, true); @@ -310,7 +311,7 @@ void IdEditDialog::loadExistingId(const RsGxsIdGroup& id_group) } // RecognTags. - ui->frame_Tags->setHidden(false); + ui->frame_Tags->setHidden(true); loadRecognTags(); } @@ -561,7 +562,7 @@ void IdEditDialog::createId() if(rsIdentity->createIdentity(keyId,params.nickname,params.mImage,!params.isPgpLinked,gpg_password)) { - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->createButton->setEnabled(false); RsIdentityDetails det; diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index 22ed6ebd9..9ed2d258a 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -504,9 +504,16 @@ - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + Create + + + + + + + Cancel @@ -523,9 +530,6 @@ 1 - - buttonBox - diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui index 615021115..11c6bd63f 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui @@ -17,7 +17,7 @@ - 1 + 0 true @@ -44,61 +44,90 @@ false - - - 6 - - - - - 0 - - - + + + + + - 75 - true + 14 - Popularity + TextLabel - - - - - 75 - true - + + + + QLayout::SetMinimumSize - - 0 + + 0 - + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 13 + + + + + + + + + 0 + 0 + + + + + 50 + false + false + + + + + + + Subscribe + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 13 + + + + + - - - - - 0 - 0 - - - - - 75 - true - - - - Posts - - - - + @@ -111,96 +140,14 @@ - - - - - 75 - true - - - - Created - - - - - - - unknown - - - - - - - - 75 - true - - - - Administrator: - - - - - - - unknown - - - true - - - - - - - - 75 - true - - - - Distribution: - - - - + unknown - - - - - 0 - 0 - - - - - 75 - true - - - - Last Post: - - - - - - - unknown - - - - + @@ -222,47 +169,149 @@ - - + + - 14 + 75 + true - TextLabel + Created + + + + + 75 + true + + + + 0 + + + + + + + unknown + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Posts + + + + + + + + 75 + true + + + + Administrator: + + + + + + + unknown + + + true + + + + + + + + 75 + true + + + + Popularity + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Last Post: + + + + + + + + 75 + true + + + + Distribution: + + + + + + + unknown + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - 0 - 0 - - - - - 50 - false - false - - - - - - - Subscribe - - - false - - - - + @@ -271,7 +320,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 41cb8d3bf..a3416b403 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -54,8 +54,8 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set& peer_list, int pr ui->lobbyTopic_LE->setPlaceholderText(tr("Set a descriptive topic here")); #endif - connect( ui->buttonBox, SIGNAL(accepted()), this, SLOT(createLobby())); - connect( ui->buttonBox, SIGNAL(rejected()), this, SLOT(close())); + connect( ui->createButton, SIGNAL(clicked()), this, SLOT(createLobby())); + connect( ui->cancelButton, SIGNAL(clicked()), this, SLOT(close())); connect( ui->lobbyName_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) ); connect( ui->lobbyTopic_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) ); connect( ui->idChooser_CB, SIGNAL( currentIndexChanged ( int ) ), this, SLOT( checkTextFields( ) ) ); @@ -101,10 +101,10 @@ void CreateLobbyDialog::checkTextFields() switch(ui->idChooser_CB->getChosenId(id)) { case GxsIdChooser::NoId: - case GxsIdChooser::None: ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false) ; + case GxsIdChooser::None: ui->createButton->setEnabled(false) ; break ; default: - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true) ; + ui->createButton->setEnabled(true) ; break ; } @@ -113,7 +113,7 @@ void CreateLobbyDialog::checkTextFields() rsIdentity->getIdDetails(id,idd) ; if( (!(idd.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN)) && ui->pgp_signed_CB->isChecked()) - ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false) ; + ui->createButton->setEnabled(false) ; } void CreateLobbyDialog::createLobby() diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui index 77aab56ea..7c4d01aaa 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui @@ -216,9 +216,29 @@ 0 - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Create + + + + + + + Cancel diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp index fcc13e851..60a9476a3 100644 --- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp @@ -59,7 +59,8 @@ #define POST_COLOR_ROLE (Qt::UserRole+2) /* Images for context menu icons */ -#define IMAGE_MESSAGE ":/images/folder-draft.png" +#define IMAGE_MESSAGE ":/icons/mail/compose.png" +#define IMAGE_REPLY ":/icons/mail/reply.png" #define IMAGE_COPY ":/images/copy.png" #define IMAGE_VOTEUP ":/images/vote_up.png" #define IMAGE_VOTEDOWN ":/images/vote_down.png" @@ -194,7 +195,7 @@ void GxsCommentTreeWidget::setCurrentCommentMsgId(QTreeWidgetItem *current, QTre void GxsCommentTreeWidget::customPopUpMenu(const QPoint& /*point*/) { QMenu contextMnu( this ); - QAction* action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_MESSAGE), tr("Reply to Comment"), this, SLOT(replyToComment())); + QAction* action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_REPLY), tr("Reply to Comment"), this, SLOT(replyToComment())); action->setDisabled(mCurrentCommentMsgId.isNull()); action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_MESSAGE), tr("Submit Comment"), this, SLOT(makeComment())); action->setDisabled(mMsgVersions.empty()); diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp index e084635c3..d823414de 100644 --- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp @@ -31,8 +31,8 @@ GxsCreateCommentDialog::GxsCreateCommentDialog(RsGxsCommentService *service, co ui(new Ui::GxsCreateCommentDialog), mCommentService(service), mParentId(parentId), mThreadId(threadId) { ui->setupUi(this); - connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(createComment())); - connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(close())); + connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createComment())); + connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(close())); /* fill in the available OwnIds for signing */ ui->idChooser->loadIds(IDCHOOSER_ID_REQUIRED, default_author); @@ -52,7 +52,7 @@ void GxsCreateCommentDialog::loadComment(const QString &msgText, const QString & ui->replaytolabel->setText( tr("Replying to") + " @" + msgAuthor); ui->commentTextEdit->setPlaceholderText( tr("Type your reply")); - ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Reply"); + ui->postButton->setText("Reply"); ui->signedLabel->setText("Reply as"); } diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui index 27d128867..1825bcf55 100644 --- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui @@ -138,20 +138,11 @@ p, li { white-space: pre-wrap; } - - - 9 - + 6 - - 9 - - - 9 - - + @@ -161,7 +152,7 @@ p, li { white-space: pre-wrap; } - + @@ -171,7 +162,7 @@ p, li { white-space: pre-wrap; } - + @@ -195,13 +186,30 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + 276 + 20 + + + + + + + + Post + + + + + + + Cancel diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 240f321db..ff1919403 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -92,8 +92,8 @@ GxsGroupDialog::~GxsGroupDialog() void GxsGroupDialog::init() { // connect up the buttons. - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(submitGroup())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancelDialog())); + connect(ui.createButton, SIGNAL(clicked()), this, SLOT(submitGroup())); + connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(cancelDialog())); connect(ui.pubKeyShare_cb, SIGNAL(clicked()), this, SLOT(setShareList())); connect(ui.addAdmins_cb, SIGNAL(clicked()), this, SLOT(setAdminsList())); connect(ui.filtercomboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged(int))); @@ -194,7 +194,7 @@ void GxsGroupDialog::setUiText(UiType uiType, const QString &text) //ui.contactsdockWidget->setWindowTitle(text); break; case UITYPE_BUTTONBOX_OK: - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(text); + ui.createButton->setText(text); break; } } @@ -210,7 +210,7 @@ void GxsGroupDialog::setUiToolTip(UiType uiType, const QString &text) ui.addAdmins_cb->setToolTip(text); break; case UITYPE_BUTTONBOX_OK: - ui.buttonBox->button(QDialogButtonBox::Ok)->setToolTip(text); + ui.createButton->setToolTip(text); default: break; } @@ -224,7 +224,6 @@ void GxsGroupDialog::initMode() case MODE_CREATE: { ui.stackedWidget->setCurrentIndex(0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); newGroup(); } break; @@ -233,15 +232,14 @@ void GxsGroupDialog::initMode() { ui.stackedWidget->setCurrentIndex(1); mReadonlyFlags = 0xffffffff; // Force all to readonly. - ui.buttonBox->setStandardButtons(QDialogButtonBox::Close); + ui.createButton->hide(); } break; case MODE_EDIT: { ui.stackedWidget->setCurrentIndex(0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submit Group Changes")); + ui.createButton->setText(tr("Submit Group Changes")); } break; } diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 88777cd59..e9ffcbb4d 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,7 +7,7 @@ 0 0 1231 - 967 + 529 @@ -785,10 +785,10 @@ QFrame::Raised - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + Cancel @@ -805,6 +805,13 @@ + + + + Create + + + diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp index dd9a242b6..a2002c986 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp @@ -66,19 +66,19 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage /* Setup UI helper */ mStateHelper = new UIStateHelper(this); - mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.buttonBox->button(QDialogButtonBox::Ok)); + mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.postButton); mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.innerFrame); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumSubject); mStateHelper->addClear(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName); - mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.buttonBox->button(QDialogButtonBox::Ok)); + mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.postButton); mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.innerFrame); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumName); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumSubject); mStateHelper->addClear(CREATEGXSFORUMMSG_PARENTMSG, ui.forumName); - mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui.buttonBox->button(QDialogButtonBox::Ok)); + mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui.postButton); mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui.innerFrame); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui.forumName); mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui.forumSubject); @@ -88,6 +88,9 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage QString text = mOId.isNull()?(pId.isNull() ? tr("Start New Thread") : tr("Post Forum Message")):tr("Edit Message"); setWindowTitle(text); + if (!mOId.isNull()) + ui.postButton->setText(tr ("Update")); + ui.forumMessage->setPlaceholderText(tr ("Text")); ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png")); @@ -99,12 +102,9 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage connect(ui.hashBox, SIGNAL(fileHashingFinished(QList)), this, SLOT(fileHashingFinished(QList))); - /* Rename Ok button */ - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Send")); - // connect up the buttons. - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(createMsg())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + connect(ui.postButton, SIGNAL(clicked()), this, SLOT(createMsg())); + connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(reject())); connect(ui.emoticonButton, SIGNAL(clicked()), this, SLOT(smileyWidgetForums())); connect(ui.attachFileButton, SIGNAL(clicked()), this, SLOT(addFile())); connect(ui.attachPictureButton, SIGNAL(clicked()), this, SLOT(addPicture())); @@ -363,8 +363,8 @@ void CreateGxsForumMsg::checkLength() text = tr("Warning: This message is too big of %1 characters after HTML conversion.").arg((0-charRemains)); ui.infoLabel->setStyleSheet("QLabel#infoLabel {color: red; font: bold; }"); } - ui.buttonBox->button(QDialogButtonBox::Ok)->setToolTip(text); - ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(charRemains>=0); + ui.postButton->setToolTip(text); + ui.postButton->setEnabled(charRemains>=0); ui.infoLabel->setText(text); } diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui index e5308f66f..7af77f2d5 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui @@ -341,28 +341,29 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - 242 + 40 20 - - - - 0 - 0 - + + + Post - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + Cancel diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 018239298..9d1c0d17a 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -133,6 +133,71 @@ CreateGxsChannelMsg QPushButton#postButton:hover { padding: 2px; } +CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, +IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton{ + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + +CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, +IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover, +ShareManager QPushButton#closeButton:hover { + background: #03b1f3; + border-radius: 4px; + min-width: 4em; + padding: 2px; +} + +ShareManager QPushButton#closeButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; + padding-left: 6px; + padding-right: 6px; +} + +ShareManager QPushButton#addButton { + font: bold; + font-size: 15px; + color: white; + background: #32CD32; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 4px; +} + +ShareManager QPushButton#addButton:hover { + background: #5AD75A; + border-radius: 4px; + min-width: 4em; + padding: 4px; +} + +CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#postButton:disabled { + font: bold; + font-size: 15px; + color: white; + background: #d40000; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + /* Forums */ GxsForumThreadWidget QLabel#forumName @@ -789,17 +854,20 @@ GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton:disabled { } /* only for MenuButtonPopup */ -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"] { + +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"], +PostedListWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"]{ padding-right: 0px; } -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-arrow { +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-arrow, +PostedListWidgetWithModel QToolButton#subscribeToolButton::menu-arrow{ image: none; } -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button { +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button, +PostedListWidgetWithModel QToolButton#subscribeToolButton::menu-button{ image: none; - } GxsChannelFilesStatusWidget QToolButton#openFolderToolButton::menu-indicator { @@ -823,7 +891,6 @@ GxsGroupDialog QLabel#groupLogo{ border-radius: 3px; } - BoardPostDisplayWidget_compact QFrame#mainFrame { background-color: white; } @@ -953,6 +1020,15 @@ GxsForumThreadWidget QWidget#threadTreeWidget::item { padding: 2px; } +GxsChannelDialog GroupTreeWidget QTreeWidget#treeWidget::item{ + /*background-color: #F00000;*/ + /*padding: 2px*/ +} + +MainWindow QListWidget { + font-size: 12pt; +} + PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame { border: 2px solid #7ecbfb; border-radius: 6px; diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss index e96df4876..24b9fed24 100644 --- a/retroshare-gui/src/qss/qdarkstyle-v2.qss +++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss @@ -1976,6 +1976,23 @@ GxsForumThreadWidget QLabel#forumName font: bold; } +GxsForumThreadWidget QWidget#threadTreeWidget::item { + padding: 2px; +} + +ForumsDialog, GxsForumThreadWidget +{ + qproperty-textColorRead: darkgray; + qproperty-textColorUnread: white; + qproperty-textColorUnreadChildren: red; + qproperty-textColorNotSubscribed: white; + qproperty-textColorMissing: darkred; + qproperty-textColorPinned: #D07000; + + qproperty-backgroundColorPinned: #19232D; + qproperty-backgroundColorFiltered: darkGreen; +} + QTreeView [new=true]{ color: #0099cc; @@ -2070,11 +2087,49 @@ CreateGxsChannelMsg QPushButton#postButton:hover { padding: 2px; } +CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, +IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + +CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, +IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, +GxsCreateCommentDialog QPushButton#postButton:hover, , GxsGroupDialog QPushButton#createButton:hover { + background: #03b1f3; + border-radius: 4px; + min-width: 4em; + padding: 2px; +} + +CreateGxsForumMsg QPushButton#postButton:disabled { + font: bold; + font-size: 15px; + color: white; + background: #d40000; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + QTabBar#smTab::tab{ height: 32px; width: 32px; } +QLabel#avatarLabel{ + border: 2px solid #CCCCCC; + border-radius: 4px; +} + PostedCreatePostDialog QPushButton#submitButton { font: bold; font-size: 15px; @@ -2180,7 +2235,7 @@ WireGroupItem QFrame#wire_frame{ GxsChannelDialog GroupTreeWidget QTreeWidget#treeWidget::item{ /*background-color: #F00000;*/ - /*padding: 20px;*/ + /*padding: 2px;*/ } RSTextBrowser, MimeTextEdit @@ -2194,4 +2249,6 @@ PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame border-radius: 6px; } - +MainWindow QListWidget { + font-size: 12pt; +} diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index e301f6c53..da0a73ac4 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1176,6 +1176,10 @@ GxsForumThreadWidget QToolButton#subscribeToolButton:hover { border-radius: 4px; } +GxsForumThreadWidget QWidget#threadTreeWidget::item { + padding: 2px; +} + GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton { font: bold; font-size: 14px; @@ -1235,11 +1239,81 @@ CreateGxsChannelMsg QPushButton#postButton:hover { padding: 2px; } +CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, +IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + +CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, +IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover, +ShareManager QPushButton#closeButton { + background: #03b1f3; + border-radius: 4px; + min-width: 4em; + padding: 2px; +} + +CreateGxsForumMsg QPushButton#postButton:disabled { + font: bold; + font-size: 15px; + color: white; + background: #d40000; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + +ShareManager QPushButton#closeButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; + padding-left: 6px; + padding-right: 6px; +} + +ShareManager QPushButton#addButton { + font: bold; + font-size: 15px; + color: white; + background: #32CD32; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 4px; +} + +ShareManager QPushButton#addButton:hover { + background: #5AD75A; + border-radius: 4px; + min-width: 4em; + padding: 4px; +} + QTabBar#smTab::tab{ height: 32px; width: 32px; } +QLabel#avatarLabel{ + border: 2px solid #CCCCCC; + border-radius: 4px; +} + PostedCreatePostDialog QPushButton#submitButton { font: bold; font-size: 15px; @@ -1349,7 +1423,6 @@ BoardPostDisplayWidget_card QLabel#titleLabel{ font: bold; } - WireGroupItem QFrame#wire_frame { border: 1px solid #38444d; @@ -1371,3 +1444,7 @@ PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame border: 2px solid #38444d; border-radius: 6px; } + +MainWindow QListWidget { + font-size: 12pt; +}