Changeset f41638e for src

Timestamp:

06/24/11 01:01:24 (12 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

59673b9

Parents:

77f8bff

Message:

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

Location:

src

Files:

• app/main.cpp (modified) (1 diff)
• gui/about.ui (modified) (3 diffs)
• gui/alarmdialog.ui (modified) (2 diffs)
• gui/conferenceeditor.ui (modified) (2 diffs)
• icons.qrc (modified) (1 diff)
• icons/brain-alone.png (deleted)
• icons/fosdem.png (deleted)

src/app/main.cpp

@@ -39 +39 @@
 
     Application a(argc, argv);
-    Application::setWindowIcon(QIcon(":/icons/fosdem.png"));
+    Application::setWindowIcon(QIcon(":/confclerk.svg"));
 
     // needed by QDesktopServices

src/gui/about.ui

@@ -125 +125 @@
          </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">
@@ -159 +159 @@
             <x>0</x>
             <y>0</y>
-            <width>370</width>
-            <height>596</height>
+            <width>374</width>
+            <height>544</height>
            </rect>
           </property>
@@ -387 +387 @@
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections>

src/gui/alarmdialog.ui

@@ -47 +47 @@
          </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>
@@ -157 +160 @@
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>

src/gui/conferenceeditor.ui

@@ -15 +15 @@
   </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">
@@ -342 +342 @@
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections/>

src/icons.qrc

@@ -4 +4 @@
         <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>