[neelix-devel] neelix/view/qt mw.ui,1.3,1.4 qt.rb,1.3,1.4

[Hans F. <fu...@us...>]

Update of /cvsroot/neelix/neelix/view/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/view/qt

Modified Files:
	mw.ui qt.rb 
Log Message:
Editing measure and food complete. Note I didn't use the find_food function in
the replicator. Yeah, putting it all in the presenter means we can't take
advantage of SQL, but OTOH not using SQL is more database-agnostic and not
likely to be a performance hit. "Premature optimization is the root of all
evil" and all that.


Index: mw.ui
===================================================================
RCS file: /cvsroot/neelix/neelix/view/qt/mw.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mw.ui	24 Jun 2004 04:09:45 -0000	1.3
+++ mw.ui	25 Jun 2004 02:45:31 -0000	1.4
@@ -9,13 +9,19 @@
             <x>0</x>
             <y>0</y>
             <width>747</width>
-            <height>525</height>
+            <height>528</height>
         </rect>
     </property>
     <property name="caption">
         <string>Neelix</string>
         <comment>Recipe Management System</comment>
     </property>
+    <property name="icon">
+        <pixmap>image0</pixmap>
+    </property>
+    <property name="iconText">
+        <string>Neelix</string>
+    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -345,7 +351,7 @@
             <cstring>fileNewAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>image0</iconset>
+            <iconset>image1</iconset>
         </property>
         <property name="text">
             <string>New</string>
@@ -362,7 +368,7 @@
             <cstring>fileOpenAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>image1</iconset>
+            <iconset>image2</iconset>
         </property>
         <property name="text">
             <string>Open</string>
@@ -419,9 +425,12 @@
 </actions>
 <images>
     <image name="image0">
-        <data format="XPM.GZ" length="721">789cedd2b10ac2301405d03d5ff148b62056035241fc04c5511087f425a2432b681d44fc777ba329d6b47fe07d19dee50cc9904cd376b3229d896b6deb13131fed85b4bb95e57db75f3e8434869a93d3548e841c13d3fa5c79ecaad9d52404b540351e83caa833c6a03ad4798e41f5a86c30a816f510126ee94d14d52611fb8e2ad49070a4445ca4447ca4446ca444da07fecac7ffd2956ebe64f81ff4c873215e0583a9b0</data>
+        <data format="XPM.GZ" length="1452">789c7594dd6e13311085eff314abcc5d845ad20205211e01c42512e2c21e7bfc6f4b502e10e2dd39e36cd34dd59e36cd9eec97b13d67b6d787e5dbd7cfcbe17af7ebdedc275e389a9fcbc1fd6eedcff71f9ffeeef6b7370b7e8f77cb71ff6ab7bf5a78f932bad76bc235bd9e526bd41ea7d406b537536abbdadb29b543ed9b29b555eddb29b556edbb29b5acf66e4aad53fb7e4aad57fb614aada835536a8b5a3ba536aae529b549ad9b529bd5fa29b54dad4ccdb39f455b9d3fdd32f8dc58761e5ff5121ea90d4314a2381f534a19afc2869e3244d59b0a24372827c765ad74668862a7c10284a489cda95477821e1822674db728d39aa126e46289d65d32954dafec2356aad41af558bc8fb3d0ca10356346b5be60ad4cbe616930be6f196b4d18c3b22844b60d2a22258e2de383191d85d09d98c9a6414e24bab865a20fbdf7810ea243c4c50df1c54bdb32e21cdb5aabf78c4a3853f14eb0ff2dc38c140a3a8cdb09ad462b41a40da31186e1d040dcc97966d170e5f9cc80e053d61d63c4220ee353bb59e33f31163f3a74f813cc3a1a7a35086e6532ba1ceae8c1f48ea108c043c041c5e8aed73a9d6bb5554f0fb23a0f83f75a020b9df7236c71f481c43cce9e8aeec9398cc2c35a57ca3840cc082c2669b128e695d96481af31ba5c0ada274d41bc977a9117ee6315d1496d82eee51ca314bb659cc54e0455b47f98c1223ea1105f321ab962599f0b5d51d7ba9c8daa73010469c53c0b3967b7738810e6e12db378e71440c692e26316571a84ee9975e6754fb1949c90e1e88f8cf3e7471829e814ccd8780ed0ca844ecf2a7bdacecf4bba784e9f079efcdf7849fb7f1f77ff0148de81f6</data>
     </image>
     <image name="image1">
+        <data format="XPM.GZ" length="721">789cedd2b10ac2301405d03d5ff148b62056035241fc04c5511087f425a2432b681d44fc777ba329d6b47fe07d19dee50cc9904cd376b3229d896b6deb13131fed85b4bb95e57db75f3e8434869a93d3548e841c13d3fa5c79ecaad9d52404b540351e83caa833c6a03ad4798e41f5a86c30a816f510126ee94d14d52611fb8e2ad49070a4445ca4447ca4446ca444da07fecac7ffd2956ebe64f81ff4c873215e0583a9b0</data>
+    </image>
+    <image name="image2">
         <data format="XPM.GZ" length="691">789cad914d0ac2301085f739c5d0d915b11a140ae211149782b898448b2e5a41eb42c4bb9b9fa6a67644045f0299978f37134896c27ab5803413979aeaa3067da033a4bb6b59de36dbf95d245282d953182703910c41c3f254ed6d8da6c69193b5dada7c924b6fc9dac2c85b156c51b83eacfe41d0c89defc4dfa2dd7c37fc44b025a179043c4152a4b055f4365414ad0e8901fd94c1ae5e19441da9211c68e7f44098d3074d86019e70a0210c089958df7ffb31134fa13797a8</data>
     </image>
 </images>

Index: qt.rb
===================================================================
RCS file: /cvsroot/neelix/neelix/view/qt/qt.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt.rb	25 Jun 2004 02:23:56 -0000	1.3
+++ qt.rb	25 Jun 2004 02:45:31 -0000	1.4
@@ -1,3 +1,4 @@
+require 'presenter/presenter.rb'
 require 'view/qt/mw.rb'
 require 'view/qt/aboutdialog.rb'
 
@@ -104,19 +105,18 @@
   end
   def ingredient_changed(row,col)
     recipe = @shelf.currentItem.data
+    text = @ingredients_table.text(row,col)
     case col
     when 0  # quantity
-      recipe.ingredients[row].quantity = @ingredients_table.text(row,col)
+      recipe.ingredients[row].quantity = text
     when 1  # measure
-      #recipe.ingredients[row].measure = @ingredients_table.text(row,col)
-      puts "implement me: ingredient_changed(#{row},#{col}) (measure)"
+      recipe.ingredients[row].measure = Presenter::findCreateMeasure(text)
     when 2  # food
-      #recipe.ingredients[row].food = @ingredients_table.text(row,col)
-      puts "implement me: ingredient_changed(#{row},#{col}) (food)"
+      recipe.ingredients[row].food = Presenter::findCreateFood(text)
     when 3  # modifier
-      recipe.ingredients[row].modifier = @ingredients_table.text(row,col)
+      recipe.ingredients[row].modifier = text
     end
-
+    adjust_columns
   end
   def directions_changed()
     @shelf.currentItem.data.directions = @directions_edit.text