Icons, part 2: replace fosdem/brain icons with ConfClerk logo

diff --git a/data/data.qrc b/data/data.qrc
new file mode 100644 (file)
index 0000000..d352a3a
--- /dev/null
+++ b/data/data.qrc
@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="/">
+    <file>confclerk.svg</file>
+  </qresource>
+</RCC>

diff --git a/src/app/main.cpp b/src/app/main.cpp
index a072156098af143696a1b72eb84f188701dfd739..a8ca7dbbe7c8502f2a28903fcc2ef96dac314e8e 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(db);
 
     Application a(argc, argv);
-    Application::setWindowIcon(QIcon(":/icons/fosdem.png"));
+    Application::setWindowIcon(QIcon(":/confclerk.svg"));
 
     // needed by QDesktopServices
     QCoreApplication::setOrganizationName("Toastfreeware");

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 30ba7669b0f4cd7f416c370845d0724147accf86..ece68e01d0aeace827c3432d5204f65764d1e9f5 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -124,7 +124,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../icons.qrc">:/icons/brain-alone.png</pixmap>
+          <pixmap resource="../../data/data.qrc">:/confclerk.svg</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>
@@ -158,8 +158,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>370</width>
-            <height>596</height>
+            <width>374</width>
+            <height>544</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
@@ -386,6 +386,7 @@
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections>
   <connection>

diff --git a/src/gui/alarmdialog.ui b/src/gui/alarmdialog.ui
index d47ac88740fae221c18ef13a7ccba3b91eb34eba..d0cd82ea45fc1b60c8e4f2963b634cf57fe1230d 100644 (file)
--- a/src/gui/alarmdialog.ui
+++ b/src/gui/alarmdialog.ui
@@ -46,7 +46,10 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../icons.qrc">:/icons/fosdem.png</pixmap>
+          <pixmap resource="../../data/data.qrc">:/confclerk.svg</pixmap>
+         </property>
+         <property name="scaledContents">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -156,6 +159,7 @@
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>
 </ui>

diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui
index fcbecddb30cb13561f28c0dcbd66b9dee0c59d0d..d4c8fda1a328bb41c55c3c90900d0622572d99ec 100644 (file)
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -14,8 +14,8 @@
    <string>Edit Conferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../icons.qrc">
-    <normaloff>:/icons/brain-alone.png</normaloff>:/icons/brain-alone.png</iconset>
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="spacing">
@@ -341,6 +341,7 @@
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>
 </ui>

diff --git a/src/icons.qrc b/src/icons.qrc
index 12faa0d4368056c1f005f6b13d1097aa2404d1f0..644c48ec201f70e958684f8b2026799df8bb54c2 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -3,8 +3,6 @@
         <file>icons/add.png</file>
         <file>icons/remove.png</file>
         <file>icons/reload.png</file>
-        <file>icons/fosdem.png</file>
-        <file>icons/brain-alone.png</file>
         <file>icons/appointment-soon-off.png</file>
         <file>icons/appointment-soon.png</file>
         <file>icons/applications-internet.png</file>

diff --git a/src/icons/brain-alone.png b/src/icons/brain-alone.png
deleted file mode 100644 (file)
index 514a6fa..0000000
Binary files a/src/icons/brain-alone.png and /dev/null differ

diff --git a/src/icons/fosdem.png b/src/icons/fosdem.png
deleted file mode 100644 (file)
index c733163..0000000
Binary files a/src/icons/fosdem.png and /dev/null differ