diff --git a/gui.cpp b/gui.cpp new file mode 100644 index 0000000..53f30e8 --- /dev/null +++ b/gui.cpp @@ -0,0 +1,14 @@ +#include "gui.h" +#include "ui_gui.h" + +GUI::GUI(QWidget *parent) : + QWidget(parent), + ui(new Ui::GUI) +{ + ui->setupUi(this); +} + +GUI::~GUI() +{ + delete ui; +} diff --git a/gui.h b/gui.h new file mode 100644 index 0000000..2c1b75f --- /dev/null +++ b/gui.h @@ -0,0 +1,22 @@ +#ifndef GUI_H +#define GUI_H + +#include + +namespace Ui { +class GUI; +} + +class GUI : public QWidget +{ + Q_OBJECT + +public: + explicit GUI(QWidget *parent = 0); + ~GUI(); + +//private: + Ui::GUI *ui; +}; + +#endif // GUI_H diff --git a/gui.ui b/gui.ui index d93323c..492138b 100644 --- a/gui.ui +++ b/gui.ui @@ -1,41 +1,52 @@ - Form - + GUI + 0 0 - 941 - 625 + 884 + 562 Form - - - - 290 - 60 - 75 - 23 - - - - PushButton - - - - - - 540 - 120 - 256 - 192 - - - + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 210 + 0 + + + + + diff --git a/main.cpp b/main.cpp index 43bf629..f1e0bc6 100644 --- a/main.cpp +++ b/main.cpp @@ -5,10 +5,14 @@ #include #include #include +#include +#include +#include +#include #include "player.h" -// """ Version 0.7 """ +// """ Version 0.8 """ //using namespace std; @@ -17,23 +21,31 @@ int main(int argc, char* argv[]) { QApplication app(argc, argv); QWidget window; - //window.resize(200,576); - window.setGeometry(20,50,1234,576); + window.setGeometry(20,50,1270,576); - QFrame videoWidget(&window); - videoWidget.resize(1024, 576); + QMenuBar mBar; + QMenu fileMenu; + fileMenu.addMenu("Test"); + mBar.addMenu(&fileMenu); + + QFrame videoWidget; Player player(&videoWidget); - QListWidget liste(&window); - liste.setGeometry(1024,0,210,576); + QListWidget liste; for(int x=1;x<=player.get_Sender();x++){ liste.addItem(player.get_Name(x)); } - QObject::connect(&liste, SIGNAL(itemClicked(QListWidgetItem*)), &player, SLOT(play(QListWidgetItem*))); - //QHBoxLayout layout(&window); - //layout.addWidget(&videoWidget); - //layout.addWidget(&liste); + + QSizePolicy sp=liste.sizePolicy(); + sp.setHorizontalPolicy(QSizePolicy::Fixed); + liste.setSizePolicy(sp); + + QGridLayout gridLayout; + gridLayout.addWidget(&videoWidget, 0, 0); + gridLayout.addWidget(&liste, 0, 1); + window.setLayout(&gridLayout); + window.show(); return app.exec(); diff --git a/player.cpp b/player.cpp index 2e4fe04..7becc69 100644 --- a/player.cpp +++ b/player.cpp @@ -35,7 +35,7 @@ Player::~Player(){ } std::cout << "beende..." << std::endl; } -Player::write_data(void *ptr, size_t size, size_t nmemb, void *stream){ +size_t Player::write_data(void *ptr, size_t size, size_t nmemb, void *stream){ size_t written = fwrite(ptr, size, nmemb, (FILE *)stream); return written; } diff --git a/player.h b/player.h index 309c8ec..088d6fe 100644 --- a/player.h +++ b/player.h @@ -21,7 +21,7 @@ class Player : public QObject { private: int val; - static write_data(void*, size_t, size_t , void*); + static size_t write_data(void*, size_t, size_t , void*); int sender_holen(void); int sender_laden(void); int sender_ausgeben(void);