map is displayed in FullScreen mode

diff --git a/src/gui/mapwindow.cpp b/src/gui/mapwindow.cpp
index 939989b92553713644e91ab13808afbd1a1d749c..2e3efa370a2682bb92493cd821ded6368ab780d2 100644 (file)
--- a/src/gui/mapwindow.cpp
+++ b/src/gui/mapwindow.cpp
@@ -4,9 +4,16 @@ MapWindow::MapWindow(const QPixmap &aImage, const QString &aName, QWidget *aPare
     : QDialog(aParent)
 {
     setupUi(this);
     : QDialog(aParent)
 {
     setupUi(this);

+#ifdef MAEMO
+    showFullScreen();
+    //map->setScaledContents(true);
+    //map->setPixmap(aImage.scaled(QSize(800,480),Qt::KeepAspectRatioByExpanding,Qt::SmoothTransformation));
+    map->setPixmap(aImage.scaled(QSize(640,480),Qt::KeepAspectRatioByExpanding,Qt::SmoothTransformation));
+#else
+    map->setPixmap(aImage,Qt::KeepAspectRatioByExpanding,Qt::SmoothTransformation);
+#endif

     setMouseTracking(true); // to receive mouse events
     setWindowTitle(aName);
     setMouseTracking(true); // to receive mouse events
     setWindowTitle(aName);

-    map->setPixmap(aImage);

 }
 
 // it is enough to handle mouseReleaseEvent, instead of
 }
 
 // it is enough to handle mouseReleaseEvent, instead of

diff --git a/src/gui/mapwindow.ui b/src/gui/mapwindow.ui
index 38e5f3dd3aa8a67f8170ada4555baa19bc4a404f..36bac1b6fbbc932f98e21a8aac6b2a990d2c2a7d 100644 (file)
--- a/src/gui/mapwindow.ui
+++ b/src/gui/mapwindow.ui
@@ -9,12 +9,24 @@
     <height>179</height>
    </rect>
   </property>
     <height>179</height>
    </rect>
   </property>

+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>

   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="map" >
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="map" >

+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>

      <property name="text" >
       <string>Map goes here</string>
      </property>
      <property name="text" >
       <string>Map goes here</string>
      </property>


@@ -24,8 +36,6 @@
     </widget>
    </item>
   </layout>
     </widget>
    </item>
   </layout>

-  <zorder>map</zorder>
-  <zorder>toolButton</zorder>

  </widget>
  <resources/>
  <connections/>
  </widget>
  <resources/>
  <connections/>