aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2017-12-18 23:01:33 +0100
committerNao Pross <naopross@thearcway.org>2017-12-18 23:01:33 +0100
commit62bd9aa4da85ef87c4d9a9bb7911f8a4e0ac9986 (patch)
treeb7187831bb1908ad2d34eadf831bf63bfd3343b1 /src/ui
parentAdd mainwindow.ui (diff)
downloadOrbitingYeti-62bd9aa4da85ef87c4d9a9bb7911f8a4e0ac9986.tar.gz
OrbitingYeti-62bd9aa4da85ef87c4d9a9bb7911f8a4e0ac9986.zip
Moved to QtCreator project with QMake
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/Window.cpp33
-rw-r--r--src/ui/Window.hpp28
-rw-r--r--src/ui/mainwindow.cpp14
3 files changed, 14 insertions, 61 deletions
diff --git a/src/ui/Window.cpp b/src/ui/Window.cpp
deleted file mode 100644
index 7f28ffe..0000000
--- a/src/ui/Window.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Window.cpp
- *
- * Created on: Nov 26, 2017
- * Author: naopross
- */
-
-#include "Window.hpp"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QApplication>
-
-
-using namespace samb;
-
-Window::Window(QWidget *parent): QWidget(parent) {
- setWindowTitle("OrbitingYeti");
-
- QVBoxLayout *vBox = new QVBoxLayout(this);
- QHBoxLayout *hBox = new QHBoxLayout();
-
- m_quitBtn = new QPushButton("Quit", this);
- connect(m_quitBtn, SIGNAL(clicked()), qApp, SLOT(quit()));
-
- hBox->addWidget(m_quitBtn, 0, Qt::AlignRight);
- vBox->addStretch(1);
- vBox->addLayout(hBox);
-}
-
-Window::~Window() {
-
-}
diff --git a/src/ui/Window.hpp b/src/ui/Window.hpp
deleted file mode 100644
index 9f48f12..0000000
--- a/src/ui/Window.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Window.hpp
- *
- * Created on: Nov 26, 2017
- * Author: naopross
- */
-
-#ifndef SRC_UI_WINDOW_HPP_
-#define SRC_UI_WINDOW_HPP_
-
-#include <QWidget>
-#include <QPushButton>
-
-namespace samb {
-
-class Window : public QWidget {
-Q_OBJECT
-public:
- explicit Window(QWidget *parent = 0);
- ~Window();
-
-private:
- QPushButton *m_quitBtn;
-};
-
-} /* namespace samb */
-
-#endif /* SRC_UI_WINDOW_HPP_ */
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
new file mode 100644
index 0000000..7e4ca77
--- /dev/null
+++ b/src/ui/mainwindow.cpp
@@ -0,0 +1,14 @@
+#include "ui/mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::MainWindow)
+{
+ ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+ delete ui;
+}