cleanup & removed the old icons from composer

retroshare-gui/src/gui/icons.qrc

@@ -311,5 +311,10 @@
         <file>icons/mail/reply.png</file>
         <file>icons/mail/reply-all.png</file>
         <file>icons/mail/attach24.png</file>
+        <file>icons/textedit/align.png</file>
+        <file>icons/textedit/font-decrease.png</file>
+        <file>icons/textedit/smile.png</file>
+        <file>icons/textedit/font-increase.png</file>
+        <file>icons/textedit/code.png</file>
     </qresource>
 </RCC>

retroshare-gui/src/gui/images.qrc

@@ -351,38 +351,6 @@
     <file>images/mimetypes/source_c.png</file>
     <file>images/mimetypes/source_cpp.png</file>
     <file>images/mimetypes/source_h.png</file>
-    <file>images/textedit/textbold.png</file>
-    <file>images/textedit/textitalic.png</file>
-    <file>images/textedit/textunder.png</file>
-    <file>images/textedit/textjustify.png</file>
-    <file>images/textedit/textcenter.png</file>
-    <file>images/textedit/textleft.png</file>
-    <file>images/textedit/textright.png</file>
-    <file>images/textedit/editcopy.png</file>
-    <file>images/textedit/editcut.png</file>
-    <file>images/textedit/editpaste.png</file>
-    <file>images/textedit/editredo.png</file>
-    <file>images/textedit/editundo.png</file>
-    <file>images/textedit/edit-image-face-add.png</file>
-    <file>images/textedit/exportpdf.png</file>
-    <file>images/textedit/filenew.png</file>
-    <file>images/textedit/fileopen.png</file>
-    <file>images/textedit/fileprint.png</file>
-    <file>images/textedit/filesave.png</file>
-    <file>images/textedit/format-text-color.png</file>
-    <file>images/textedit/format-text-strikethrough.png</file>
-    <file>images/textedit/format-indent-less.png</file>
-    <file>images/textedit/format-indent-more.png</file>
-    <file>images/textedit/insert-link.png</file>
-    <file>images/textedit/format-list-ordered.png</file>
-    <file>images/textedit/format-list-unordered.png</file>
-    <file>images/textedit/zoomin.png</file>
-    <file>images/textedit/zoomout.png</file>
-    <file>images/textedit/format_font_size_more.png</file>
-    <file>images/textedit/format_font_size_less.png</file>
-    <file>images/textedit/hi22-action-format-text-blockquote.png</file>
-    <file>images/textedit/hi22-action-format-text-code.png</file>
-    <file>images/textedit/hi22-action-insert-more-mark.png</file>
     <file>images/toaster/backgroundtoaster.png</file>
     <file>images/thumb-default-video.png</file>
     <file>images/user/add_user24.png</file>

retroshare-gui/src/gui/msgs/MessageComposer.cpp

@@ -223,16 +223,16 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     QActionGroup *grp = new QActionGroup(this);
     connect(grp, SIGNAL(triggered(QAction *)), this, SLOT(textAlign(QAction *)));
 
-    actionAlignLeft = new QAction(QIcon(":/images/textedit/textleft.png"), tr("&Left"), grp);
+    actionAlignLeft = new QAction(QIcon(""), tr("&Left"), grp);
     actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
     actionAlignLeft->setCheckable(true);
-    actionAlignCenter = new QAction(QIcon(":/images/textedit/textcenter.png"), tr("C&enter"), grp);
+    actionAlignCenter = new QAction(QIcon(""), tr("C&enter"), grp);
     actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
     actionAlignCenter->setCheckable(true);
-    actionAlignRight = new QAction(QIcon(":/images/textedit/textright.png"), tr("&Right"), grp);
+    actionAlignRight = new QAction(QIcon(""), tr("&Right"), grp);
     actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
     actionAlignRight->setCheckable(true);
-    actionAlignJustify = new QAction(QIcon(":/images/textedit/textjustify.png"), tr("&Justify"), grp);
+    actionAlignJustify = new QAction(QIcon(""), tr("&Justify"), grp);
     actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
     actionAlignJustify->setCheckable(true);
     
@@ -280,8 +280,6 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     connect(ui.comboSize, SIGNAL(activated(const QString &)),this, SLOT(textSize(const QString &)));
     ui.comboSize->setCurrentIndex(ui.comboSize->findText(QString::number(QApplication::font().pointSize())));
 
-    ui.textalignmentbtn->setIcon(QIcon(QString(":/images/textedit/textcenter.png")));
-
     QMenu * alignmentmenu = new QMenu();
     alignmentmenu->addAction(actionAlignLeft);
     alignmentmenu->addAction(actionAlignCenter);
@@ -1892,19 +1890,19 @@ void MessageComposer::setupFileActions()
 
     QAction *a;
 
-    a = new QAction(QIcon(":/images/textedit/filenew.png"), tr("&New"), this);
+    a = new QAction(QIcon(""), tr("&New"), this);
     a->setShortcut(QKeySequence::New);
     connect(a, SIGNAL(triggered()), this, SLOT(fileNew()));
     menu->addAction(a);
 
-    a = new QAction(QIcon(":/images/textedit/fileopen.png"), tr("&Open..."), this);
+    a = new QAction(QIcon(""), tr("&Open..."), this);
     a->setShortcut(QKeySequence::Open);
     connect(a, SIGNAL(triggered()), this, SLOT(fileOpen()));
     menu->addAction(a);
 
     menu->addSeparator();
 
-    actionSave = a = new QAction(QIcon(":/images/textedit/filesave.png"), tr("&Save"), this);
+    actionSave = a = new QAction(QIcon(""), tr("&Save"), this);
     a->setShortcut(QKeySequence::Save);
     connect(a, SIGNAL(triggered()), this, SLOT(saveasDraft()));
     a->setEnabled(false);
@@ -1919,7 +1917,7 @@ void MessageComposer::setupFileActions()
     menu->addAction(a);
     menu->addSeparator();
 
-    a = new QAction(QIcon(":/images/textedit/fileprint.png"), tr("&Print..."), this);
+    a = new QAction(QIcon(""), tr("&Print..."), this);
     a->setShortcut(QKeySequence::Print);
     connect(a, SIGNAL(triggered()), this, SLOT(filePrint()));
     menu->addAction(a);
@@ -1928,7 +1926,7 @@ void MessageComposer::setupFileActions()
     connect(a, SIGNAL(triggered()), this, SLOT(filePrintPreview()));
     menu->addAction(a);*/
 
-    a = new QAction(QIcon(":/images/textedit/exportpdf.png"), tr("&Export PDF..."), this);
+    a = new QAction(QIcon(""), tr("&Export PDF..."), this);
     a->setShortcut(Qt::CTRL + Qt::Key_D);
     connect(a, SIGNAL(triggered()), this, SLOT(filePrintPdf()));
     menu->addAction(a);
@@ -1947,20 +1945,20 @@ void MessageComposer::setupEditActions()
     menuBar()->addMenu(menu);
 
     QAction *a;
-    a = actionUndo = new QAction(QIcon(":/images/textedit/editundo.png"), tr("&Undo"), this);
+    a = actionUndo = new QAction(QIcon(""), tr("&Undo"), this);
     a->setShortcut(QKeySequence::Undo);
     menu->addAction(a);
-    a = actionRedo = new QAction(QIcon(":/images/textedit/editredo.png"), tr("&Redo"), this);
+    a = actionRedo = new QAction(QIcon(""), tr("&Redo"), this);
     a->setShortcut(QKeySequence::Redo);
     menu->addAction(a);
     menu->addSeparator();
-    a = actionCut = new QAction(QIcon(":/images/textedit/editcut.png"), tr("Cu&t"), this);
+    a = actionCut = new QAction(QIcon(""), tr("Cu&t"), this);
     a->setShortcut(QKeySequence::Cut);
     menu->addAction(a);
-    a = actionCopy = new QAction(QIcon(":/images/textedit/editcopy.png"), tr("&Copy"), this);
+    a = actionCopy = new QAction(QIcon(""), tr("&Copy"), this);
     a->setShortcut(QKeySequence::Copy);
     menu->addAction(a);
-    a = actionPaste = new QAction(QIcon(":/images/textedit/editpaste.png"), tr("&Paste"), this);
+    a = actionPaste = new QAction(QIcon(""), tr("&Paste"), this);
     a->setShortcut(QKeySequence::Paste);
     menu->addAction(a);
     actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());

retroshare-gui/src/gui/msgs/MessageComposer.ui

@@ -14,8 +14,8 @@
    <string>Compose</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
+   <iconset resource="../icons.qrc">
+    <normaloff>:/icons/mail/compose.png</normaloff>:/icons/mail/compose.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="centralwidgetGLayout">
@@ -323,8 +323,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/format_font_size_more.png</normaloff>:/images/textedit/format_font_size_more.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/font-increase.png</normaloff>:/icons/textedit/font-increase.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -355,8 +355,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/format_font_size_less.png</normaloff>:/images/textedit/format_font_size_less.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/font-decrease.png</normaloff>:/icons/textedit/font-decrease.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -393,8 +393,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/textbold.png</normaloff>:/images/textedit/textbold.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/bold.png</normaloff>:/icons/textedit/bold.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -434,8 +434,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/textitalic.png</normaloff>:/images/textedit/textitalic.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/italic.png</normaloff>:/icons/textedit/italic.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -476,7 +476,7 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/png/add-image.png</normaloff>:/icons/png/add-image.png</iconset>
+                  <normaloff>:/icons/textedit/photo-of-a-landscape.png</normaloff>:/icons/textedit/photo-of-a-landscape.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -512,6 +512,10 @@
                 <property name="text">
                  <string/>
                 </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/align.png</normaloff>:/icons/textedit/align.png</iconset>
+                </property>
                 <property name="iconSize">
                  <size>
                   <width>24</width>
@@ -519,7 +523,7 @@
                  </size>
                 </property>
                 <property name="popupMode">
-                 <enum>QToolButton::MenuButtonPopup</enum>
+                 <enum>QToolButton::InstantPopup</enum>
                 </property>
                 <property name="autoRaise">
                  <bool>true</bool>
@@ -538,13 +542,13 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/hi22-action-format-text-code.png</normaloff>:/images/textedit/hi22-action-format-text-code.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/code.png</normaloff>:/icons/textedit/code.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
-                  <width>22</width>
-                  <height>22</height>
+                  <width>24</width>
+                  <height>24</height>
                  </size>
                 </property>
                 <property name="autoRaise">
@@ -589,8 +593,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/textunder.png</normaloff>:/images/textedit/textunder.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/underline.png</normaloff>:/icons/textedit/underline.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -612,8 +616,8 @@
                  <enum>Qt::NoFocus</enum>
                 </property>
                 <property name="icon">
-                 <iconset resource="../emojione.qrc">
-                  <normaloff>:/emojione/1F603.png</normaloff>:/emojione/1F603.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/smile.png</normaloff>:/icons/textedit/smile.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -676,20 +680,20 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/textedit/format-list-unordered.png</normaloff>:/images/textedit/format-list-unordered.png</iconset>
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/textedit/numberd-list.png</normaloff>:/icons/textedit/numberd-list.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
-                  <width>22</width>
-                  <height>22</height>
+                  <width>24</width>
+                  <height>24</height>
                  </size>
                 </property>
                 <property name="checkable">
                  <bool>false</bool>
                 </property>
                 <property name="popupMode">
-                 <enum>QToolButton::MenuButtonPopup</enum>
+                 <enum>QToolButton::InstantPopup</enum>
                 </property>
                 <property name="autoRaise">
                  <bool>true</bool>
@@ -1165,10 +1169,6 @@ border-image: url(:/images/closepressed.png)
    </property>
   </action>
   <action name="actionReply">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/replymail24.png</normaloff>:/images/replymail24.png</iconset>
-   </property>
    <property name="text">
     <string>Reply</string>
    </property>

retroshare-gui/src/util/printpreview.cpp

@@ -207,7 +207,7 @@ PrintPreview::PrintPreview(const QTextDocument *document, QWidget *parent)
     tb->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 
     QAction *a;
-    a = new QAction(QIcon(":/images/textedit/fileprint.png"), tr("&Print..."), this);
+    a = new QAction(QIcon(""), tr("&Print..."), this);
     a->setShortcut(Qt::CTRL + Qt::Key_P);
     connect(a, SIGNAL(triggered()), this, SLOT(print()));
     tb->addAction(a);
@@ -219,11 +219,11 @@ PrintPreview::PrintPreview(const QTextDocument *document, QWidget *parent)
 
     tb->addSeparator();
 
-    a = new QAction(QIcon(":/images/textedit/zoomin.png"), tr("Zoom In"), this);
+    a = new QAction(QIcon("), tr("Zoom In"), this);
     connect(a, SIGNAL(triggered()), view, SLOT(zoomIn()));
     tb->addAction(a);
 
-    a = new QAction(QIcon(":/images/textedit/zoomout.png"), tr("Zoom Out"), this);
+    a = new QAction(QIcon(""), tr("Zoom Out"), this);
     connect(a, SIGNAL(triggered()), view, SLOT(zoomOut()));
     tb->addAction(a);