Changeset 468

Timestamp:

03/05/2008 17:44:02 (6 months ago)

Author:

why

Message:

• shoes/ruby.c: the logging methods are Kernel methods now.
  
• lib/shoes/log.rb: added icons, some spacing.
  

Location:

trunk

Files:

• lib/shoes/log.rb (modified) (2 diffs)
• shoes/ruby.c (modified) (2 diffs)
• shoes/ruby.h (modified) (1 diff)
• static/icon-DEBUG.png (added)
• static/icon-ERROR.png (added)
• static/icon-INFO.png (added)
• static/icon-WARN.png (added)

trunk/lib/shoes/log.rb

@@ -5 +5 @@
         background black
         stack :width => -100 do
-          tagline strong("SHOES LOG WINDOW"), :stroke => white
+          tagline "Shoes Console", :stroke => white
         end
         button "Clear", :margin => 6, :width => 80, :height => 40 do
@@ -25 +25 @@
         Shoes.log.each do |typ, msg, at|
           stack do
-            background "#eee" if i % 2 == 0
-            inscription at, :stroke => "#905", :margin => 4, :margin_bottom => 0
-            para strong(typ), " #{msg}", :margin => 4, :margin_top => 0
+            background "#f1f5e1" if i % 2 == 0
+            inscription strong(typ, :stroke => "#C50"), " ", at, :stroke => "#950", :margin => 4, :margin_bottom => 0
+            flow do
+              stack :margin => 4, :width => 20 do
+                image "#{DIR}/static/icon-#{typ}.png"
+              end
+              stack :margin => 4, :width => -20 do
+                para " #{msg}", :margin => 4, :margin_top => 0
+              end
+            end
           end
           i += 1

trunk/shoes/ruby.c

@@ -3887 +3887 @@
   rb_define_singleton_method(cShoes, "app", CASTHOOK(shoes_app_main), -1);
   rb_define_singleton_method(cShoes, "p", CASTHOOK(shoes_p), 1);
-  rb_define_singleton_method(cShoes, "debug", CASTHOOK(shoes_canvas_debug), 1);
-  rb_define_singleton_method(cShoes, "info", CASTHOOK(shoes_canvas_info), 1);
-  rb_define_singleton_method(cShoes, "warn", CASTHOOK(shoes_canvas_warn), 1);
-  rb_define_singleton_method(cShoes, "error", CASTHOOK(shoes_canvas_error), 1);
   rb_define_singleton_method(cShoes, "log", CASTHOOK(shoes_log), 0);
 
@@ -3914 +3910 @@
   rb_define_method(rb_mKernel, "quit", CASTHOOK(shoes_app_quit), 0);
   rb_define_method(rb_mKernel, "exit", CASTHOOK(shoes_app_quit), 0);
+
+  rb_define_method(rb_mKernel, "debug", CASTHOOK(shoes_canvas_debug), 1);
+  rb_define_method(rb_mKernel, "info", CASTHOOK(shoes_canvas_info), 1);
+  rb_define_method(rb_mKernel, "warn", CASTHOOK(shoes_canvas_warn), 1);
+  rb_define_method(rb_mKernel, "error", CASTHOOK(shoes_canvas_error), 1);
 
   cFlow    = rb_define_class_under(cShoes, "Flow", cShoes);

trunk/shoes/ruby.h

@@ -183 +183 @@
   f("dialog", dialog, -1); \
   f("window_plain", window_plain, 0); \
-  f("dialog_plain", dialog_plain, 0); \
-  f("info", info, 1); \
-  f("debug", debug, 1); \
-  f("warn", warn, 1); \
-  f("error", error, 1)
+  f("dialog_plain", dialog_plain, 0)
 
 #endif