Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

disabled timer & little small ui changes

Browse source 
* Set icons for some buttons
* Update tree on subscribe actions
This commit is contained in:
defnax 2021-01-06 18:00:41 +01:00
parent 1e803de32f
commit 56462fd507
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View file

@ -121,12 +121,13 @@ WikiDialog::WikiDialog(QWidget *parent) : RsGxsUpdateBroadcastPage(rsWiki, paren
connect(newGroupButton, SIGNAL(clicked()), this, SLOT(OpenOrShowAddGroupDialog())); connect(newGroupButton, SIGNAL(clicked()), this, SLOT(OpenOrShowAddGroupDialog()));
ui.groupTreeWidget->addToolButton(newGroupButton); ui.groupTreeWidget->addToolButton(newGroupButton);
QTimer *timer = new QTimer(this); //QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertWikiGroups())); //timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertWikiGroups()));
timer->start(1000); //timer->start(5000);
// load settings // load settings
processSettings(true); processSettings(true);
updateDisplay(true);
} }
WikiDialog::~WikiDialog() WikiDialog::~WikiDialog()
@ -478,7 +479,6 @@ void WikiDialog::requestWikiPage(const RsGxsGrpMsgIdPair &msgId)
mWikiQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, WIKIDIALOG_WIKI_PAGE); mWikiQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, WIKIDIALOG_WIKI_PAGE);
} }
void WikiDialog::loadWikiPage(const uint32_t &token) void WikiDialog::loadWikiPage(const uint32_t &token)
{ {
std::cerr << "WikiDialog::loadWikiPage()"; std::cerr << "WikiDialog::loadWikiPage()";
@ -569,6 +569,8 @@ void WikiDialog::wikiSubscribe(bool subscribe)
uint32_t token; uint32_t token;
rsWiki->subscribeToGroup(token, mGroupId, subscribe); rsWiki->subscribeToGroup(token, mGroupId, subscribe);
insertWikiGroups();
} }

6
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View file

@ -85,6 +85,10 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
mHistoryLoaded = false; mHistoryLoaded = false;
mHistoryMergeMode = false; mHistoryMergeMode = false;
ui.toolButton_Show->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/down-arrow.png")));
ui.toolButton_Hide->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png")));
ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/search.png")));
ui.checkBox_OldHistory->setChecked(false); ui.checkBox_OldHistory->setChecked(false);
mOldHistoryEnabled = false; mOldHistoryEnabled = false;
ui.groupBox_History->hide(); ui.groupBox_History->hide();
@ -309,6 +313,7 @@ void WikiEditDialog::previewToggle()
{ {
mPreviewMode = false; mPreviewMode = false;
ui.pushButton_Preview->setText(tr("Preview")); ui.pushButton_Preview->setText(tr("Preview"));
ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/search.png")));
} }
else else
{ {
@ -316,6 +321,7 @@ void WikiEditDialog::previewToggle()
mCurrentText = ui.textEdit->toPlainText(); mCurrentText = ui.textEdit->toPlainText();
mPreviewMode = true; mPreviewMode = true;
ui.pushButton_Preview->setText(tr("Edit Page")); ui.pushButton_Preview->setText(tr("Edit Page"));
ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/pencil-edit-button.png")));
} }