Rename Posted to Boards & cleanup remove old icons

Rename Posted to Boards & cleanup remove old icons
This commit is contained in:
defnax 2020-02-08 17:29:50 +01:00
parent fffc516b72
commit f12a36fcfb
34 changed files with 35 additions and 42 deletions

View File

@ -93,13 +93,13 @@ UserNotify *PostedDialog::createUserNotify(QObject *parent)
QString PostedDialog::getHelpString() const QString PostedDialog::getHelpString() const
{ {
QString hlp_str = tr("<h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Posted</h1> \ QString hlp_str = tr("<h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Boards</h1> \
<p>The posted service allows you to share internet links, that spread among Retroshare nodes like forums and \ <p>The poards service allows you to share internet links, that spread among Retroshare nodes like forums and \
channels</p> \ channels</p> \
<p>Links can be commented by subscribed users. A promotion system also gives the opportunity to \ <p>Posts can be commented by subscribed users. A promotion system also gives the opportunity to \
enlight important links.</p> \ enlight important links.</p> \
<p>There is no restriction on which links are shared. Be careful when clicking on them.</p>\ <p>There is no restriction on which links are shared. Be careful when clicking on them.</p>\
<p>Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.</p>\ <p>Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.</p>\
").arg(QString::number(rsPosted->getDefaultStoragePeriod()/86400)).arg(QString::number(rsPosted->getDefaultSyncPeriod()/86400)); ").arg(QString::number(rsPosted->getDefaultStoragePeriod()/86400)).arg(QString::number(rsPosted->getDefaultSyncPeriod()/86400));
return hlp_str ; return hlp_str ;
@ -109,9 +109,9 @@ QString PostedDialog::text(TextType type)
{ {
switch (type) { switch (type) {
case TEXT_NAME: case TEXT_NAME:
return tr("Posted Links"); return tr("Boards");
case TEXT_NEW: case TEXT_NEW:
return tr("Create Topic"); return tr("Create Board");
case TEXT_TODO: case TEXT_TODO:
return "<b>Open points:</b><ul>" return "<b>Open points:</b><ul>"
"<li>Subreddits/tag to posts support" "<li>Subreddits/tag to posts support"
@ -120,13 +120,13 @@ QString PostedDialog::text(TextType type)
"</ul>"; "</ul>";
case TEXT_YOUR_GROUP: case TEXT_YOUR_GROUP:
return tr("My Topics"); return tr("My Boards");
case TEXT_SUBSCRIBED_GROUP: case TEXT_SUBSCRIBED_GROUP:
return tr("Subscribed Topics"); return tr("Subscribed Boards");
case TEXT_POPULAR_GROUP: case TEXT_POPULAR_GROUP:
return tr("Popular Topics"); return tr("Popular Boards");
case TEXT_OTHER_GROUP: case TEXT_OTHER_GROUP:
return tr("Other Topics"); return tr("Other Boards");
} }
return ""; return "";

View File

@ -37,7 +37,7 @@ public:
~PostedDialog(); ~PostedDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_POSTED) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_POSTED) ; } //MainPage
virtual QString pageName() const { return tr("Links") ; } //MainPage virtual QString pageName() const { return tr("Boards") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
protected: protected:

View File

@ -71,20 +71,20 @@ void PostedGroupDialog::initUi()
switch (mode()) switch (mode())
{ {
case MODE_CREATE: case MODE_CREATE:
setUiText(UITYPE_SERVICE_HEADER, tr("Create New Topic")); setUiText(UITYPE_SERVICE_HEADER, tr("Create New Board"));
setUiText(UITYPE_BUTTONBOX_OK, tr("Create")); setUiText(UITYPE_BUTTONBOX_OK, tr("Create"));
break; break;
case MODE_SHOW: case MODE_SHOW:
setUiText(UITYPE_SERVICE_HEADER, tr("Posted Topic")); setUiText(UITYPE_SERVICE_HEADER, tr("Board"));
break; break;
case MODE_EDIT: case MODE_EDIT:
setUiText(UITYPE_SERVICE_HEADER, tr("Edit Topic")); setUiText(UITYPE_SERVICE_HEADER, tr("Edit Board"));
setUiText(UITYPE_BUTTONBOX_OK, tr("Update Topic")); setUiText(UITYPE_BUTTONBOX_OK, tr("Update Board"));
break; break;
} }
setUiText(UITYPE_ADD_ADMINS_CHECKBOX, tr("Add Topic Admins")); setUiText(UITYPE_ADD_ADMINS_CHECKBOX, tr("Add Board Admins"));
setUiText(UITYPE_CONTACTS_DOCK, tr("Select Topic Admins")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Board Admins"));
} }
QPixmap PostedGroupDialog::serviceImage() QPixmap PostedGroupDialog::serviceImage()

View File

@ -89,7 +89,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="Posted_images.qrc"> <iconset resource="Posted_images.qrc">
<normaloff>:/images/posted_24.png</normaloff>:/images/posted_24.png</iconset> <normaloff>:/images/write.png</normaloff>:/images/write.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -557,7 +557,7 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>614</width> <width>98</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>

View File

@ -1,16 +1,5 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/posted_16.png</file>
<file>images/posted_24.png</file>
<file>images/posted_32.png</file>
<file>images/posted_48.png</file>
<file>images/posted_64.png</file>
<file>images/posted_add_24.png</file>
<file>images/posted_add_32.png</file>
<file>images/posted_add_64.png</file>
<file>images/hot_24.png</file>
<file>images/new_24.png</file>
<file>images/posted_32_new.png</file>
<file>images/expand.png</file> <file>images/expand.png</file>
<file>images/decrease.png</file> <file>images/decrease.png</file>
<file>images/down-arrow.png</file> <file>images/down-arrow.png</file>
@ -29,5 +18,6 @@
<file>images/down-hover.png</file> <file>images/down-hover.png</file>
<file>images/up-hover.png</file> <file>images/up-hover.png</file>
<file>images/trashcan.png</file> <file>images/trashcan.png</file>
<file>images/write.png</file>
</qresource> </qresource>
</RCC> </RCC>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 954 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -141,15 +141,15 @@ void PostedGroupItem::fill()
GxsIdDetails::loadPixmapFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, postedImage,GxsIdDetails::ORIGINAL); GxsIdDetails::loadPixmapFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, postedImage,GxsIdDetails::ORIGINAL);
ui->logoLabel->setPixmap(QPixmap(postedImage)); ui->logoLabel->setPixmap(QPixmap(postedImage));
} else { } else {
ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png")); ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
} }
//TODO - nice icon for subscribed group //TODO - nice icon for subscribed group
// if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { // if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png")); // ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
// } else { // } else {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png")); // ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
// } // }
if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) { if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
@ -160,11 +160,11 @@ void PostedGroupItem::fill()
// if (mIsNew) // if (mIsNew)
// { // {
ui->titleLabel->setText(tr("New Posted")); ui->titleLabel->setText(tr("New Board"));
// } // }
// else // else
// { // {
// ui->titleLabel->setText(tr("Updated Posted")); // ui->titleLabel->setText(tr("Updated Board"));
// } // }
if (mIsHome) if (mIsHome)

View File

@ -125,7 +125,10 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../Posted/Posted_images.qrc">:/images/posted_64.png</pixmap> <pixmap resource="../icons.qrc">:/icons/png/posted.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -147,7 +150,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">Posted</string> <string notr="true">Board</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -298,7 +301,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Posted Description</string> <string>Board Description</string>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
@ -321,7 +324,7 @@
</property> </property>
<property name="text"> <property name="text">
<string notr="true">Description <string notr="true">Description
of Posted</string> of Board</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -93,9 +93,9 @@ void GroupShareKey::setTyp()
if (!rsPosted) if (!rsPosted)
return; return;
ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png")); ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/posted.png"));
ui->headerFrame->setHeaderText(tr("Share topic admin permissions")); ui->headerFrame->setHeaderText(tr("Share board admin permissions"));
ui->sharekeyinfo_label->setText(tr("You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.")); ui->sharekeyinfo_label->setText(tr("You can allow your friends to edit the board. Select them in the list below. Note: it is not possible to revoke Board admin permissions."));
} }
else else