Merge pull request 'fix: use fallback icons on buttons, when no supported theme is installed' (#53) from shunf4/squawk:fix/btn_icons into messageFeed

Reviewed-on: blue/squawk#53

ui/squawk.ui

@@ -184,8 +184,8 @@
   </widget>
   <action name="actionAccounts">
    <property name="icon">
-    <iconset theme="system-users">
+    <iconset theme="system-users" resource="../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/group.svg</normaloff>:/images/fallback/dark/big/group.svg</iconset>
    </property>
    <property name="text">
     <string>Accounts</string>
@@ -193,8 +193,8 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset theme="application-exit">
+    <iconset theme="application-exit" resource="../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/edit-none.svg</normaloff>:/images/fallback/dark/big/edit-none.svg</iconset>
    </property>
    <property name="text">
     <string>Quit</string>
@@ -205,8 +205,8 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset theme="list-add-user">
+    <iconset theme="list-add-user" resource="../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/add.svg</normaloff>:/images/fallback/dark/big/add.svg</iconset>
    </property>
    <property name="text">
     <string>Add contact</string>
@@ -217,14 +217,16 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset theme="resource-group-new">
+    <iconset theme="resource-group-new" resource="../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/group-new.svg</normaloff>:/images/fallback/dark/big/group-new.svg</iconset>
    </property>
    <property name="text">
     <string>Add conference</string>
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="../resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>

ui/utils/badge.cpp

@@ -32,7 +32,12 @@ Badge::Badge(const QString& p_id, const QString& p_text, const QIcon& icon, QWid
     setFrameShadow(QFrame::Raised);
     
     image->setPixmap(icon.pixmap(25, 25));
-    closeButton->setIcon(QIcon::fromTheme("tab-close"));
+    QIcon tabCloseIcon = QIcon::fromTheme("tab-close");
+    if (tabCloseIcon.isNull()) {
+        tabCloseIcon.addFile(QString::fromUtf8(":/images/fallback/dark/big/edit-none.svg"), QSize(), QIcon::Normal, QIcon::Off);
+    }
+    closeButton->setIcon(tabCloseIcon);
+
     closeButton->setMaximumHeight(25);
     closeButton->setMaximumWidth(25);
     

ui/widgets/conversation.cpp

@@ -292,8 +292,12 @@ void Conversation::addAttachedFile(const QString& path)
     QMimeDatabase db;
     QMimeType type = db.mimeTypeForFile(path);
     QFileInfo info(path);
-    
+
-    Badge* badge = new Badge(path, info.fileName(), QIcon::fromTheme(type.iconName()));
+    QIcon fileIcon = QIcon::fromTheme(type.iconName());
+    if (fileIcon.isNull()) {
+        fileIcon.addFile(QString::fromUtf8(":/images/fallback/dark/big/mail-attachment.svg"), QSize(), QIcon::Normal, QIcon::Off);
+    }
+    Badge* badge = new Badge(path, info.fileName(), fileIcon);
     
     connect(badge, &Badge::close, this, &Conversation::onBadgeClose);
     try {

ui/widgets/conversation.ui

@@ -271,8 +271,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset theme="smiley-shape">
+            <iconset theme="smiley-shape" resource="../../resources/resources.qrc">
-             <normaloff>.</normaloff>.</iconset>
+             <normaloff>:/images/fallback/dark/big/unfavorite.svg</normaloff>:/images/fallback/dark/big/unfavorite.svg</iconset>
            </property>
            <property name="flat">
             <bool>true</bool>
@@ -298,8 +298,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset theme="mail-attachment-symbolic">
+            <iconset theme="mail-attachment-symbolic" resource="../../resources/resources.qrc">
-             <normaloff>.</normaloff>.</iconset>
+             <normaloff>:/images/fallback/dark/big/mail-attachment.svg</normaloff>:/images/fallback/dark/big/mail-attachment.svg</iconset>
            </property>
            <property name="flat">
             <bool>true</bool>
@@ -312,8 +312,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset theme="edit-clear-all">
+            <iconset theme="edit-clear-all" resource="../../resources/resources.qrc">
-             <normaloff>.</normaloff>.</iconset>
+             <normaloff>:/images/fallback/dark/big/clean.svg</normaloff>:/images/fallback/dark/big/clean.svg</iconset>
            </property>
            <property name="flat">
             <bool>true</bool>
@@ -332,8 +332,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset theme="document-send">
+            <iconset theme="document-send" resource="../../resources/resources.qrc">
-             <normaloff>.</normaloff>.</iconset>
+             <normaloff>:/images/fallback/dark/big/send.svg</normaloff>:/images/fallback/dark/big/send.svg</iconset>
            </property>
            <property name="flat">
             <bool>true</bool>
@@ -419,6 +419,8 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>

ui/widgets/messageline/preview.cpp

@@ -164,6 +164,9 @@ void Preview::applyNewSize()
             break;
         default: {
             QIcon icon = QIcon::fromTheme(info.mime.iconName());
+            if (icon.isNull()) {
+                icon.addFile(QString::fromUtf8(":/images/fallback/dark/big/mail-attachment.svg"), QSize(), QIcon::Normal, QIcon::Off);
+            }
             widget->setPixmap(icon.pixmap(actualSize));
             widget->resize(actualSize);
         }
@@ -264,6 +267,10 @@ void Preview::initializeElements()
             break;
         default: {
             QIcon icon = QIcon::fromTheme(info.mime.iconName());
+            if (icon.isNull()) {
+                icon.addFile(QString::fromUtf8(":/images/fallback/dark/big/mail-attachment.svg"), QSize(), QIcon::Normal, QIcon::Off);
+            }
+
             widget = new QLabel(parent);
             widget->setPixmap(icon.pixmap(actualSize));
             widget->show();

ui/widgets/vcard/vcard.ui

@@ -482,8 +482,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset theme="user">
+            <iconset theme="user" resource="../../../resources/resources.qrc">
-             <normaloff>.</normaloff>.</iconset>
+             <normaloff>:/images/fallback/dark/big/user.svg</normaloff>:/images/fallback/dark/big/user.svg</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -852,8 +852,8 @@
   </layout>
   <action name="actionSetAvatar">
    <property name="icon">
-    <iconset theme="photo">
+    <iconset theme="photo" resource="../../../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/edit-rename.svg</normaloff>:/images/fallback/dark/big/edit-rename.svg</iconset>
    </property>
    <property name="text">
     <string>Set avatar</string>
@@ -861,8 +861,8 @@
   </action>
   <action name="actionClearAvatar">
    <property name="icon">
-    <iconset theme="edit-clear-all">
+    <iconset theme="edit-clear-all" resource="../../../resources/resources.qrc">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff>:/images/fallback/dark/big/clean.svg</normaloff>:/images/fallback/dark/big/clean.svg</iconset>
    </property>
    <property name="text">
     <string>Clear avatar</string>
@@ -886,7 +886,7 @@
   <tabstop>description</tabstop>
  </tabstops>
  <resources>
-  <include location="../../resources/resources.qrc"/>
+  <include location="../../../resources/resources.qrc"/>
  </resources>
  <connections/>
 </ui>