diff --git a/cmainwindow.cpp b/cmainwindow.cpp index 52413a8..a41628f 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -140,6 +140,9 @@ cMainWindow::~cMainWindow() if(m_lpSourcesModel) delete m_lpSourcesModel; + if(m_lpExceptionsModel) + delete m_lpExceptionsModel; + if(m_lpStatusProgress) delete m_lpStatusProgress; @@ -160,10 +163,15 @@ void cMainWindow::init() ui->setupUi(this); m_lpSourcesModel = new QStandardItemModel(0, 3); - QStringList headerLabels = QStringList() << tr("Type") << tr("Path") << tr(""); - m_lpSourcesModel->setHorizontalHeaderLabels(headerLabels); + QStringList headerLabels1 = QStringList() << tr("Type") << tr("Path") << tr(""); + m_lpSourcesModel->setHorizontalHeaderLabels(headerLabels1); ui->m_lpSources->setModel(m_lpSourcesModel); + m_lpExceptionsModel = new QStandardItemModel(0, 2); + QStringList headerLabels2 = QStringList() << tr("Path") << tr(""); + m_lpExceptionsModel->setHorizontalHeaderLabels(headerLabels2); + ui->m_lpExceptions->setModel(m_lpExceptionsModel); + m_lpMoviesModel = new QStandardItemModel(0, 1); ui->m_lpMovies->setModel(m_lpMoviesModel); @@ -185,6 +193,13 @@ void cMainWindow::init() ui->m_lpSources->setColumnWidth(2, 25); ui->m_lpSources->resizeRowsToContents(); + ui->m_lpExceptions->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch); + ui->m_lpExceptions->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed); + +// ui->m_lpExceptions->resizeColumnToContents(0); + ui->m_lpExceptions->setColumnWidth(1, 25); + ui->m_lpExceptions->resizeRowsToContents(); + ui->m_lpMainTab->setCurrentIndex(0); m_lpStatusProgress = new QProgressBar(this); @@ -225,6 +240,16 @@ void cMainWindow::loadSettings() addSourcesLine(t, szPath); } + for(int z = 0;;z++) + { + QString szPath; + + szPath = settings.value(QString("exceptions/path%1").arg(z)).toString(); + if(szPath.isEmpty()) + break; + addExceptionsLine(szPath); + } + QString szOutputPath = settings.value("output/path").toString(); ui->m_lpOutputPath->setText(szOutputPath); @@ -302,6 +327,7 @@ void cMainWindow::saveSettings() QSettings settings; settings.remove("sources"); + settings.remove("exceptions"); settings.remove("output"); settings.remove("xbmc"); settings.remove("poster"); @@ -325,6 +351,20 @@ void cMainWindow::saveSettings() } } + i = 0; + for(int z = 0;z < m_lpExceptionsModel->rowCount();z++) + { + QStandardItem* path = m_lpExceptionsModel->item(z, 0); + + QString szPath = path->text(); + + if(!szPath.isEmpty()) + { + settings.setValue(QString("exceptions/path%1").arg(i), QVariant(szPath)); + i++; + } + } + settings.setValue("output/path", QVariant(ui->m_lpOutputPath->text())); settings.setValue("output/maxactor", QVariant(ui->m_lpMaxActor->value())); settings.setValue("output/title", QVariant(ui->m_lpTitle->text())); @@ -370,6 +410,25 @@ void cMainWindow::addSourcesLine(Sources type, const QString& szText) ui->m_lpSources->resizeRowsToContents(); } +void cMainWindow::addExceptionsLine(const QString& szText) +{ + EXCEPTIONS e; + + e.lpPathItem = new QStandardItem(szText); + m_lpExceptionsModel->appendRow(e.lpPathItem); + e.index = m_lpExceptionsModel->indexFromItem(e.lpPathItem); + e.lpButton = new cPushButton("..."); + ui->m_lpExceptions->setIndexWidget(m_lpExceptionsModel->index(e.index.row(), 1), e.lpButton); + + m_ExceptionsList.append(e); + + connect(e.lpButton, SIGNAL(buttonClicked(cPushButton*)), this, SLOT(exceptionsButtonClicked(cPushButton*))); + + ui->m_lpExceptions->resizeColumnToContents(0); + ui->m_lpExceptions->setColumnWidth(1, 25); + ui->m_lpExceptions->resizeRowsToContents(); +} + void cMainWindow::sourcesButtonClicked(cPushButton* lpButton) { for(int z = 0;z < m_SourcesList.count();z++) @@ -394,6 +453,30 @@ void cMainWindow::sourcesButtonClicked(cPushButton* lpButton) } } +void cMainWindow::exceptionsButtonClicked(cPushButton* lpButton) +{ + for(int z = 0;z < m_ExceptionsList.count();z++) + { + if(lpButton == m_ExceptionsList.at(z).lpButton) + { + QString szPath = m_ExceptionsList.at(z).lpPathItem->text(); + if(szPath.isEmpty()) + szPath = m_szLastPath; + + QFileDialog dlg(this, "select Path", szPath); + dlg.setFileMode(QFileDialog::Directory); + if(dlg.exec()) + { + QString szNewPath = dlg.selectedFiles().at(0); + if(szNewPath.isEmpty()) + return; + m_ExceptionsList.at(z).lpPathItem->setText(szNewPath); + m_szLastPath = szNewPath; + } + } + } +} + void cMainWindow::on_m_lpAddSources_clicked() { addSourcesLine(SourcesNone, ""); @@ -411,6 +494,23 @@ void cMainWindow::on_m_lpDeleteSources_clicked() } } +void cMainWindow::on_m_lpAddExceptions_clicked() +{ + addExceptionsLine(""); +} + +void cMainWindow::on_m_lpDeleteExceptions_clicked() +{ + if(ui->m_lpExceptions->selectionModel()->selectedIndexes().count() == 0) + return; + + for(int z = 0;z < ui->m_lpExceptions->selectionModel()->selectedIndexes().count();z++) + { + QModelIndex i = ui->m_lpExceptions->selectionModel()->selectedIndexes().at(z); + m_lpExceptionsModel->removeRow(i.row()); + } +} + void cMainWindow::on_m_lpMoviesScan_clicked() { if(ui->m_lpXBMC->isChecked()) @@ -422,6 +522,10 @@ void cMainWindow::on_m_lpMoviesScan_clicked() m_lpMoviesModel->clear(); m_MovieList.clear(); + QStringList exceptions; + for(int x = 0;x < m_lpExceptionsModel->rowCount();x++) + exceptions.append(m_lpExceptionsModel->item(x, 0)->text()); + for(int z = 0;z < m_lpSourcesModel->rowCount();z++) { QStandardItem* type = m_lpSourcesModel->item(z, 0); @@ -431,7 +535,7 @@ void cMainWindow::on_m_lpMoviesScan_clicked() QString szPath = path->text(); if(!szPath.isEmpty() && t == SourcesMovie) - m_MovieList.parse(szPath, m_lpXBMC, ui->m_lpStatusBar); + m_MovieList.parse(szPath, exceptions, m_lpXBMC, ui->m_lpStatusBar); } ui->m_lpStatusBar->showMessage(QString("")); @@ -460,6 +564,10 @@ void cMainWindow::on_m_lpTVShowsScan_clicked() m_lpTVShowsModel->clear(); m_TVShowList.clear(); + QStringList exceptions; + for(int x = 0;x < m_lpExceptionsModel->rowCount();x++) + exceptions.append(m_lpExceptionsModel->item(x, 0)->text()); + for(int z = 0;z < m_lpSourcesModel->rowCount();z++) { QStandardItem* type = m_lpSourcesModel->item(z, 0); @@ -469,7 +577,7 @@ void cMainWindow::on_m_lpTVShowsScan_clicked() QString szPath = path->text(); if(!szPath.isEmpty() && t == SourcesTVShow) - m_TVShowList.parse(szPath, m_lpXBMC, ui->m_lpStatusBar); + m_TVShowList.parse(szPath, exceptions, m_lpXBMC, ui->m_lpStatusBar); } ui->m_lpStatusBar->showMessage(QString("")); diff --git a/cmainwindow.h b/cmainwindow.h index 17b8b1f..35d6bd6 100644 --- a/cmainwindow.h +++ b/cmainwindow.h @@ -54,6 +54,13 @@ class cMainWindow : public QMainWindow Sources type; } SOURCES, *LPSOURCES; + typedef struct tagEXCEPTIONS + { + QStandardItem* lpPathItem; + cPushButton* lpButton; + QModelIndex index; + } EXCEPTIONS, *LPEXCEPTIONS; + public: explicit cMainWindow(QWidget *parent = 0); @@ -67,6 +74,7 @@ protected: void saveSettings(); void addSourcesLine(Sources type, const QString& szText); + void addExceptionsLine(const QString& szText); QString string2HTML(const QString& sz); QString preparePath(); @@ -83,6 +91,7 @@ protected: private: Ui::cMainWindow* ui; QStandardItemModel* m_lpSourcesModel; + QStandardItemModel* m_lpExceptionsModel; QStandardItemModel* m_lpMoviesModel; QStandardItemModel* m_lpTVShowsModel; QStandardItemModel* m_lpGenreFromModel; @@ -91,6 +100,7 @@ private: QProgressBar* m_lpStatusProgress; QList m_SourcesList; + QList m_ExceptionsList; QString m_szLastPath; QString m_szLastOutputPath; @@ -115,9 +125,12 @@ private: QStringList convertGenre(const QStringList& szGenreList); public slots: void sourcesButtonClicked(cPushButton* lpButton); + void exceptionsButtonClicked(cPushButton* lpButton); private slots: void on_m_lpAddSources_clicked(); void on_m_lpDeleteSources_clicked(); + void on_m_lpAddExceptions_clicked(); + void on_m_lpDeleteExceptions_clicked(); void on_m_lpMoviesScan_clicked(); void on_m_lpTVShowsScan_clicked(); void on_m_lpMoviesSelectAll_clicked(); diff --git a/cmainwindow.ui b/cmainwindow.ui index a793067..49d6913 100644 --- a/cmainwindow.ui +++ b/cmainwindow.ui @@ -18,129 +18,202 @@ - 2 + 0 Sources - + - - - - - true + + + + + Sources - - true - - - Qt::DotLine - - - false - - - false - - - false - - - - - - - - - &add Source - - - - - - - &delete Source - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - XBMC - - - true - - - - - - - + - - - XBMC Server: - - - - - - - - - - Port: - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - + + + + + true + + + true + + + Qt::DotLine + + + false + + + false + + + false + + + + + + + + + &add Source + + + + + + + &delete Source + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + - - - + + + + + + Exceptions + + + + + + + + true + + + Qt::DotLine + + + false + + + false + + + + + + + + + add Exception + + + + + + + delete Exception + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + XBMC + + + true + + + + + + + + + + + XBMC Server: + + + + + + + + + + Port: + + + + + + + Username: + + + + + + + + + + Password: + + + + + + + QLineEdit::Password + + + + + + + + + @@ -524,8 +597,8 @@ - - + + about:blank @@ -561,9 +634,9 @@ - QWebView + QWebEngineView QWidget -
QtWebKitWidgets/QWebView
+
QtWebEngineWidgets/QWebEngineView
 diff --git a/cmovie.cpp b/cmovie.cpp index 8deb25f..7231d05 100644 --- a/cmovie.cpp +++ b/cmovie.cpp @@ -765,9 +765,9 @@ void cMovieList::open() database.close(); } #endif -void cMovieList::parse(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStatusBar) +void cMovieList::parse(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC, QStatusBar* lpStatusBar) { - parsePath(szPath, lpXBMC, lpStatusBar); + parsePath(szPath, exceptions, lpXBMC, lpStatusBar); m_szGenreList.removeDuplicates(); #ifdef WITHDB @@ -882,12 +882,20 @@ void cMovieList::parse(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStatu #endif } -void cMovieList::parsePath(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStatusBar) +void cMovieList::parsePath(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC, QStatusBar* lpStatusBar) { QDir dir(szPath); if(!dir.exists()) return; + foreach(const QString& p, exceptions) + { + QString a = szPath; + QString b = p; + if(a.replace("\\", "/").startsWith(b.replace("\\", "/"))) + return; + } + if(lpStatusBar) lpStatusBar->showMessage(QString("%1 %2 ...").arg("scanning").arg(szPath)); @@ -896,7 +904,7 @@ void cMovieList::parsePath(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpS dirList.removeAll(".."); for(int z = 0;z < dirList.count();z++) - parsePath(QString("%1/%2").arg(szPath).arg(dirList.at(z)), lpXBMC, lpStatusBar); + parsePath(QString("%1/%2").arg(szPath).arg(dirList.at(z)), exceptions, lpXBMC, lpStatusBar); QStringList nfoList = dir.entryList(QStringList() << "*.nfo", QDir::Files); for(int z = 0;z < nfoList.count();z++) diff --git a/cmovie.h b/cmovie.h index 4e6646a..5fb6ba8 100644 --- a/cmovie.h +++ b/cmovie.h @@ -165,13 +165,13 @@ public: #ifdef WITHDB void open(); #endif - void parse(const QString& szPath, cXBMC* lpXBMC = 0, QStatusBar* lpStatusBar = 0); + void parse(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC = 0, QStatusBar* lpStatusBar = 0); QStringList genreList(); private: QStringList m_szGenreList; protected: - void parsePath(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStatusBar); + void parsePath(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC, QStatusBar* lpStatusBar); }; #endif // CMOVIE_H diff --git a/csourcesbuttondelegate.cpp b/csourcesbuttondelegate.cpp index 96b5cb5..cd5b87d 100644 --- a/csourcesbuttondelegate.cpp +++ b/csourcesbuttondelegate.cpp @@ -27,7 +27,7 @@ void cSourcesButtonDelegate::paint(QPainter *painter, const QStyleOptionViewItem QApplication::style()->drawControl(QStyle::CE_PushButton, &button, painter); } -bool cSourcesButtonDelegate::editorEvent(QEvent *event, QAbstractItemModel */*model*/, const QStyleOptionViewItem &option, const QModelIndex &/*index*/) +bool cSourcesButtonDelegate::editorEvent(QEvent *event, QAbstractItemModel * /*model*/, const QStyleOptionViewItem &option, const QModelIndex & /*index*/) { if( event->type() == QEvent::MouseButtonRelease ) { diff --git a/ctvshow.cpp b/ctvshow.cpp index 0945d3b..7352c41 100644 --- a/ctvshow.cpp +++ b/ctvshow.cpp @@ -339,13 +339,21 @@ cTVShowList::cTVShowList() { } -void cTVShowList::parse(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStatusBar) +void cTVShowList::parse(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC, QStatusBar* lpStatusBar) { QDir dir(szPath); if(!dir.exists()) return; + foreach(const QString& p, exceptions) + { + QString a = szPath; + QString b = p; + if(a.replace("\\", "/").startsWith(b.replace("\\", "/"))) + return; + } + if(lpStatusBar) lpStatusBar->showMessage(QString("%1 %2 ...").arg("scanning").arg(szPath)); @@ -354,7 +362,7 @@ void cTVShowList::parse(const QString& szPath, cXBMC* lpXBMC, QStatusBar* lpStat dirList.removeAll(".."); for(int z = 0;z < dirList.count();z++) - parse(QString("%1/%2").arg(szPath).arg(dirList.at(z)), lpXBMC, lpStatusBar); + parse(QString("%1/%2").arg(szPath).arg(dirList.at(z)), exceptions, lpXBMC, lpStatusBar); QStringList nfoList = dir.entryList(QStringList() << "tvshow.nfo", QDir::Files); for(int z = 0;z < nfoList.count();z++) diff --git a/ctvshow.h b/ctvshow.h index 26e54ff..203885b 100644 --- a/ctvshow.h +++ b/ctvshow.h @@ -94,7 +94,7 @@ public: cTVShowList(); //cMovie* add(const QString& szFileName, QObject *parent = 0); - void parse(const QString& szPath, cXBMC* lpXBMC = 0, QStatusBar* lpStatusBar = 0); + void parse(const QString& szPath, const QStringList& exceptions, cXBMC* lpXBMC = 0, QStatusBar* lpStatusBar = 0); QStringList genreList(); private: diff --git a/qtMediaElch2HTML.pro b/qtMediaElch2HTML.pro index 0602832..a1b47d5 100644 --- a/qtMediaElch2HTML.pro +++ b/qtMediaElch2HTML.pro @@ -4,9 +4,9 @@ # #------------------------------------------------- -QT += core gui webkit xml sql +QT += core gui xml sql -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webenginewidgets TARGET = qtMediaElch2HTML TEMPLATE = app diff --git a/qtMediaElch2HTML.pro.user b/qtMediaElch2HTML.pro.user index b82ede1..fca2ab6 100644 --- a/qtMediaElch2HTML.pro.user +++ b/qtMediaElch2HTML.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {90551da6-f083-4f65-96d6-4435a4c6527f} + {efde75a3-4656-4d1e-8e45-82b47388ce05} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -40,6 +40,7 @@ true false 0 + true true 0 8 @@ -58,21 +59,21 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.5.1 MinGW 32bit - Desktop Qt 5.5.1 MinGW 32bit - qt.55.win32_mingw492_kit + Desktop Qt 5.9.1 MinGW 32bit + Desktop Qt 5.9.1 MinGW 32bit + qt.591.win32_mingw53_kit 0 0 0 - C:/Users/birkeh/Documents/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_5_0_MinGW_32bit-Debug + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MinGW_32bit-Debug true qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -119,7 +120,7 @@ true - C:/Users/birkeh/Documents/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_5_0_MinGW_32bit-Release + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MinGW_32bit-Release true @@ -172,7 +173,61 @@ 0 true - 2 + + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MinGW_32bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 0 @@ -188,8 +243,9 @@ 1 + false false - 0 + 1000 true @@ -230,13 +286,260 @@ qtMediaElch2HTML - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/Projects/qtMediaElch2HTML/qtMediaElch2HTML.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/GitHub/qtMediaElch2HTML/qtMediaElch2HTML.pro true qtMediaElch2HTML.pro false - false + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MSVC2017_64bit-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.9.1 MSVC2017 64bit + Desktop Qt 5.9.1 MSVC2017 64bit + qt.591.win64_msvc2017_64_kit + 0 + 0 + 0 + + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MSVC2017_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MSVC2017_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MSVC2017_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + qtMediaElch2HTML + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/GitHub/qtMediaElch2HTML/qtMediaElch2HTML.pro + true + + qtMediaElch2HTML.pro + false + + C:/Users/birkeh/Documents/GitHub/build-qtMediaElch2HTML-Desktop_Qt_5_9_1_MSVC2017_64bit-Debug 3768 false true @@ -249,7 +552,7 @@ ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion diff --git a/qtMediaElch2HTML.pro.user.1d61b8c b/qtMediaElch2HTML.pro.user.1d61b8c deleted file mode 100644 index d6a684e..0000000 --- a/qtMediaElch2HTML.pro.user.1d61b8c +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.3.0 MinGW 32bit - Desktop Qt 5.3.0 MinGW 32bit - qt.53.win32_mingw482_kit - 0 - 0 - 0 - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_3_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_3_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/__P__/Projects/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {1d61b8c2-939f-49d1-955c-a0904af83c0e} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/qtMediaElch2HTML.pro.user.3.2-pre1 b/qtMediaElch2HTML.pro.user.3.2-pre1 deleted file mode 100644 index 7c86b40..0000000 --- a/qtMediaElch2HTML.pro.user.3.2-pre1 +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.3.0 MinGW 32bit - Desktop Qt 5.3.0 MinGW 32bit - qt.53.win32_mingw482_kit - 0 - 0 - 0 - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_3_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_3_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/__P__/Projects/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {1d61b8c2-939f-49d1-955c-a0904af83c0e} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/qtMediaElch2HTML.pro.user.35b9544 b/qtMediaElch2HTML.pro.user.35b9544 deleted file mode 100644 index b53e151..0000000 --- a/qtMediaElch2HTML.pro.user.35b9544 +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - true - 1 - true - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.2.0 GCC 64bit - Desktop Qt 5.2.0 GCC 64bit - qt.520.gcc_64.essentials_kit - 0 - 0 - 0 - - /data/Projects/QTCreator/build-qtMediaElch2HTML-Desktop_Qt_5_2_0_GCC_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /data/Projects/QTCreator/build-qtMediaElch2HTML-Desktop_Qt_5_2_0_GCC_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:/data/Projects/QTCreator/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - true - false - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {35b95447-560b-4a5f-99d0-6b183abc468e} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/qtMediaElch2HTML.pro.user.5edf7b4 b/qtMediaElch2HTML.pro.user.5edf7b4 deleted file mode 100644 index b474d0a..0000000 --- a/qtMediaElch2HTML.pro.user.5edf7b4 +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - EnvironmentId - {5edf7b45-d1b6-42a6-9e15-28bdc7ed5eb4} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.5.0 MinGW 32bit - Desktop Qt 5.5.0 MinGW 32bit - qt.55.win32_mingw492_kit - 0 - 0 - 0 - - C:/Users/birkeh/Documents/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_5_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/birkeh/Documents/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_5_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/Projects/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/qtMediaElch2HTML.pro.user.c48e83d b/qtMediaElch2HTML.pro.user.c48e83d deleted file mode 100644 index b7b695a..0000000 --- a/qtMediaElch2HTML.pro.user.c48e83d +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - true - 1 - true - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.2.0 MinGW 32bit - Desktop Qt 5.2.0 MinGW 32bit - qt.520.win32_mingw48.essentials_kit - 0 - 0 - 0 - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_2_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/birkeh/Documents/__P__/Projects/build-qtMediaElch2HTML-Desktop_Qt_5_2_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/__P__/Projects/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - true - false - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {c48e83d6-4864-4c5d-bde6-bd0e3fc3e5f8} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/qtMediaElch2HTML.pro.user.e1ab7cc b/qtMediaElch2HTML.pro.user.e1ab7cc deleted file mode 100644 index c68633d..0000000 --- a/qtMediaElch2HTML.pro.user.e1ab7cc +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.2.1 GCC 64bit - Desktop Qt 5.2.1 GCC 64bit - qt.521.gcc_64.essentials_kit - 0 - 0 - 0 - - /data/Projects/QTCreator/build-qtMediaElch2HTML-Desktop_Qt_5_2_1_GCC_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /data/Projects/QTCreator/build-qtMediaElch2HTML-Desktop_Qt_5_2_1_GCC_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - qtMediaElch2HTML - - Qt4ProjectManager.Qt4RunConfiguration:/data/Projects/QTCreator/qtMediaElch2HTML/qtMediaElch2HTML.pro - - qtMediaElch2HTML.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {e1ab7ccf-23c6-4f32-b3f3-5c18cde2ab15} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - -