SPICE.diff

VIVOSS company, 12/28/2011 02:01 PM

Download (2.79 KB)

View differences:

sunstone/public/js/plugins/templates-tab.js (revision 115)
431 431
                                  <select id="TYPE" name="">\
432 432
                    <option value="">'+tr("Please select")+'</option>\
433 433
                                        <option id="vnc" value="vnc">'+tr("VNC")+'</option>\
434
                                        <option id="spice" value="spice">'+tr("SPICE")+'</option>\
434 435
                                        <option value="sdl">'+tr("SDL")+'</option>\
435 436
                                  </select>\
436 437
                                  <div class="tip"></div>\
......
1650 1651
                $('#PASSWD',section_graphics).parent().removeAttr("disabled");
1651 1652
                $('#KEYMAP',section_graphics).parent().removeAttr("disabled");
1652 1653
                break;
1654
            case "spice":
1655
                $('#LISTEN',section_graphics).parent().show();
1656
                $('#PORT',section_graphics).parent().show();
1657
                $('#PASSWD',section_graphics).parent().show();
1658
                $('#KEYMAP',section_graphics).parent().show();
1659
                $('#PORT',section_graphics).parent().removeAttr("disabled");
1660
                $('#PASSWD',section_graphics).parent().removeAttr("disabled");
1661
                $('#KEYMAP',section_graphics).parent().removeAttr("disabled");
1662
                break;
1653 1663
            case "sdl":
1654 1664
                $('#LISTEN',section_graphics).parent().show();
1655 1665
                $('#PORT',section_graphics).parent().hide();
vmm/LibVirtDriverKVM.cc (revision 115)
568 568
                file << "/>" << endl;
569 569
            }
570 570
            else
571
            if ( type == "spice" || type == "SPICE" )
571 572
            {
573
                file << "\t\t<graphics type='spice'";
574

  
575
                if ( !listen.empty() )
576
                {
577
                    file << " listen='" << listen << "'";
578
                }
579

  
580
                if ( !port.empty() )
581
                {
582
                    file << " port='" << port << "'";
583
                }
584

  
585
                if ( !passwd.empty() )
586
                {
587
                    file << " passwd='" << passwd << "'";
588
                }
589

  
590
                if ( !keymap.empty() )
591
                {
592
                    file << " keymap='" << keymap << "'";
593
                }
594

  
595
                file << "/>" << endl;
596
            }
597
            else
598
            {
572 599
                vm->log("VMM", Log::WARNING,
573 600
                        "Not supported graphics type, ignored.");
574 601
            }