Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote

[vlc-remote] / main.cpp

diff --git a/main.cpp b/main.cpp
index 8828564..8e21758 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -22,7 +22,7 @@
 #include <QTranslator>
 #include <QDebug>
 #include "playermainwindow.h"
-#include "accountdialog.h"
+#include "appsettings.h"
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
@@ -39,16 +39,32 @@ int main(int argc, char *argv[])
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 
 
-    qDebug() << AccountDialog::currentIp();
+    qDebug() << AppSettings::getCurrentIp();
 
 
   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();
-
+ #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+  Orientation o = AppSettings::getOrientation();
+  switch (o) {
+      case AUTO_ROTATE:
+      mainwindow->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
+          break;
+      case LANDSCAPE:
+          mainwindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
+          break;
+      case PORTRAIT:
+          mainwindow->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
+          break;
+      default:
+          mainwindow->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
+          break;
+  }
+#endif
     return a.exec();
 }