diff --git a/Kooky.pro.user b/Kooky.pro.user index 1ce65ff..076d06a 100644 --- a/Kooky.pro.user +++ b/Kooky.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {90551da6-f083-4f65-96d6-4435a4c6527f} + {c7aa4b7f-2ffc-4531-868b-ccb2d98c3d0a} ProjectExplorer.Project.ActiveTarget @@ -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.7.1 MinGW 32bit + Desktop Qt 5.7.1 MinGW 32bit + qt.57.win32_mingw53_kit 0 0 0 - C:/Users/birkeh/Documents/Projects/build-Kooky-Desktop_Qt_5_5_1_MinGW_32bit-Debug + C:/Users/herwi/Documents/GitHub/build-Kooky-Desktop_Qt_5_7_1_MinGW_32bit-Debug true qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -119,7 +120,7 @@ true - C:/Users/birkeh/Documents/Projects/build-Kooky-Desktop_Qt_5_5_0_MinGW_32bit-Release + C:/Users/herwi/Documents/GitHub/build-Kooky-Desktop_Qt_5_7_1_MinGW_32bit-Release true @@ -172,7 +173,61 @@ 0 true - 2 + + C:/Users/herwi/Documents/GitHub/build-Kooky-Desktop_Qt_5_7_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,13 @@ Kooky - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/birkeh/Documents/Projects/Kooky/Kooky/Kooky.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/herwi/Documents/GitHub/Kooky/Kooky/Kooky.pro true Kooky/Kooky.pro false - false + C:/Users/herwi/Documents/GitHub/build-Kooky-Desktop_Qt_5_7_1_MinGW_32bit-Debug/bin 3768 false true @@ -247,274 +303,9 @@ 1 - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.5.1) - Android for armeabi-v7a (GCC 4.9, Qt 5.5.1) - {e3812cf0-2836-4298-8338-6f37f68e5644} - 0 - 0 - -1 - - C:/Users/birkeh/Documents/Projects/build-Kooky-Android_for_armeabi_v7a_GCC_4_9_Qt_5_5_1-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android--1 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - 2 - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/birkeh/Documents/Projects/build-Kooky-Android_for_armeabi_v7a_GCC_4_9_Qt_5_5_1-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-23 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - 2 - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/birkeh/Documents/Projects/build-Kooky-Android_for_armeabi_v7a_GCC_4_9_Qt_5_5_1-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-23 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - 2 - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Deploy to Android device - - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Android device - Deploy to Android device - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - 0 - - ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/Kooky/cmainwindow.cpp b/Kooky/cmainwindow.cpp index 2f4521c..0965eb6 100644 --- a/Kooky/cmainwindow.cpp +++ b/Kooky/cmainwindow.cpp @@ -56,7 +56,7 @@ void cMainWindow::init() ui->setupUi(this); - loadPlugins("plugins"); + loadPlugins(QString("%1%2%3").arg(QDir::currentPath()).arg(QDir::separator()).arg("plugins")); m_lpIngredientsListModel = new QStandardItemModel(0, 1); ui->m_lpIngredientsList->setModel(m_lpIngredientsListModel); @@ -270,7 +270,7 @@ void cMainWindow::pluginImportTriggered() cIngredient ingredient(QString("%1/000001.ingredient").arg(settings.value("program/ingredientDir").toString())); ingredient.save(); */ -/* + QAction* lpAction = qobject_cast(sender()); if(lpAction) { @@ -300,7 +300,7 @@ void cMainWindow::pluginImportTriggered() } } } -*/ + } void cMainWindow::pluginExportTriggered() diff --git a/iBleibFit/iBleibFit.pro b/iBleibFit/iBleibFit.pro index 04289bc..d42e0e5 100644 --- a/iBleibFit/iBleibFit.pro +++ b/iBleibFit/iBleibFit.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui webkit xml +QT += core gui network xml greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/iErnaehrung/cernaehrungplugin.cpp b/iErnaehrung/cernaehrungplugin.cpp index b6c3988..589c2e0 100644 --- a/iErnaehrung/cernaehrungplugin.cpp +++ b/iErnaehrung/cernaehrungplugin.cpp @@ -219,17 +219,25 @@ QStringList cErnaehrungPlugin::search(const QString& szSearch, const QString& sz delete reply; QList szList = szData.split('\n'); + int z; - for(int z = 0;z < szList.count();z++) + for(z = 0;z < szList.count();z++) { QString szLine = QString::fromUtf8(szList.at(z)); - if(szLine.contains("
  • ")-1); + szURL = szLine.mid(szLine.indexOf("")+2); szReply = szReply.left(szReply.indexOf("<")); diff --git a/iErnaehrung/iErnaehrung.pro b/iErnaehrung/iErnaehrung.pro index 2633b2f..06cc0bc 100644 --- a/iErnaehrung/iErnaehrung.pro +++ b/iErnaehrung/iErnaehrung.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui webkit xml +QT += core gui network xml greaterThan(QT_MAJOR_VERSION, 4): QT += widgets