Enabled orientation selection (Potrait Mode)

	modified:   browsemainwindow.ui
	modified:   main.cpp
	modified:   playermainwindow.cpp
	modified:   playermainwindow.h
	modified:   playermainwindow.ui
	modified:   playlistmainwindow.ui

diff --git a/browsemainwindow.ui b/browsemainwindow.ui
index f972360..ca133f6 100644 (file)
--- a/browsemainwindow.ui
+++ b/browsemainwindow.ui
@@ -55,23 +55,21 @@
      <height>27</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuConfiguration">
+   <widget class="QMenu" name="menuMenu">
     <property name="title">
      <string>menu</string>
     </property>
-    <addaction name="actionConfiguration"/>
-    <addaction name="actionAbout"/>
    </widget>
-   <addaction name="menuConfiguration"/>
+   <addaction name="menuMenu"/>
   </widget>
-  <action name="actionConfiguration">
+  <action name="actionPortrait">
    <property name="text">
-    <string>configuration</string>
+    <string>Portrait Mode</string>
    </property>
   </action>
-  <action name="actionAbout">
+  <action name="actionLandscape">
    <property name="text">
-    <string>About</string>
+    <string>Landscape Mode</string>
    </property>
   </action>
  </widget>

diff --git a/main.cpp b/main.cpp
index 8828564..59754e4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -44,11 +44,12 @@ int main(int argc, char *argv[])
 
   PlayerMainWindow * mainwindow = new PlayerMainWindow;
 
-  mainwindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
+  //mainwindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
   //mainwindow->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
   //mainwindow->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
 
   mainwindow->showMaximized();
+  mainwindow->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
 
     return a.exec();
 }

diff --git a/playermainwindow.cpp b/playermainwindow.cpp
index 1157c66..c2186e9 100644 (file)
--- a/playermainwindow.cpp
+++ b/playermainwindow.cpp
@@ -84,6 +84,8 @@
       connect(mTimer,SIGNAL(timeout()),this,SLOT(askStatus()));
       connect(ui->actionConfiguration,SIGNAL(triggered()),this,SLOT(showConfig()));
       connect(ui->actionAbout,SIGNAL(triggered()),this,SLOT(showAbout()));
+      connect(ui->actionPortrait,SIGNAL(triggered()),this,SLOT(setPortrait()));
+      connect(ui->actionLandscape,SIGNAL(triggered()),this,SLOT(setLandscape()));
       connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(show()));
       connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(showPlayList()));
       connect(ui->browseButton,SIGNAL(clicked()),mBrowserMainWindow,SLOT(show()));
@@ -156,6 +158,21 @@
       }
   }
 
+  void PlayerMainWindow::setPortrait()
+  {
+      this->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
+  }
+
+  void PlayerMainWindow::setLandscape()
+  {
+      this->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
+  }
+
+  void PlayerMainWindow::setAutoRotate()
+  {
+      this->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
+  }
+
   void PlayerMainWindow::orientationChanged() {
       QRect screenGeometry = QApplication::desktop()->screenGeometry();
       mIsLandscape = (screenGeometry.width() > screenGeometry.height());

diff --git a/playermainwindow.h b/playermainwindow.h
index 8389002..847a342 100644 (file)
--- a/playermainwindow.h
+++ b/playermainwindow.h
@@ -58,6 +58,9 @@ public slots:
     void finished(QNetworkReply * reply);
     void readReady();
     void orientationChanged();
+    void setPortrait();
+    void setLandscape();
+    void setAutoRotate();
     void playlistIdUpdated(int id, bool hasart, QString extension);
 
 

diff --git a/playermainwindow.ui b/playermainwindow.ui
index 6251e68..b16ffb2 100644 (file)
--- a/playermainwindow.ui
+++ b/playermainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>798</width>
-    <height>598</height>
+    <width>796</width>
+    <height>631</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,7 @@
        <size>
         <width>380</width>
         <height>340</height>
-       </size>s
+       </size>
       </property>
       <property name="maximumSize">
        <size>
@@ -30,80 +30,80 @@
        </size>
       </property>
       <property name="alignment">
-       <set>Qt::AlignHCenter|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <set>Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
      </widget>
     </item>
     <item>
      <layout class="QHBoxLayout" name="horizontalLayoutDetails">
       <item>
-        <layout class="QVBoxLayout" name="verticalLayoutDetails">
-          <item>
-            <widget class="QLabel" name="labelTitle">
-              <property name="minimumSize">
-              <size>
-                <width>0</width>
-                <height>30</height>
-              </size>
-              </property>
-              <property name="text">
-              <string>Information</string>
-              </property>
-              <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QLabel" name="labelArtist">
-              <property name="minimumSize">
-              <size>
-                <width>0</width>
-                <height>30</height>
-              </size>
-              </property>
-              <property name="text">
-              <string>Information</string>
-              </property>
-              <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QLabel" name="labelAlbum">
-              <property name="minimumSize">
-              <size>
-                <width>0</width>
-                <height>30</height>
-              </size>
-              </property>
-              <property name="text">
-              <string>Information</string>
-              </property>
-              <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-            </widget>
-          </item>
-        </layout>
+       <layout class="QVBoxLayout" name="verticalLayoutDetails">
+        <item>
+         <widget class="QLabel" name="labelTitle">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Information</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelArtist">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Information</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelAlbum">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Information</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="QLabel" name="labelArtLandscape">
         <property name="minimumSize">
-        <size>
+         <size>
           <width>140</width>
           <height>140</height>
-        </size>
+         </size>
         </property>
         <property name="maximumSize">
-        <size>
+         <size>
           <width>140</width>
           <height>140</height>
-        </size>
+         </size>
         </property>
         <property name="alignment">
-        <set>Qt::AlignHCenter|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
@@ -174,7 +174,7 @@
       <item>
        <widget class="QToolButton" name="playpauseButton">
         <property name="text">
-         <string>play/pause</string>
+         <string>Play/Pause</string>
         </property>
        </widget>
       </item>
@@ -242,7 +242,7 @@
       <item>
        <widget class="QToolButton" name="volMute">
         <property name="text">
-         <string>mute</string>
+         <string>Mute</string>
         </property>
        </widget>
       </item>
@@ -273,7 +273,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>798</width>
+     <width>796</width>
      <height>20</height>
     </rect>
    </property>
@@ -283,6 +283,8 @@
     </property>
     <addaction name="actionConfiguration"/>
     <addaction name="actionAbout"/>
+    <addaction name="actionPortrait"/>
+    <addaction name="actionLandscape"/>
    </widget>
    <addaction name="menuMenu"/>
   </widget>
@@ -296,6 +298,16 @@
     <string>About</string>
    </property>
   </action>
+  <action name="actionPortrait">
+   <property name="text">
+    <string>Portrait Mode</string>
+   </property>
+  </action>
+  <action name="actionLandscape">
+   <property name="text">
+    <string>Landscape Mode</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

diff --git a/playlistmainwindow.ui b/playlistmainwindow.ui
index 88fe377..c98d800 100644 (file)
--- a/playlistmainwindow.ui
+++ b/playlistmainwindow.ui
@@ -117,23 +117,21 @@
      <height>25</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuConfiguration">
+   <widget class="QMenu" name="menuMenu">
     <property name="title">
      <string>menu</string>
     </property>
-    <addaction name="actionConfiguration"/>
-    <addaction name="actionAbout"/>
    </widget>
-   <addaction name="menuConfiguration"/>
+   <addaction name="menuMenu"/>
   </widget>
-  <action name="actionConfiguration">
+  <action name="actionPortrait">
    <property name="text">
-    <string>configuration</string>
+    <string>Portrait Mode</string>
    </property>
   </action>
-  <action name="actionAbout">
+  <action name="actionLandscape">
    <property name="text">
-    <string>About</string>
+    <string>Landscape Mode</string>
    </property>
   </action>
  </widget>