diff --git a/cmainwindow.cpp b/cmainwindow.cpp index 4f8610f..429ee18 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -2,22 +2,45 @@ #include "ui_cmainwindow.h" #include +#include cMainWindow::cMainWindow(QWidget *parent) : QMainWindow(parent), - ui(new Ui::cMainWindow) + ui(new Ui::cMainWindow), + m_lpMovieWidget(0), + m_lpTVShowWidget(0) { - ui->setupUi(this); - ui->m_lpMainTab->setCurrentIndex(0); - - setWindowTitle("qtKodiAdmin"); - -// m_kodiLibrary.init("C:\\Users\\birkeh\\.kodi"); - m_kodiLibrary.init(QDir::homePath() + QDir::separator() + QString(".kodi")); + initUI(); + initDB(); } cMainWindow::~cMainWindow() { + if(m_lpMovieWidget) + delete m_lpMovieWidget; + + if(m_lpTVShowWidget) + delete m_lpTVShowWidget; + delete ui; } + +void cMainWindow::initUI() +{ + ui->setupUi(this); + + m_lpMovieWidget = new cMovieWidget(this); + m_lpTVShowWidget = new cTVShowWidget(this); + + ui->m_lpMainTab->addTab(m_lpMovieWidget, QIcon(":/icons/Videos.ico"), ""); + ui->m_lpMainTab->addTab(m_lpTVShowWidget, QIcon(":/icons/TV Shows.ico"), ""); + ui->m_lpMainTab->setCurrentIndex(0); + + setWindowTitle("qtKodiAdmin"); +} + +void cMainWindow::initDB() +{ + m_kodiLibrary.init(QDir::homePath() + QDir::separator() + QString(".kodi")); +} diff --git a/cmainwindow.h b/cmainwindow.h index 5cec3a7..b8d8fe0 100644 --- a/cmainwindow.h +++ b/cmainwindow.h @@ -2,6 +2,8 @@ #define CMAINWINDOW_H +#include "cmoviewidget.h" +#include "ctvshowwidget.h" #include "ckodilibrary.h" #include @@ -22,7 +24,12 @@ public: private: Ui::cMainWindow* ui; + cMovieWidget* m_lpMovieWidget; + cTVShowWidget* m_lpTVShowWidget; cKodiLibrary m_kodiLibrary; + + void initUI(); + void initDB(); }; #endif // CMAINWINDOW_H diff --git a/cmainwindow.ui b/cmainwindow.ui index 2e3b37b..dccd5a4 100644 --- a/cmainwindow.ui +++ b/cmainwindow.ui @@ -21,52 +21,17 @@ QTabWidget::West - QTabWidget::Triangular + QTabWidget::Rounded - 0 + -1 - 32 - 32 + 64 + 64 - - - - :/icons/icons/Videos.ico - - - - Movies - - - - - - :/icons/icons/TV Shows.ico - - - - TV Shows - - - - - - :/icons/icons/Musics.ico - - - - Music - - - - - Music Shows - - diff --git a/cmoviewidget.cpp b/cmoviewidget.cpp new file mode 100644 index 0000000..9ed0558 --- /dev/null +++ b/cmoviewidget.cpp @@ -0,0 +1,14 @@ +#include "cmoviewidget.h" +#include "ui_cmoviewidget.h" + +cMovieWidget::cMovieWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::cMovieWidget) +{ + ui->setupUi(this); +} + +cMovieWidget::~cMovieWidget() +{ + delete ui; +} diff --git a/cmoviewidget.h b/cmoviewidget.h new file mode 100644 index 0000000..f99d25a --- /dev/null +++ b/cmoviewidget.h @@ -0,0 +1,22 @@ +#ifndef CMOVIEWIDGET_H +#define CMOVIEWIDGET_H + +#include + +namespace Ui { +class cMovieWidget; +} + +class cMovieWidget : public QWidget +{ + Q_OBJECT + +public: + explicit cMovieWidget(QWidget *parent = 0); + ~cMovieWidget(); + +private: + Ui::cMovieWidget *ui; +}; + +#endif // CMOVIEWIDGET_H diff --git a/cmoviewidget.ui b/cmoviewidget.ui new file mode 100644 index 0000000..2efe06d --- /dev/null +++ b/cmoviewidget.ui @@ -0,0 +1,32 @@ + + + cMovieWidget + + + + 0 + 0 + 635 + 505 + + + + Form + + + + + 130 + 280 + 47 + 13 + + + + TextLabel + + + + + + diff --git a/ctvshowwidget.cpp b/ctvshowwidget.cpp new file mode 100644 index 0000000..2b8c2b6 --- /dev/null +++ b/ctvshowwidget.cpp @@ -0,0 +1,14 @@ +#include "ctvshowwidget.h" +#include "ui_ctvshowwidget.h" + +cTVShowWidget::cTVShowWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::cTVShowWidget) +{ + ui->setupUi(this); +} + +cTVShowWidget::~cTVShowWidget() +{ + delete ui; +} diff --git a/ctvshowwidget.h b/ctvshowwidget.h new file mode 100644 index 0000000..2cac865 --- /dev/null +++ b/ctvshowwidget.h @@ -0,0 +1,22 @@ +#ifndef CTVSHOWWIDGET_H +#define CTVSHOWWIDGET_H + +#include + +namespace Ui { +class cTVShowWidget; +} + +class cTVShowWidget : public QWidget +{ + Q_OBJECT + +public: + explicit cTVShowWidget(QWidget *parent = 0); + ~cTVShowWidget(); + +private: + Ui::cTVShowWidget *ui; +}; + +#endif // CTVSHOWWIDGET_H diff --git a/ctvshowwidget.ui b/ctvshowwidget.ui new file mode 100644 index 0000000..b364e4f --- /dev/null +++ b/ctvshowwidget.ui @@ -0,0 +1,32 @@ + + + cTVShowWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 90 + 90 + 91 + 16 + + + + TextLabel1 + + + + + + diff --git a/icons/Images.ico b/icons/Images.ico deleted file mode 100644 index c2136e1..0000000 Binary files a/icons/Images.ico and /dev/null differ diff --git a/icons/Images.png b/icons/Images.png deleted file mode 100644 index 3fc647e..0000000 Binary files a/icons/Images.png and /dev/null differ diff --git a/icons/Musics.ico b/icons/Musics.ico deleted file mode 100644 index c4adb01..0000000 Binary files a/icons/Musics.ico and /dev/null differ diff --git a/icons/Musics.png b/icons/Musics.png deleted file mode 100644 index e356489..0000000 Binary files a/icons/Musics.png and /dev/null differ diff --git a/icons/TV Shows.ico b/icons/TV Shows.ico index 2efc95d..f64d925 100644 Binary files a/icons/TV Shows.ico and b/icons/TV Shows.ico differ diff --git a/icons/Videos.ico b/icons/Videos.ico deleted file mode 100644 index d43c352..0000000 Binary files a/icons/Videos.ico and /dev/null differ diff --git a/icons/Videos.png b/icons/Videos.png deleted file mode 100644 index 1bd5661..0000000 Binary files a/icons/Videos.png and /dev/null differ diff --git a/qtKodiDB.pro b/qtKodiDB.pro index 330caa3..3f1ad73 100644 --- a/qtKodiDB.pro +++ b/qtKodiDB.pro @@ -15,23 +15,23 @@ TEMPLATE = app SOURCES += main.cpp\ cmainwindow.cpp \ ckodivideolibrary.cpp \ - ckodilibrary.cpp + ckodilibrary.cpp \ + cmoviewidget.cpp \ + ctvshowwidget.cpp HEADERS += cmainwindow.h \ ckodivideolibrary.h \ - ckodilibrary.h + ckodilibrary.h \ + cmoviewidget.h \ + ctvshowwidget.h -FORMS += cmainwindow.ui +FORMS += cmainwindow.ui \ + cmoviewidget.ui \ + ctvshowwidget.ui RESOURCES += \ qtkodidb.qrc DISTFILES += \ - icons/Images.png \ - icons/Musics.png \ icons/TV Shows.png \ - icons/Videos.png \ - icons/Images.ico \ - icons/Musics.ico \ - icons/TV Shows.ico \ - icons/Videos.ico + icons/TV Shows.ico diff --git a/qtkodidb.qrc b/qtkodidb.qrc index f1da762..4d8ed66 100644 --- a/qtkodidb.qrc +++ b/qtkodidb.qrc @@ -1,8 +1,3 @@ - - icons/Images.ico - icons/Musics.ico - icons/TV Shows.ico - icons/Videos.ico - +