855 changes: 0 additions & 855 deletions mythtv/libs/libmyth/managedlist.cpp
View file

This file was deleted.

738 changes: 0 additions & 738 deletions mythtv/libs/libmyth/managedlist.h
View file

This file was deleted.

78 changes: 0 additions & 78 deletions mythtv/libs/libmyth/mythdialogs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,70 +951,6 @@ void MythProgressDialog::setTotalSteps(int totalSteps)
steps = 1;
}

MythBusyDialog::MythBusyDialog(const QString &title, bool cancelButton,
const QObject *target, const char *slot)
: MythProgressDialog(title, 0,
cancelButton, target, slot),
timer(NULL)
{
setObjectName("MythBusyDialog");
}

MythBusyDialog::~MythBusyDialog()
{
Teardown();
}

void MythBusyDialog::deleteLater(void)
{
Teardown();
MythProgressDialog::deleteLater();
}

void MythBusyDialog::Teardown(void)
{
if (timer)
{
timer->disconnect();
timer = NULL;
}
}

void MythBusyDialog::start(int interval)
{
if (!timer)
timer = new QTimer(this);

connect(timer, SIGNAL(timeout()),
this, SLOT (timeout()));

timer->start(interval);
}

void MythBusyDialog::Close(void)
{
if (timer)
{
timer->disconnect();
timer = NULL;
}

MythProgressDialog::Close();
}

void MythBusyDialog::setProgress(void)
{
progress->setValue(progress->value() + 10);
qApp->processEvents();
if (LCD *lcddev = LCD::Get())
lcddev->setGenericBusy();
}

void MythBusyDialog::timeout(void)
{
setProgress();
}

MythThemedDialog::MythThemedDialog(MythMainWindow *parent,
const QString &window_name,
const QString &theme_filename,
Expand Down Expand Up @@ -1172,10 +1108,6 @@ void MythThemedDialog::loadWindow(QDomElement &element)
{
parseContainer(e);
}
else if (e.tagName() == "popup")
{
parsePopup(e);
}
else
{
LOG(VB_GENERAL, LOG_ALERT,
Expand Down Expand Up @@ -1220,16 +1152,6 @@ void MythThemedDialog::parseFont(QDomElement &element)
theme->parseFont(element);
}

void MythThemedDialog::parsePopup(QDomElement &element)
{
//
// theme doesn't know how to do this yet
//
element = element;
LOG(VB_GENERAL, LOG_ALERT,
"MythThemedDialog cannot parse popups yet - ignoring");
}

void MythThemedDialog::initForeground()
{
my_foreground = my_background;
Expand Down
64 changes: 1 addition & 63 deletions mythtv/libs/libmyth/mythdialogs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ class MPUBLIC MythPopupBox : public MythDialog
* perform and the possibility of calling the \p setProgress call at
* the end of each step.
*
* If you do not know the number of steps, use \p MythBusyDialog
* instead.
*
* The dialog widget also updates the LCD display if present.
*
* \deprecated Due for removal, use libmythui's MythUIProgressDialog instead
Expand Down Expand Up @@ -260,69 +257,11 @@ class MPUBLIC MythProgressDialog: public MythDialog
int m_totalSteps;
};

/** MythDialog box that displays a busy spinner-style dialog box to
indicate the program is busy, but that the number of steps needed
is unknown.
Ie. used by MythMusic when scanning the filesystem for musicfiles.
\deprecated Due for removal, use libmythui's MythUIBusyDialog instead
*/
class MPUBLIC MythBusyDialog : public MythProgressDialog
{
Q_OBJECT

public:
/** \brief Create the busy indicator.
Creates the dialog widget and sets up the timer that causes
the widget to indicate progress every 100msec;
\param title the title to appear in the progress bar dialog
\param cancelButton display cancel button
\param target target for cancel signal
\param slot slot for cancel signal
\deprecated Due for removal, use libmythui's MythUIBusyDialog instead
*/
MythBusyDialog(const QString &title,
bool cancelButton = false,
const QObject * target = NULL,
const char * slot = NULL);

/** \brief Setup a timer to 'move' the spinner
This will create a \p QTimer object that will update the
spinner ever \p interval msecs.
\param interval msecs between movement, default is 100
*/
void start(int interval = 100);

/** \brief Close the dialog.
This will close the dialog and stop the timer.
*/
void Close();

public slots:
virtual void deleteLater(void);

protected slots:
void setProgress();
void timeout();

protected:
void Teardown(void);
~MythBusyDialog();

private:
QTimer *timer;
};

/*!
* \deprecated Due for removal, use libmythui's MythScreenType instead
*/
class MPUBLIC MythThemedDialog : public MythDialog
class MythThemedDialog : public MythDialog
{
Q_OBJECT

Expand All @@ -340,7 +279,6 @@ class MPUBLIC MythThemedDialog : public MythDialog
virtual void loadWindow(QDomElement &);
virtual void parseContainer(QDomElement &);
virtual void parseFont(QDomElement &);
virtual void parsePopup(QDomElement &);
bool buildFocusList();

UIType *getUIObject(const QString &name);
Expand Down
22 changes: 12 additions & 10 deletions mythtv/libs/libmyth/xmlparse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,44 @@

class MythUIHelper;

class MPUBLIC XMLParse
class XMLParse
{
public:
XMLParse();
~XMLParse();

protected:
fontProp *GetFont(const QString &, bool checkGlobal = true);
LayerSet *GetSet(const QString &text);

void SetWMult(double wm) { wmult = wm; }
void SetHMult(double hm) { hmult = hm; }
void SetFontSizeType(QString s) { fontSizeType = s; }

bool LoadTheme(QDomElement &, QString, QString sf = "");

private:
bool doLoadTheme(QDomElement &, QString, QString);
QMap<QString, fontProp> fontMap;
QMap<QString, LayerSet*> layerMap;
vector<LayerSet *> *allTypes;

QString getFirstText(QDomElement &);
void parseFont(QDomElement &);
void normalizeRect(QRect &);
QPoint parsePoint(QString);
QRect parseRect(QString);
void parsePopup(QDomElement &);
void parseContainer(QDomElement &, QString &, int &, QRect &);
void parseKeyboard(LayerSet *, QDomElement &);
void parseKey(LayerSet *, QDomElement &);

private:
bool doLoadTheme(QDomElement &, QString, QString);
QMap<QString, fontProp> fontMap;
QMap<QString, LayerSet*> layerMap;
vector<LayerSet *> *allTypes;

double wmult;
double hmult;

QString fontSizeType;

MythUIHelper *ui;

friend class MythThemedDialog;
friend class MythDialog;
};

#endif
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/// Update this whenever the plug-in API changes.
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
/// libmythui class methods used by plug-ins.
#define MYTH_BINARY_VERSION "0.25.20120123-1"
#define MYTH_BINARY_VERSION "0.25.20120123-2"

/** \brief Increment this whenever the MythTV network protocol changes.
*
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmythtv/recordingprofile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ class RecordingProfile;
class VideoCompressionSettings;
class AudioCompressionSettings;

class SelectManagedListItem;

// A parameter associated with the profile itself
class RecordingProfileStorage : public SimpleDBStorage
{
Expand Down