Renamed remaining display-related methods from camelCase to snake_case.

lib/diakonos/display.rb

@@ -290,8 +290,8 @@ module Diakonos
       end
     end
 
-    def showMessage( message, non_interaction_duration = @settings[ 'interaction.choice_delay' ] )
-      terminateMessage
+    def show_message( message, non_interaction_duration = @settings[ 'interaction.choice_delay' ] )
+      terminate_message
 
       @message_expiry = Time.now + non_interaction_duration
       @message_thread = Thread.new do
@@ -307,14 +307,14 @@ module Diakonos
       end
     end
 
-    def terminateMessage
+    def terminate_message
       if @message_thread and @message_thread.alive?
         @message_thread.terminate
         @message_thread = nil
       end
     end
 
-    def refreshAll
+    def refresh_all
       @win_main.refresh
       if @win_context
         @win_context.refresh

lib/diakonos/functions.rb

@@ -1429,7 +1429,7 @@ module Diakonos
           t2.join
 
           Curses::init_screen
-          refreshAll
+          refresh_all
         end
         openFile result_file
       end
@@ -1455,7 +1455,7 @@ module Diakonos
         end
 
         Curses::init_screen
-        refreshAll
+        refresh_all
 
         set_iline result
       end
@@ -1482,7 +1482,7 @@ module Diakonos
         end
 
         Curses::init_screen
-        refreshAll
+        refresh_all
       end
     end
 
@@ -1511,7 +1511,7 @@ module Diakonos
       Curses::close_screen
       Process.kill( "SIGSTOP", $PID )
       Curses::init_screen
-      refreshAll
+      refresh_all
     end
 
     def toggleMacroRecording( name = nil )

lib/diakonos/interaction.rb

@@ -51,7 +51,7 @@ module Diakonos
     end
 
     def interaction_blink( message = nil )
-      terminateMessage
+      terminate_message
       set_iline @settings[ 'interaction.blink_string' ]
       sleep @settings[ 'interaction.blink_duration' ]
       set_iline message if message
@@ -80,7 +80,7 @@ module Diakonos
       msg << choice_strings.join( ", " )
 
       if default.nil?
-        showMessage msg
+        show_message msg
       else
         set_iline msg
       end
@@ -97,7 +97,7 @@ module Diakonos
         else
           if @message_expiry and Time.now < @message_expiry
             interaction_blink
-            showMessage msg
+            show_message msg
           else
             case c
             when ENTER
@@ -124,7 +124,7 @@ module Diakonos
         end
       end
 
-      terminateMessage
+      terminate_message
       set_iline
 
       if @choice_iterations > 0