Merge pull request #1799 from defnax/update-and-cleanup-the-wiki-icons

Update and cleanup the wiki icons & small improvements

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

@@ -26,6 +26,7 @@
 #include "rshare.h"
 #include "PostedItem.h"
 #include "gui/feeds/FeedHolder.h"
+#include "gui/RetroShareLink.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "util/misc.h"
 #include "util/HandleRichText.h"
@@ -132,6 +133,7 @@ void PostedItem::setup()
 
 	ui->clearButton->hide();
 	ui->readAndClearButton->hide();
+	ui->nameLabel->hide();
 }
 
 bool PostedItem::setGroup(const RsPostedGroup &group, bool doFill)
@@ -250,6 +252,9 @@ void PostedItem::fill()
 		/* Wait for all requests */
 		return;
 	}
+	
+	RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroup.mMeta.mGroupId, groupName());
+	ui->nameLabel->setText(link.toHtml());
 
 	QPixmap sqpixmap2 = QPixmap(":/images/thumb-default.png");
 
@@ -392,11 +397,13 @@ void PostedItem::fill()
 	{
 		ui->clearButton->hide();
 		ui->readAndClearButton->hide();
+		ui->nameLabel->hide();
 	}
 	else
 	{
 		ui->clearButton->show();
 		ui->readAndClearButton->show();
+		ui->nameLabel->show();
 	}
 
 	// disable voting buttons - if they have already voted.

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

@@ -320,6 +320,23 @@
           <property name="rightMargin">
            <number>6</number>
           </property>
+          <item>
+           <widget class="QLabel" name="nameLabel">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <italic>true</italic>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Name</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QLabel" name="fromBoldLabel">
             <property name="sizePolicy">

retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp

@@ -73,7 +73,7 @@
 #define IMAGE_NEWFORUM       ":/images/new_forum16.png"
 #define IMAGE_FORUMAUTHD     ":/images/konv_message2.png"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
-#define IMAGE_WIKI           ":/images/wikibook_32.png"
+#define IMAGE_WIKI           ":/icons/png/wiki.png"
 #define IMAGE_EDIT           ":/images/edit_16.png"
 
 
@@ -108,10 +108,10 @@ WikiDialog::WikiDialog(QWidget *parent)
 
 
 	/* Setup Group Tree */
-	mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(IMAGE_FOLDER), true);
+	mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(), true);
-	mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(IMAGE_FOLDERRED), true);
+	mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(), true);
-	mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(IMAGE_FOLDERGREEN), false);
+	mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(), false);
-	mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(IMAGE_FOLDERYELLOW), false);
+	mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(), false);
 
 }
 

retroshare-gui/src/gui/WikiPoos/WikiDialog.ui

@@ -37,7 +37,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QFrame" name="titleBarFrame">
+        <widget class="QFrame" name="toolBarFrameTop">
          <property name="maximumSize">
           <size>
            <width>16777215</width>
@@ -51,7 +51,16 @@
           <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>2</number>
+          </property>
+          <property name="topMargin">
+           <number>2</number>
+          </property>
+          <property name="rightMargin">
+           <number>2</number>
+          </property>
+          <property name="bottomMargin">
            <number>2</number>
           </property>
           <item>
@@ -66,7 +75,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="Wiki_images.qrc">:/images/wikibook_32.png</pixmap>
+             <pixmap resource="../icons.qrc">:/icons/png/wiki.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -93,8 +102,8 @@
              <string>New Group</string>
             </property>
             <property name="icon">
-             <iconset resource="Wiki_images.qrc">
+             <iconset resource="../icons.qrc">
-              <normaloff>:/images/resource-group-new.png</normaloff>:/images/resource-group-new.png</iconset>
+              <normaloff>:/icons/png/add.png</normaloff>:/icons/png/add.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -123,12 +132,21 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>232</width>
+            <width>241</width>
-            <height>462</height>
+            <height>480</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -186,7 +204,16 @@
           <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>2</number>
+          </property>
+          <property name="topMargin">
+           <number>2</number>
+          </property>
+          <property name="rightMargin">
+           <number>2</number>
+          </property>
+          <property name="bottomMargin">
            <number>2</number>
           </property>
           <item>
@@ -261,7 +288,7 @@
             </property>
             <property name="icon">
              <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/republish.png</normaloff>:/images/republish.png</iconset>
+              <normaloff>:/images/reload.png</normaloff>:/images/reload.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -284,7 +311,7 @@
             </property>
             <property name="icon">
              <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/story-editor.png</normaloff>:/images/story-editor.png</iconset>
+              <normaloff>:/images/editpage.png</normaloff>:/images/editpage.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -314,7 +341,7 @@
             </property>
             <property name="icon">
              <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/appointment-new.png</normaloff>:/images/appointment-new.png</iconset>
+              <normaloff>:/images/addpage.png</normaloff>:/images/addpage.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -340,7 +367,7 @@
             </property>
             <property name="icon">
              <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/republish.png</normaloff>:/images/republish.png</iconset>
+              <normaloff>:/images/reload.png</normaloff>:/images/reload.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -392,8 +419,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>501</width>
+            <width>510</width>
-            <height>462</height>
+            <height>480</height>
            </rect>
           </property>
           <property name="styleSheet">
@@ -443,6 +470,7 @@
  </customwidgets>
  <resources>
   <include location="Wiki_images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp

@@ -414,7 +414,7 @@ void WikiEditDialog::setNewPage()
 	ui.groupBox_History->hide();
 	ui.pushButton_History->setText(tr("Show Edit History"));
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/appointment-new_64.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/images/addpage.png"));
 	ui.headerFrame->setHeaderText(tr("Create New Wiki Page"));
 	setWindowTitle(tr("Create New Wiki Page"));
 
@@ -569,7 +569,7 @@ void WikiEditDialog::setupData(const RsGxsGroupId &groupId, const RsGxsMessageId
 		requestPage(msgId);
 	}
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/images/editpage.png"));
 	ui.headerFrame->setHeaderText(tr("Edit Wiki Page"));
 	setWindowTitle(tr("Edit Wiki Page"));
 

retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc

@@ -1,17 +1,9 @@
 <RCC>
-	<qresource prefix="/" >
+    <qresource prefix="/">
-		<file>images/appointment-new.png</file>
+        <file>images/arrow-left.png</file>
-		<file>images/appointment-new_64.png</file>
+        <file>images/arrow-right.png</file>
-		<file>images/arrow-left.png</file>
+        <file>images/addpage.png</file>
-		<file>images/arrow-right.png</file>
+        <file>images/editpage.png</file>
-		<file>images/book2_32.png</file>
+        <file>images/reload.png</file>
-		<file>images/story-editor.png</file>
+    </qresource>
-		<file>images/story-editor_48.png</file>
-		<file>images/republish.png</file>
-		<file>images/resource-group-new.png</file>
-		<file>images/resource-group_64.png</file>
-		<file>images/resource-group-new_48.png</file>
-		<file>images/resource-group-new_64.png</file>
-		<file>images/wikibook_32.png</file>
-	</qresource>
 </RCC>

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

@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include <QMessageBox>
+#include <QPushButton>
 
 #include "util/misc.h"
 #include "util/DateTime.h"
@@ -105,7 +106,6 @@ void GxsGroupDialog::init()
 
 
 	connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
-	connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
 
 	ui.typePublic->setChecked(true);
 	ui.distributionValueLabel->setText(tr("Public"));
@@ -377,7 +377,6 @@ void GxsGroupDialog::setupVisibility()
 	ui.groupName->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_NAME);
 
 	ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
-	ui.addLogoButton->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
 
 	ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
 
@@ -418,8 +417,6 @@ void GxsGroupDialog::setAllReadonly()
 void GxsGroupDialog::setupReadonly()
 {
 
-	ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON));
-
 	ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN));
 
 	ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS));

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -59,160 +59,114 @@
          <property name="title">
           <string/>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <layout class="QGridLayout" name="gridLayout">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="leftMargin">
-           <number>4</number>
-          </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>3</number>
-          </property>
-          <property name="rightMargin">
-           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>4</number>
+           <number>3</number>
           </property>
-          <item>
+          <item row="0" column="0" rowspan="2">
-           <layout class="QGridLayout" name="gridLayout_4">
+           <widget class="ClickableLabel" name="groupLogo">
-            <property name="horizontalSpacing">
+            <property name="minimumSize">
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to add a Logo&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <property name="pixmap">
+             <pixmap resource="../icons.qrc">:/icons/png/add-image.png</pixmap>
+            </property>
+            <property name="scaledContents">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="5">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="verticalSpacing">
+            <property name="leftMargin">
-             <number>0</number>
+             <number>6</number>
             </property>
-            <item row="0" column="0" rowspan="2">
+            <item>
-             <widget class="QLabel" name="groupLogo">
+             <widget class="QLabel" name="label">
-              <property name="minimumSize">
+              <property name="text">
-               <size>
+               <string>Name</string>
-                <width>64</width>
-                <height>64</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>64</width>
-                <height>64</height>
-               </size>
-              </property>
-              <property name="frameShape">
-               <enum>QFrame::StyledPanel</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Raised</enum>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="../images.qrc">:/images/channels.png</pixmap>
-              </property>
-              <property name="scaledContents">
-               <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout">
+             <widget class="QLineEdit" name="groupName"/>
-              <property name="spacing">
-               <number>6</number>
-              </property>
-              <property name="leftMargin">
-               <number>6</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Name</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="groupName"/>
-              </item>
-             </layout>
-            </item>
-            <item row="1" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_2">
-              <property name="spacing">
-               <number>9</number>
-              </property>
-              <property name="leftMargin">
-               <number>3</number>
-              </property>
-              <property name="topMargin">
-               <number>3</number>
-              </property>
-              <property name="rightMargin">
-               <number>3</number>
-              </property>
-              <property name="bottomMargin">
-               <number>3</number>
-              </property>
-              <item>
-               <widget class="QPushButton" name="addLogoButton">
-                <property name="text">
-                 <string>Add Icon</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QLabel" name="label_2">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The identity here can be used to send feedback.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Owner:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="GxsIdChooser" name="idChooser"/>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="addAdmins_cb">
-                <property name="toolTip">
-                 <string/>
-                </property>
-                <property name="text">
-                 <string>Add moderators</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/settings/permissions.svg</normaloff>:/icons/settings/permissions.svg</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="pubKeyShare_cb">
-                <property name="toolTip">
-                 <string>Key recipients can publish to restricted-type group and can view and publish for private-type channels</string>
-                </property>
-                <property name="text">
-                 <string>Share Publish Key</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
             </item>
            </layout>
           </item>
+          <item row="1" column="1">
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>132</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="2">
+           <widget class="QLabel" name="label_2">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The identity here can be used to send feedback.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Owner:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <widget class="GxsIdChooser" name="idChooser"/>
+          </item>
+          <item row="1" column="4">
+           <widget class="QCheckBox" name="addAdmins_cb">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Add moderators</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/settings/permissions.svg</normaloff>:/icons/settings/permissions.svg</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="5">
+           <widget class="QCheckBox" name="pubKeyShare_cb">
+            <property name="toolTip">
+             <string>Key recipients can publish to restricted-type group and can view and publish for private-type channels</string>
+            </property>
+            <property name="text">
+             <string>Share Publish Key</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -894,6 +848,11 @@
    <extends>QComboBox</extends>
    <header>gui/common/GroupChooser.h</header>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>util/ClickableLabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>

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

@@ -87,7 +87,7 @@ void WikiGroupDialog::initUi()
 
 QPixmap WikiGroupDialog::serviceImage()
 {
-	return QPixmap(":/images/resource-group-new_64.png");
+	return QPixmap(":/icons/png/wiki.png");
 }
 
 bool WikiGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)

retroshare-gui/src/gui/qss/stylesheet/Standard.qss

@@ -813,6 +813,11 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button {
 
 }
 
+GxsGroupDialog QLabel#groupLogo{
+	border: 2px solid #CCCCCC;
+	border-radius: 3px;
+}
+
 PostedItem QFrame#frame_notes {
 	background: white;
 }
@@ -880,12 +885,12 @@ PostedCreatePostDialog QPushButton#submitButton {
 	border-radius: 4px;
 	max-height: 27px;
 	min-width: 4em;
-    padding: 2px;
+	padding: 2px;
 }
 
 PostedCreatePostDialog QPushButton#submitButton:hover {
 	background: #03b1f3;
 	border-radius: 4px;
 	min-width: 4em;
-    padding: 2px;
+	padding: 2px;
-}
+}

retroshare-gui/src/util/ClickableLabel.h

@@ -38,7 +38,7 @@ signals:
 protected:
     void mousePressEvent(QMouseEvent* event);
 
-	void enterEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 1px solid #3A3939; }");}
+	void enterEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
 
     void leaveEvent(QEvent *ev) override { setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");}