[neelix-devel] neelix Makefile,1.5,1.6 neelix.rb,1.5,1.6

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

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

Modified Files:
	Makefile neelix.rb 
Log Message:
neelix.rb now runs the qt view. Type make to build the qt files from the .ui
files. 

You no longer need specify a database when running neelix.rb. Currently it
loads db/hans.db if you don't, but eventually it will open a new database
dialog (or do something else view-specific if there's no database connection).


Index: neelix.rb
===================================================================
RCS file: /cvsroot/neelix/neelix/neelix.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- neelix.rb	19 Dec 2003 16:56:39 -0000	1.5
+++ neelix.rb	20 Jun 2004 15:15:07 -0000	1.6
@@ -1,20 +1,23 @@
 #!/usr/bin/ruby
 
 def usage
-	puts "usage: neelix <database>"
+	puts "usage: neelix [<database>]"
 	exit
 end
 
-usage unless ARGV[0] 
+#usage unless ARGV[0] 
 
 require 'dbi'
 require 'model/model.rb'
 
-dbh = DBI.connect("dbi:sqlite:#{ARGV[0]}")
+dbfile = ARGV[0] ? ARGV[0] : "db/hans.db"
+
+dbh = DBI.connect("dbi:sqlite:#{dbfile}")
 $replicator.attach(dbh)
 
 # This is where you might put a check for another type of UI - e.g. ncurses
-require 'view/fox'
+#require 'view/fox'
+require 'view/qt/qt.rb'
 
 dbh.commit
-# vim:ts=4:sw=4
+# vim:ts=2:sw=4

Index: Makefile
===================================================================
RCS file: /cvsroot/neelix/neelix/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	5 May 2004 13:35:36 -0000	1.5
+++ Makefile	20 Jun 2004 15:15:07 -0000	1.6
@@ -1,8 +1,9 @@
+all: qt db/hans.db
 
-all:
-
-%:
-	make -C db $@
+qt:
+	make -C view/qt
+#%:
+#	make -C db $@
 
 # this assumes the current debian package name (rdoc plain seems to conflict
 # with ri plain and I can't live without ri)
@@ -13,4 +14,4 @@
 	$(rdoc) -d -o doc  model/*.rb view/*.rb presenter/*.rb *.rb
 	if [ $(USER) = fugalh ]; then rsync -r doc shell.sf.net:neelix/htdocs/rdoc; fi
 
-.PHONY: doc all
+.PHONY: doc all qt