Changeset 25077 for gs3-extensions/html-to-expeditee

Timestamp:

2012-02-13T17:02:43+13:00 (12 years ago)

Author:

davidb

Message:

Coloured shift and macron buttons

File:

• gs3-extensions/html-to-expeditee/trunk/src/bin/script/keyboard.pl (modified) (9 diffs)

gs3-extensions/html-to-expeditee/trunk/src/bin/script/keyboard.pl

@@ -228 +228 @@
     my $searchBoxText = "Search text goes here";
     
-    my $textAttr = {};
-    $textAttr->{'f'} = "tb30";
-
-    $expeditee_frame_io->addText($x,$y,$searchBoxText,undef,$textAttr);
-    
-    #add button images for 'Search' button and 'Reset' button.
+    my $searchTextAttr = {};
+    $searchTextAttr->{'f'} = "tb30";
+    $searchTextAttr->{'D'} = "search text";
+
+    $expeditee_frame_io->addText($x,$y,$searchBoxText,undef,$searchTextAttr);
+    
+    #add button images for 'Search' button,'Reset' button & 'Constraint Search' button.
     $x = ($x - 5) + $xr + 10;
     $y -= 55;               #reset y to original value so buttons align with search box.
 
+    my $textAttr = {};
     $textAttr->{'X'} = "runFrame";
     $textAttr->{'x'} = "false";     #set action mark.
@@ -252 +254 @@
     
     my $searchBtnText = "Search";
-        $textAttr->{'d'} = "100 100 100";           #set text color 
+        $textAttr->{'d'} = "100 100 100";               #set text color 
     $expeditee_frame_io->addText($x,$y,$searchBtnText,undef,$textAttr);
     
@@ -265 +267 @@
     my $resetBtnText = "Reset";
         
-    $expeditee_frame_io->addText($x,$y,$resetBtnText,undef,$textAttr);  
+    $expeditee_frame_io->addText($x,$y,$resetBtnText,undef,$textAttr);
+
+    $x += 160;
+
+    my $constraintsBtnText = "Constraints";
+    $textAttr->{'F'} = "Keyboard-Actions52";            #link to frame containing Constraint Search code.
+    $expeditee_frame_io->addText($x,$y,$constraintsBtnText,undef,$textAttr);
+
+    $x = ($x - 25 - 160) + $width + 10;
+    $y -= 55;
+    $expeditee_frame_io->addText($x,$y,$imgBtn,undef,$textAttr);    
 
 }
@@ -278 +290 @@
 sub add_key
 {
-    my ($expeditee_frame_io,$label,$char,$x,$y) =@_;
+    my ($expeditee_frame_io,$label,$char,$x,$y,$fn) =@_;
 
     my $imgBtn = "";
@@ -308 +320 @@
     elsif(($label eq "macron") || ($label eq "shift")) {
                        
-         
+            my $yellowText = "100 84 16";
         $imgBtn = "\@i: images/buttons/key_special.png";
 
         $textAttr->{'f'} = "tb32";
+        
+        if($fn == 2 && $label eq "shift") {
+                $textAttr->{'d'} = $yellowText;
+        }
+        elsif($fn == 3 && $label eq "macron") {
+                $textAttr->{'d'} = $yellowText;
+        }
+        elsif($fn == 4) {
+            $textAttr->{'d'} = $yellowText;
+        }
+
         $width = 145;
         
     }
-    elsif($label eq "Bksp"){
+    elsif($label eq "Bksp") {
         
         $imgBtn = "\@i: images/buttons/key_bksp.png";
@@ -348 +371 @@
     if($label eq "macron") {
     $xl += 10;
-        $yt += 55;
     }
     elsif($label eq "shift") {
     $xl += 35;
-        $yt += 55;
     }
     elsif($label eq "Bksp") {
-    $xl += 55;
-        $yt += 50;
+    $xl += 50;
     }
     else {
     $xl += 20;
-        $yt += 55;
-    }
-
-
+    }
+
+    $yt += 55;
 
 
@@ -410 +429 @@
          if ($letter_rec_type eq "") {
         my $letter = $letter_rec;
-        add_key($expeditee_frame_io,$letter,$letter,$x,$y,$default_key_width,$default_key_height);  
+        add_key($expeditee_frame_io,$letter,$letter,$x,$y,$default_key_width,$default_key_height,$fn);  
                 print " $letter "; 
         }
@@ -418 +437 @@
             my $char  = $letter_rec->{'char'};
 
-            add_key($expeditee_frame_io,$label,$char,$x,$y);
+            add_key($expeditee_frame_io,$label,$char,$x,$y,$fn);
 
             print " $label ";
@@ -428 +447 @@
             my $goto_keyboard_title = $goto_keyboard->{'title'};
 
-            add_key($expeditee_frame_io,$label,$label,$x,$y);
+            add_key($expeditee_frame_io,$label,$label,$x,$y,$fn);
 
             print " $label ";