Ticket #158: dvdwizard_v3.patch

File dvdwizard_v3.patch, 6.0 KB (added by Aaron McCarthy <mccarthy.aaron@…>, 15 years ago)

Fixed an error in generating the growisofs parameters

  • programs/mythfrontend/playbackbox.cpp

     
    431431void PlaybackBox::exitWin()
    432432{
    433433    killPlayerSafe();
    434     accept();
     434    reject();
    435435}
    436436
    437437void PlaybackBox::updateBackground(void)
     
    15721572        play(curitem);
    15731573}
    15741574
     1575void PlaybackBox::selectSelected()
     1576{
     1577    killPlayerSafe();
     1578    accept();
     1579}
     1580
    15751581void PlaybackBox::stopSelected()
    15761582{
    15771583    state = kStopping;
     
    16691675    {
    16701676        case Play: playSelected(); break;
    16711677        case Delete: deleteSelected(); break;
     1678        case Select: selectSelected(); break;
    16721679    }
    16731680}
    16741681
  • programs/mythfrontend/globalsettings.cpp

     
    22302230    };
    22312231};
    22322232
     2233static HostLineEdit *DVDWizardDir()
     2234{
     2235    HostLineEdit *l = new HostLineEdit("DVDWizardDir");
     2236    l->setLabel(QObject::tr("Scratch Dir"));
     2237    l->setValue("");
     2238    l->setHelpText(QObject::tr("This directory will be used to store temporary "
     2239                   "files when generating DVDs."));
     2240    return l;
     2241}
     2242
     2243static HostComboBox *DVDWizardDevice()
     2244{
     2245    HostComboBox *gc = new HostComboBox("DVDDevice", true);
     2246    gc->setLabel(QObject::tr("DVD-Writer device"));
     2247
     2248    QDir dev("/dev", "cdrom*", QDir::Name, QDir::System);
     2249    gc->fillSelectionsFromDir(dev);
     2250    dev.setNameFilter("scd*");
     2251    gc->fillSelectionsFromDir(dev);
     2252    dev.setNameFilter("hd*");
     2253    gc->fillSelectionsFromDir(dev);
     2254    dev.setNameFilter("cdrom*");
     2255    dev.setPath("/dev/cdroms");
     2256    gc->fillSelectionsFromDir(dev);
     2257
     2258    gc->setHelpText(QObject::tr("DVD Writer device used for burning DVDs."));
     2259    return gc;
     2260}
     2261
    22332262static GlobalCheckBox *LogEnabled()
    22342263{
    22352264    GlobalCheckBox *bc = new GlobalCheckBox("LogEnabled");
     
    28742903
    28752904    MythFillSettings *mythfill = new MythFillSettings();
    28762905    addChild(mythfill);
     2906
     2907    VerticalConfigurationGroup* dvdwizard = new VerticalConfigurationGroup(false);
     2908    dvdwizard->setLabel(QObject::tr("DVD Wizard"));
     2909    dvdwizard->addChild(DVDWizardDir());
     2910    dvdwizard->addChild(DVDWizardDevice());
     2911    addChild(dvdwizard);
    28772912}
    28782913
    28792914PlaybackSettings::PlaybackSettings()
  • programs/mythfrontend/main.cpp

     
    2727#include "channelrecpriority.h"
    2828#include "globalsettings.h"
    2929#include "profilegroup.h"
     30#include "dvdwizard.h"
    3031
    3132#include "exitcodes.h"
    3233#include "themedmenu.h"
     
    211212    qApp->lock();
    212213}
    213214
     215void startDVDWizard(void)
     216{
     217    DVDWizard wizard(gContext->GetMainWindow(), "dvd wizard");
     218
     219    qApp->unlock();
     220    wizard.exec();
     221    qApp->lock();
     222}
     223
    214224void startCustomRecord(void)
    215225{
    216226    CustomRecord custom(gContext->GetMainWindow(), "custom record");
     
    406416        startSearchTime();
    407417    else if (sel == "tv_previous")
    408418        startPrevious();
     419    else if (sel == "tv_dvd_wizard")
     420        startDVDWizard();
    409421    else if (sel == "settings appearance")
    410422    {
    411423        AppearanceSettings settings;
  • programs/mythfrontend/mainmenu.xml

     
    9696     <text lang="ET">DVD ja CD</text>
    9797     <text lang="NB">CD-/DVD-stasjoner</text>
    9898     <action>MENU optical_menu.xml</action>
    99      <depends>mythmusic mythdvd</depends>
    10099   </button>
    101100   
    102101   
  • programs/mythfrontend/mythfrontend.pro

     
    4545HEADERS += manualbox.h playbackbox.h viewscheduled.h globalsettings.h
    4646HEADERS += manualschedule.h programrecpriority.h channelrecpriority.h
    4747HEADERS += statusbox.h previousbox.h customrecord.h
     48HEADERS += dvdwizard.h dvdwizardpage.h
    4849
    4950SOURCES += main.cpp manualbox.cpp playbackbox.cpp viewscheduled.cpp
    5051SOURCES += globalsettings.cpp manualschedule.cpp programrecpriority.cpp
    5152SOURCES += channelrecpriority.cpp statusbox.cpp previousbox.cpp
    5253SOURCES += customrecord.cpp
     54SOURCES += dvdwizard.cpp dvdwizardpage.cpp
    5355
    5456macx {
    5557    RC_FILE += mythfrontend.icns
  • programs/mythfrontend/playbackbox.h

     
    2626{
    2727    Q_OBJECT
    2828  public:
    29     typedef enum { Play, Delete } BoxType;
     29    typedef enum { Play, Delete, Select } BoxType;
    3030    typedef enum { TitlesOnly, TitlesCategories, TitlesCategoriesRecGroups,
    3131                   TitlesRecGroups, Categories, CategoriesRecGroups, RecGroups} ViewType;
    3232
     
    3535   ~PlaybackBox(void);
    3636   
    3737    void customEvent(QCustomEvent *e);
     38
     39    ProgramInfo getSelected() { return *curitem; };
    3840 
    3941  protected slots:
    4042    void timeout(void);
     
    6466    void showPlaylistPopup();
    6567    void showPlaylistJobPopup();
    6668
     69    void selectSelected();
     70
    6771    void doPlay();
    6872    void doPlayFromBeg();
    6973    void doPlayListRandom();
  • programs/mythfrontend/optical_menu.xml

     
    11<mythmenu name="OPTICAL_DISK">
    22
    33   <button>
     4      <type>DVD_WIZARD</type>
     5      <text>Author DVD</text>
     6      <action>TV_DVD_WIZARD</action>
     7   </button>
     8
     9   <button>
    410      <type>DVD_PLAY</type>
    511      <text>Play DVD</text>
    612      <text lang="DK">Afspil DVD</text>