[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/krecipes/src/dialogs
From:       Jason Kivlighn <confederacy2 () excite ! com>
Date:       2004-02-01 7:50:04
Message-ID: 20040201075004.4C2809911 () office ! kde ! org
[Download RAW message or body]

CVS commit by jkivlighn: 

Added the ability to load ingredient data from the USDA's nutrient database.  

You'll need the file abbrev.txt from \
http://www.nal.usda.gov/fnic/foodcomp/Data/SR16/dnload/sr16abbr.zip and then place it \
into ~/.kde/share/apps/krecipes


  M +24 -3     ingredientsdialog.cpp   1.46
  M +1 -0      ingredientsdialog.h   1.23


--- kdenonbeta/krecipes/src/dialogs/ingredientsdialog.h  #1.22:1.23
@@ -82,4 +82,5 @@ private:
     void insertPropertyEditBox(QListViewItem* it);
     void setPropertyAmount(double amount);
+    void openUSDADialog(void);
 
 };

--- kdenonbeta/krecipes/src/dialogs/ingredientsdialog.cpp  #1.45:1.46
@@ -13,10 +13,11 @@
 #include "ingredientsdialog.h"
 #include "DBBackend/recipedb.h"
-#include "selectunitdialog.h"
 #include "createelementdialog.h"
-#include "ingredientpropertylist.h"
-#include "selectpropertydialog.h"
 #include "editbox.h"
+#include "ingredientpropertylist.h"
 #include "unitsdialog.h"
+#include "usdadatadialog.h"
+#include "selectpropertydialog.h"
+#include "selectunitdialog.h"
 
 #include <qheader.h>
@@ -142,4 +143,9 @@ IngredientsDialog::IngredientsDialog(QWi
     removePropertyButton->setFlat(true);
 
+    QPushButton *loadUsdaButton = new QPushButton(this);
+    loadUsdaButton->setText(i18n("Load USDA data"));
+    layout->addMultiCellWidget( loadUsdaButton, 10, 10, 5, 6 );
+    loadUsdaButton->setFlat(true);
+
     QSpacerItem* spacer_Prop_Buttons = new QSpacerItem( 10,10, QSizePolicy::Minimum, \
QSizePolicy::Fixed );  layout->addItem(spacer_Prop_Buttons,7,7);
@@ -165,4 +171,5 @@ IngredientsDialog::IngredientsDialog(QWi
     connect(propertiesListView->listView(),SIGNAL(executed(QListViewItem*)),this,SLOT(insertPropertyEditBox(QListViewItem*)));
                
     connect(inputBox,SIGNAL(valueChanged(double)),this,SLOT(setPropertyAmount(double)));
 +    connect(loadUsdaButton,SIGNAL(clicked()),this,SLOT(openUSDADialog()));
 }
 
@@ -501,2 +508,16 @@ void IngredientsDialog::reload(void)
 this->reloadIngredientList();
 }
+
+void IngredientsDialog::openUSDADialog(void)
+{
+        QListViewItem *ing_it = ingredientListView->listView()->selectedItem(); // \
Find selected ingredient +        if ( ing_it )
+        {
+                USDADataDialog usda_dialog( \
Element(ing_it->text(1),ing_it->text(0).toInt()),database,this); +
+                if ( usda_dialog.exec() == QDialog::Accepted )
+                        reloadPropertyList(); //update property list upon success
+        }
+        else
+                QMessageBox::information(this,QString::null,i18n("No ingredient \
selected!")); +}


[prev in list] [next in list] [prev in thread] [next in thread]