Icons, part 2: replace fosdem/brain icons with ConfClerk logo
authorgregor herrmann <gregoa@debian.org>
Thu, 23 Jun 2011 23:01:24 +0000 (23:01 +0000)
committergregor herrmann <gregoa@debian.org>
Thu, 23 Jun 2011 23:01:24 +0000 (23:01 +0000)
data/data.qrc [new file with mode: 0644]
src/app/main.cpp
src/gui/about.ui
src/gui/alarmdialog.ui
src/gui/conferenceeditor.ui
src/icons.qrc
src/icons/brain-alone.png [deleted file]
src/icons/fosdem.png [deleted file]

diff --git a/data/data.qrc b/data/data.qrc
new file mode 100644 (file)
index 0000000..d352a3a
--- /dev/null
@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="/">
+    <file>confclerk.svg</file>
+  </qresource>
+</RCC>
index a072156..a8ca7db 100644 (file)
@@ -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");
index 30ba766..ece68e0 100644 (file)
           <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>
            <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">
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections>
   <connection>
index d47ac88..d0cd82e 100644 (file)
           <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>
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>
 </ui>
index fcbecdd..d4c8fda 100644 (file)
@@ -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">
  </widget>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>
 </ui>
index 12faa0d..644c48e 100644 (file)
@@ -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