changed fosdem icon in about dialog to brain-alone icon

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 01ec02af6b5358ef27136dbd091a5ed4ce9efb11..9aa25e248ec8cdd4ed9223bf4e1adb8fda8224de 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -113,11 +113,20 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>

+         <property name="maximumSize" >
+          <size>
+           <width>77</width>
+           <height>68</height>
+          </size>
+         </property>

          <property name="text" >
           <string/>
          </property>
          <property name="pixmap" >
          <property name="text" >
           <string/>
          </property>
          <property name="pixmap" >

-          <pixmap>:/icons/fosdem.png</pixmap>
+          <pixmap resource="../icons.qrc" >:/icons/brain-alone.png</pixmap>
+         </property>
+         <property name="scaledContents" >
+          <bool>true</bool>

          </property>
         </widget>
        </item>
          </property>
         </widget>
        </item>


@@ -148,7 +157,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
            <rect>
             <x>0</x>
             <y>0</y>

-            <width>446</width>
+            <width>389</width>

             <height>429</height>
            </rect>
           </property>
             <height>429</height>
            </rect>
           </property>


@@ -374,7 +383,9 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources/>
+ <resources>
+  <include location="../icons.qrc" />
+ </resources>

  <connections>
   <connection>
    <sender>okButton</sender>
  <connections>
   <connection>
    <sender>okButton</sender>

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index e5453b83b97cd3e3970c0cc86047d0c652ef543f..2a3de35cecac5f16681a3928b9fa59db718c252d 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>485</width>
     <x>0</x>
     <y>0</y>
     <width>485</width>

-    <height>441</height>
+    <height>352</height>

    </rect>
   </property>
   <property name="sizePolicy" >
    </rect>
   </property>
   <property name="sizePolicy" >


@@ -27,7 +27,7 @@
      <item>
       <widget class="QLabel" name="title" >
        <property name="sizePolicy" >
      <item>
       <widget class="QLabel" name="title" >
        <property name="sizePolicy" >

-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >

          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>


@@ -53,7 +53,7 @@
      <item>
       <widget class="QScrollArea" name="scrollArea" >
        <property name="sizePolicy" >
      <item>
       <widget class="QScrollArea" name="scrollArea" >
        <property name="sizePolicy" >

-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+        <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >

          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>


@@ -67,14 +67,14 @@
           <x>0</x>
           <y>0</y>
           <width>461</width>
           <x>0</x>
           <y>0</y>
           <width>461</width>

-          <height>355</height>
+          <height>254</height>

          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2" >
          <item row="0" column="0" >
           <widget class="QWidget" native="1" name="content" >
            <property name="sizePolicy" >
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2" >
          <item row="0" column="0" >
           <widget class="QWidget" native="1" name="content" >
            <property name="sizePolicy" >

-            <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+            <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >

              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>


@@ -243,23 +243,26 @@
            </layout>
           </widget>
          </item>
            </layout>
           </widget>
          </item>

-         <item row="1" column="0" >
-          <spacer name="verticalSpacer" >
-           <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0" >
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>

         </layout>
        </widget>
       </widget>
      </item>
         </layout>
        </widget>
       </widget>
      </item>

+     <item>
+      <spacer name="verticalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Minimum</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>

      <item>
       <layout class="QHBoxLayout" name="horizontalLayout" >
        <item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout" >
        <item>

diff --git a/src/icons.qrc b/src/icons.qrc
index 192f8bc61bef3e2b2b87fd027b4ffa1319857673..4e14857d08cead233c4772224c56f92e3944c911 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -3,6 +3,7 @@
         <file>icons/expand.png</file>
         <file>icons/collapse.png</file>
         <file>icons/fosdem.png</file>
         <file>icons/expand.png</file>
         <file>icons/collapse.png</file>
         <file>icons/fosdem.png</file>

+        <file>icons/brain-alone.png</file>

         <file>icons/alarm-offBig.png</file>
         <file>icons/alarm-onBig.png</file>
         <file>icons/compassBig.png</file>
         <file>icons/alarm-offBig.png</file>
         <file>icons/alarm-onBig.png</file>
         <file>icons/compassBig.png</file>

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