update & clean up the wiki icons

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);
-	mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(IMAGE_FOLDERRED), true);
-	mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(IMAGE_FOLDERGREEN), false);
-	mOtherGroups = ui.groupTreeWidget->addCategoryItem(tr("Other Groups"), QIcon(IMAGE_FOLDERYELLOW), false);
+	mYourGroups = ui.groupTreeWidget->addCategoryItem(tr("My Groups"), QIcon(), true);
+	mSubscribedGroups = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Groups"), QIcon(), true);
+	mPopularGroups = ui.groupTreeWidget->addCategoryItem(tr("Popular Groups"), QIcon(), 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">
-              <normaloff>:/images/resource-group-new.png</normaloff>:/images/resource-group-new.png</iconset>
+             <iconset resource="../icons.qrc">
+              <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>
-            <height>462</height>
+            <width>241</width>
+            <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>
-            <height>462</height>
+            <width>510</width>
+            <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="/" >
-		<file>images/appointment-new.png</file>
-		<file>images/appointment-new_64.png</file>
-		<file>images/arrow-left.png</file>
-		<file>images/arrow-right.png</file>
-		<file>images/book2_32.png</file>
-		<file>images/story-editor.png</file>
-		<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>
+    <qresource prefix="/">
+        <file>images/arrow-left.png</file>
+        <file>images/arrow-right.png</file>
+        <file>images/addpage.png</file>
+        <file>images/editpage.png</file>
+        <file>images/reload.png</file>
+    </qresource>
 </RCC>

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)