Merge branch 'master' into develop

pylot/ui/PyLoT_main/PyLoT_main.pro

@@ -0,0 +1,20 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-12-09T13:16:21
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = PyLoT_main
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+        qt_pylot.cpp
+
+HEADERS  += qt_pylot.h
+
+FORMS    += qt_pylot.ui

pylot/ui/PyLoT_main/main.cpp

@@ -0,0 +1,11 @@
+#include "qt_pylot.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    Qt_PyLoT w;
+    w.show();
+
+    return a.exec();
+}

pylot/ui/PyLoT_main/qt_pylot.cpp

@@ -0,0 +1,14 @@
+#include "qt_pylot.h"
+#include "ui_qt_pylot.h"
+
+Qt_PyLoT::Qt_PyLoT(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::Qt_PyLoT)
+{
+    ui->setupUi(this);
+}
+
+Qt_PyLoT::~Qt_PyLoT()
+{
+    delete ui;
+}

pylot/ui/PyLoT_main/qt_pylot.h

@@ -0,0 +1,22 @@
+#ifndef QT_PYLOT_H
+#define QT_PYLOT_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class Qt_PyLoT;
+}
+
+class Qt_PyLoT : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit Qt_PyLoT(QWidget *parent = 0);
+    ~Qt_PyLoT();
+
+private:
+    Ui::Qt_PyLoT *ui;
+};
+
+#endif // QT_PYLOT_H

pylot/ui/PyLoT_main/qt_pylot.ui

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Qt_PyLoT</class>
+ <widget class="QMainWindow" name="Qt_PyLoT">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1024</width>
+    <height>768</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Qt_PyLoT</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <widget class="QFrame" name="frame">
+    <property name="geometry">
+     <rect>
+      <x>170</x>
+      <y>30</y>
+      <width>841</width>
+      <height>641</height>
+     </rect>
+    </property>
+    <property name="frameShape">
+     <enum>QFrame::StyledPanel</enum>
+    </property>
+    <property name="frameShadow">
+     <enum>QFrame::Raised</enum>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1024</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionFile">
+   <property name="text">
+    <string>File</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>