Ticket #2124: 2124-v1.patch

File 2124-v1.patch, 5.2 KB (added by danielk, 14 years ago)

cleaned up patch

  • themes/G.A.N.T./ui.xml

     
    13211321          <filename>type/watched.png</filename>
    13221322          <position>300,195</position>
    13231323      </image>
     1324      <image name="processing" draworder="6">
     1325        <filename>processing.png</filename>
     1326        <position>20,106</position>
     1327      </image>
     1328      <image name="preserved" draworder="6">
     1329        <filename>preserve.png</filename>
     1330        <position>289,106</position>
     1331      </image>
    13241332
    1325 
    13261333    </container>
    13271334
    13281335    <container name="program_info_del">
  • themes/blue/ui.xml

    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: themes/default/preserve.png
    ___________________________________________________________________
    Name: svn:mime-type
       + application/octet-stream
    
     
    887887          <filename>type/watched.png</filename>
    888888          <position>302,106</position>
    889889      </image>
    890 
    891890      <image name="processing" draworder="6">
    892891        <filename>processing.png</filename>
    893892        <position>20,106</position>
    894893      </image>
     894      <image name="preserved" draworder="6">
     895        <filename>preserve.png</filename>
     896        <position>289,106</position>
     897      </image>
     898     
    895899
    896900    </container>
    897901
  • libs/libmythtv/programinfo.h

     
    4545};
    4646
    4747enum FlagMask {
    48     FL_COMMFLAG       = 0x001,
    49     FL_CUTLIST        = 0x002,
    50     FL_AUTOEXP        = 0x004,
    51     FL_EDITING        = 0x008,
    52     FL_BOOKMARK       = 0x010,
    53     FL_INUSERECORDING = 0x020,
    54     FL_INUSEPLAYING   = 0x040,
    55     FL_STEREO         = 0x080,
    56     FL_CC             = 0x100,
    57     FL_HDTV           = 0x200,
    58     FL_TRANSCODED     = 0x400,
    59     FL_WATCHED        = 0x800
     48    FL_COMMFLAG       = 0x0001,
     49    FL_CUTLIST        = 0x0002,
     50    FL_AUTOEXP        = 0x0004,
     51    FL_EDITING        = 0x0008,
     52    FL_BOOKMARK       = 0x0010,
     53    FL_INUSERECORDING = 0x0020,
     54    FL_INUSEPLAYING   = 0x0040,
     55    FL_STEREO         = 0x0080,
     56    FL_CC             = 0x0100,
     57    FL_HDTV           = 0x0200,
     58    FL_TRANSCODED     = 0x0400,
     59    FL_WATCHED        = 0x0800,
     60    FL_PRESERVED      = 0x1000,
    6061};
    6162
    6263enum RecStatusType {
  • libs/libmythtv/programinfo.cpp

     
    36673667    MSqlQuery query(MSqlQuery::InitCon());
    36683668
    36693669    query.prepare("SELECT commflagged, cutlist, autoexpire, "
    3670                   "editing, bookmark, stereo, closecaptioned, hdtv, watched "
     3670                  "editing, bookmark, stereo, closecaptioned, "
     3671                  "hdtv, watched, preserve "
    36713672                  "FROM recorded LEFT JOIN recordedprogram ON "
    36723673                  "(recorded.chanid = recordedprogram.chanid AND "
    36733674                  "recorded.starttime = recordedprogram.starttime) "
     
    36903691        flags |= (query.value(6).toInt() == 1) ? FL_CC : 0;
    36913692        flags |= (query.value(7).toInt() == 1) ? FL_HDTV : 0;
    36923693        flags |= (query.value(8).toInt() == 1) ? FL_WATCHED : 0;
     3694        flags |= (query.value(9).toInt() == 1) ? FL_PRESERVED : 0;
    36933695    }
    36943696
    36953697    return flags;
  • programs/mythfrontend/playbackbox.cpp

     
    811811        iconMap["cc"]          = FL_CC;
    812812        iconMap["hdtv"]        = FL_HDTV;
    813813        iconMap["watched"]     = FL_WATCHED;
     814        iconMap["preserved"]   = FL_PRESERVED;
    814815
    815816        UIImageType *itype;
    816817        for (it = iconMap.begin(); it != iconMap.end(); ++it)
  • programs/mythbackend/mainserver.cpp

     
    10641064        "recorded.progend, recorded.stars, "
    10651065        "recordedprogram.stereo, recordedprogram.hdtv, "
    10661066        "recordedprogram.closecaptioned, transcoded, "
    1067         "recorded.recpriority, watched "
     1067        "recorded.recpriority, watched, recorded.preserve "
    10681068        "FROM recorded "
    10691069        "LEFT JOIN record ON recorded.recordid = record.recordid "
    10701070        "LEFT JOIN channel ON recorded.chanid = channel.chanid "
     
    11691169            flags |= (query.value(35).toInt() == TRANSCODING_COMPLETE) ?
    11701170                      FL_TRANSCODED : 0;
    11711171            flags |= (query.value(37).toInt() == 1) ? FL_WATCHED : 0;
     1172            flags |= (query.value(38).toInt() == 1) ? FL_PRESERVED : 0;
    11721173
    11731174            inUseKey = query.value(0).toString() + " " +
    11741175                       query.value(1).toDateTime().toString(Qt::ISODate);