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

List:       kde-commits
Subject:    kdenonbeta/krecipes/src
From:       Jason Kivlighn <confederacy2 () excite ! com>
Date:       2004-05-16 2:44:55
Message-ID: 20040516024455.0E7848EA6 () office ! kde ! org
[Download RAW message or body]

CVS commit by jkivlighn: 

-Fixed a bug where when inputting ingredients, it would show the correct \
ingredient/unit/preparation being entered, when in fact another was actually put into \
                the database
-Reload the Ingredient Matcher's ingredients and Diet Wizard's info when their menus \
items are selected


  M +3 -3      krecipesview.cpp   1.142
  M +15 -0     dialogs/recipeinputdialog.cpp   1.93
  M +2 -0      dialogs/recipeinputdialog.h   1.35


--- kdenonbeta/krecipes/src/krecipesview.cpp  #1.141:1.142
@@ -323,9 +323,9 @@ if (leftPanel->currentMenu()==leftPanel-
                         rightPanel->raise(shoppingListPanel);
                         break;
-                case DietP: shoppingListPanel->reload(); // Reload data
+                case DietP: dietPanel->reload(); // Reload data
                         rightPanel->setHeader(i18n("Diet Helper"),"diet");
                         rightPanel->raise(dietPanel);
                         break;
-                case MatcherP:
+                case MatcherP: ingredientMatcherPanel->reloadIngredients(); // \
                Reload data
                         rightPanel->setHeader(i18n("Ingredient \
Matcher"),"categories");  rightPanel->raise(ingredientMatcherPanel);

--- kdenonbeta/krecipes/src/dialogs/recipeinputdialog.cpp  #1.92:1.93
@@ -22,4 +22,5 @@
 
 #include <kapplication.h>
+#include <kcompletionbox.h>
 #include <kspell.h>
 #include <kurl.h>
@@ -373,4 +374,6 @@ database=db;
     connect(addCategoryButton,SIGNAL(clicked()),this,SLOT(addCategory()));
     connect(ingredientBox->lineEdit(), SIGNAL(lostFocus()), this, \
SLOT(slotIngredientBoxLostFocus()) ); +    connect(unitBox->lineEdit(), \
SIGNAL(lostFocus()), this, SLOT(slotUnitBoxLostFocus()) ); +    \
connect(prepMethodBox->lineEdit(), SIGNAL(lostFocus()), this, \
SLOT(slotPrepMethodBoxLostFocus()) );  \
                connect(addAuthorButton,SIGNAL(clicked()),this,SLOT(addAuthor()));
     connect(titleEdit,SIGNAL(textChanged(const QString&)),this, \
SIGNAL(titleChanged(const QString&))); @@ -953,4 +956,16 @@ void \
RecipeInputDialog::slotIngredientBo  }
 
+void RecipeInputDialog::slotUnitBoxLostFocus(void)
+{
+        if ( unitBox->contains(unitBox->currentText()) )
+                unitBox->setCurrentItem(unitBox->currentText());
+}
+
+void RecipeInputDialog::slotPrepMethodBoxLostFocus(void)
+{
+        if ( prepMethodBox->contains(prepMethodBox->currentText()) )
+                prepMethodBox->setCurrentItem(prepMethodBox->currentText());
+}
+
 void RecipeInputDialog::addAuthor(void)
 {

--- kdenonbeta/krecipes/src/dialogs/recipeinputdialog.h  #1.34:1.35
@@ -150,4 +150,6 @@ private:
         void addAuthor(void);
         void slotIngredientBoxLostFocus(void);
+        void slotUnitBoxLostFocus(void);
+        void slotPrepMethodBoxLostFocus(void);
         void enableSaveButton(bool enabled);
         void closeOptions(void);


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