Merge pull request #2 from tobser/ia7-1.2_floorplan_merge

Ia7 1.2 floorplan merge
rudybrian · May 30, 2016 · db146cc · db146cc
2 parents 9cdd920 + 46de086
commit db146cc
Show file tree

Hide file tree

Showing 2 changed files with 573 additions and 197 deletions.
diff --git a/lib/json_server.pl b/lib/json_server.pl
@@ -626,6 +626,14 @@ sub json_get {
  }
  }
 
+ if ( $path[0] eq 'fp_icon_sets' ){
+ my $p = "../web/ia7/graphics/*default_".$args{px}[0].".png";
+ my @icons = glob($p);
+ s/^..\/web// for @icons;
+ $json_data{'icon_sets'} = [];
+ push( @{ $json_data{'fp_icon_sets'} }, @icons);
+ }
+
  # List speak phrases
  if ( $path[0] eq 'print_speaklog' || $path[0] eq '' ) {
  my ( @log, @tmp );