Merge pull request #1780 from defnax/rename-posted-to-boards-and-cleanup-icons

Rename posted to boards and cleanup icons

retroshare-gui/src/gui/Posted/PostedDialog.cpp

@@ -93,13 +93,13 @@ UserNotify *PostedDialog::createUserNotify(QObject *parent)
 
 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 Boards service allows you to share images, blog posts & internet links, that spread among Retroshare nodes like forums and \
 	 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> \
      <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));
 
 	return hlp_str ;
@@ -109,9 +109,9 @@ QString PostedDialog::text(TextType type)
 {
 	switch (type) {
 	case TEXT_NAME:
-		return tr("Posted Links");
+		return tr("Boards");
 	case TEXT_NEW:
-		return tr("Create Topic");
+		return tr("Create Board");
 	case TEXT_TODO:
 		return "<b>Open points:</b><ul>"
 		       "<li>Subreddits/tag to posts support"
@@ -120,13 +120,13 @@ QString PostedDialog::text(TextType type)
 		       "</ul>";
 
 	case TEXT_YOUR_GROUP:
-		return tr("My Topics");
+		return tr("My Boards");
 	case TEXT_SUBSCRIBED_GROUP:
-		return tr("Subscribed Topics");
+		return tr("Subscribed Boards");
 	case TEXT_POPULAR_GROUP:
-		return tr("Popular Topics");
+		return tr("Popular Boards");
 	case TEXT_OTHER_GROUP:
-		return tr("Other Topics");
+		return tr("Other Boards");
 	}
 
 	return "";

retroshare-gui/src/gui/Posted/PostedDialog.h

@@ -37,7 +37,7 @@ public:
 	~PostedDialog();
 
 	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
 
 protected:

retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp

@@ -71,20 +71,20 @@ void PostedGroupDialog::initUi()
 	switch (mode())
 	{
 	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"));
 		break;
 	case MODE_SHOW:
-		setUiText(UITYPE_SERVICE_HEADER, tr("Posted Topic"));
+		setUiText(UITYPE_SERVICE_HEADER, tr("Board"));
 		break;
 	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;
 	}
 
-	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()

retroshare-gui/src/gui/Posted/PostedListWidget.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_POSTED_LIST_WIDGET
 
-#define TOPIC_DEFAULT_IMAGE ":/icons/png/posted.png"
+#define BOARD_DEFAULT_IMAGE ":/icons/png/posted.png"
 
 /* View mode */
 #define VIEW_MODE_CLASSIC  1
@@ -351,13 +351,13 @@ void PostedListWidget::insertPostedDetails(const RsPostedGroup &group)
 	ui->subscribeToolButton->setHidden(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)) ;
 
 	/* IMAGE */
-	QPixmap topicImage;
+	QPixmap boardImage;
 	if (group.mGroupImage.mData != NULL) {
-		GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, topicImage,GxsIdDetails::ORIGINAL);
+		GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, boardImage,GxsIdDetails::ORIGINAL);
 	} else {
-		topicImage = QPixmap(TOPIC_DEFAULT_IMAGE);
+		boardImage = QPixmap(BOARD_DEFAULT_IMAGE);
 	}
-	ui->logoLabel->setPixmap(topicImage);
+	ui->logoLabel->setPixmap(boardImage);
 	ui->namelabel->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
 	ui->poplabel->setText(QString::number( group.mMeta.mPop));
 	

retroshare-gui/src/gui/Posted/PostedListWidget.ui

@@ -89,7 +89,7 @@
         </property>
         <property name="icon">
          <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 name="iconSize">
          <size>
@@ -285,7 +285,7 @@
          <string notr="true"/>
         </property>
         <property name="title">
-         <string>Topic Details</string>
+         <string>Board Details</string>
         </property>
         <property name="flat">
          <bool>false</bool>
@@ -557,7 +557,7 @@ p, li { white-space: pre-wrap; }
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>614</width>
+            <width>98</width>
             <height>16</height>
            </rect>
           </property>

retroshare-gui/src/gui/Posted/Posted_images.qrc

@@ -1,16 +1,5 @@
 <RCC>
 	<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/decrease.png</file>
 		<file>images/down-arrow.png</file>
@@ -29,5 +18,6 @@
 		<file>images/down-hover.png</file>
 		<file>images/up-hover.png</file>
 		<file>images/trashcan.png</file>
+		<file>images/write.png</file>
 	</qresource>
 </RCC>

retroshare-gui/src/gui/feeds/PostedGroupItem.cpp

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

retroshare-gui/src/gui/feeds/PostedGroupItem.ui

@@ -125,7 +125,10 @@
            <string/>
           </property>
           <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>
          </widget>
         </item>
@@ -147,7 +150,7 @@
              </font>
             </property>
             <property name="text">
-             <string notr="true">Posted</string>
+             <string notr="true">Board</string>
             </property>
            </widget>
           </item>
@@ -298,7 +301,7 @@
          <item>
           <widget class="QGroupBox" name="groupBox">
            <property name="title">
-            <string>Posted Description</string>
+            <string>Board Description</string>
            </property>
            <layout class="QHBoxLayout">
             <item>
@@ -321,7 +324,7 @@
               </property>
               <property name="text">
                <string notr="true">Description 
- of Posted</string>
+ of Board</string>
               </property>
              </widget>
             </item>

retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp

@@ -93,9 +93,9 @@ void GroupShareKey::setTyp()
         if (!rsPosted)
             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

retroshare-gui/src/gui/settings/PostedPage.cpp

@@ -30,7 +30,7 @@ PostedPage::PostedPage(QWidget * parent, Qt::WindowFlags flags)
 	setAttribute(Qt::WA_QuitOnClose, false);
 
 	/* Initialize GroupFrameSettingsWidget */
-	ui->groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each topic in a new tab"));
+	ui->groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each board in a new tab"));
 	ui->groupFrameSettingsWidget->setType(GroupFrameSettings::Posted);
 }
 

retroshare-gui/src/gui/settings/PostedPage.h

@@ -39,7 +39,7 @@ public:
 	virtual void load();
 
 	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/posted.svg") ; }
-	virtual QString pageName() const { return tr("Links") ; }
+	virtual QString pageName() const { return tr("Boards") ; }
 	virtual QString helpText() const { return ""; }
 
 private: