Ticket #3479: zoom-0.20-fixes.diff

File zoom-0.20-fixes.diff, 2.6 KB (added by Petr Stehlik <pstehlik@…>, 13 years ago)

brings 0.20-fixes' zoom files to sync with svn trunk

  • libs/libmythtv/tv_play.cpp

     
    60466046    else if (action.left(12) == "TOGGLEASPECT")
    60476047    {
    60486048        ToggleLetterbox(action.right(1).toInt());
    6049         hidetree = false;
    60506049    }
    60516050    else if (action == "GUIDE")
    60526051        EditSchedule(kScheduleProgramGuide);
     
    63406339
    63416340    int letterbox = nvp->GetLetterbox();
    63426341    item = new OSDGenericTree(treeMenu, tr("Change Aspect Ratio"));
     6342    subitem = new OSDGenericTree(item, tr("Off"), "TOGGLEASPECT" +
     6343                                 QString("%1").arg(kLetterbox_Off),
     6344                                 ((letterbox <= kLetterbox_Off) ||
     6345                                  (letterbox >= kLetterbox_END)) ? 1 : 0,
     6346                                 NULL, "ASPECTGROUP");
    63436347    subitem = new OSDGenericTree(item, tr("4:3"), "TOGGLEASPECT" +
    63446348                                 QString("%1").arg(kLetterbox_4_3),
    63456349                                 (letterbox == kLetterbox_4_3) ? 1 : 0,
     
    63606364                                 QString("%1").arg(kLetterbox_16_9_Stretch),
    63616365                                 (letterbox == kLetterbox_16_9_Stretch) ? 1 : 0,
    63626366                                 NULL, "ASPECTGROUP");
     6367    subitem = new OSDGenericTree(item, tr("Fill"), "TOGGLEASPECT" +
     6368                                 QString("%1").arg(kLetterbox_Fill),
     6369                                 (letterbox == kLetterbox_Fill) ? 1 : 0,
     6370                                 NULL, "ASPECTGROUP");
    63636371
    63646372    if (db_use_picture_attr)
    63656373    {
  • programs/mythfrontend/globalsettings.cpp

     
    14431443    gc->addSelection(QObject::tr("16/9 Stretch"), "5");
    14441444    gc->addSelection(QObject::tr("Fill"), "6");
    14451445    gc->setHelpText(QObject::tr("This will override any aspect ratio in the "
    1446                     "recorded stream, the same as pressing the W Key "
    1447                     "during playback. "
    1448                     "Fill will \"fill\" the screen with the image clipping as required. "
    1449                     "Fill is useful when using 4:3 interlaced TV's for display."
    1450                     ));
     1446                    "recorded stream, the same as pressing the W Key during "
     1447                    "playback. Fill will \"fill\" the screen with the image "
     1448                    "clipping as required. Fill is useful when using 4:3 "
     1449                    "interlaced TV's for display."));
    14511450    return gc;
    14521451}
    14531452