Ticket #3334: importicons-libmyth-04102007.diff

libs/libmyth/mythdialogs.cpp

@@ -624 +624 @@
     return popup.ExecPopup();
 }
 
-MythProgressDialog::MythProgressDialog(const QString &message, int totalSteps)
+MythProgressDialog::MythProgressDialog(const QString &message, int totalSteps, 
+                                         bool cancelButton, const QObject *target, const char *slot)
                   : MythDialog(gContext->GetMainWindow(), "progress", false)
 {
     int screenwidth, screenheight;
@@ -652 +653 @@
     vbox->setFrameShadow(QFrame::Raised);
     vbox->setMargin((int)(15 * wmult));
 
-    QLabel *msglabel = new QLabel(vbox);
+    msglabel = new QLabel(vbox);
     msglabel->setBackgroundOrigin(ParentOrigin);
     msglabel->setText(message);
+    vbox->setStretchFactor(msglabel, 5);
 
-    progress = new QProgressBar(totalSteps, vbox);
+    QHBox *hbox = new QHBox(vbox);
+    hbox->setSpacing(5);
+    
+    progress = new QProgressBar(totalSteps, hbox);
     progress->setBackgroundOrigin(ParentOrigin);
-    progress->setProgress(0);
 
+    if (cancelButton && slot && target)
+    {
+        MythPushButton *button = new MythPushButton("Cancel", hbox, 0);
+        button->setFocus();
+        connect(button, SIGNAL(pressed()), target, slot);
+    }
+
     setTotalSteps(totalSteps);
 
     if (class LCD * lcddev = LCD::Get())
@@ -707 +718 @@
     }
 }
 
+void MythProgressDialog::setLabel(QString newlabel)
+{
+    msglabel->setText(newlabel);
+}
+
 void MythProgressDialog::keyPressEvent(QKeyEvent *e)
 {
     bool handled = false;
@@ -728 +744 @@
 void MythProgressDialog::setTotalSteps(int totalSteps)
 {
     m_totalSteps = totalSteps;
+    progress->setTotalSteps(totalSteps);
     steps = totalSteps / 1000;
     if (steps == 0)
         steps = 1;
 }
 
-MythBusyDialog::MythBusyDialog(const QString &title)
-    : MythProgressDialog(title, 0), timer(NULL)
+MythProgressDialog::~MythProgressDialog()
 {
+    if (LCD *lcddev = LCD::Get())
+        lcddev->switchToTime();
 }
 
+
+MythBusyDialog::MythBusyDialog(const QString &title,
+                               bool cancelButton, const QObject *target, const char *slot)
+    : MythProgressDialog(title, 0,
+                         cancelButton, target, slot),
+                         timer(NULL)
+{
+}
+
 MythBusyDialog::~MythBusyDialog()
 {
     if (timer)

libs/libmyth/settings.h

@@ -409 +409 @@
     void setSelectionMode(MythListBox::SelectionMode mode);
     void setCurrentItem(int i) { if (widget) widget->setCurrentItem(i); }
     void setCurrentItem(const QString& str)  { if (widget) widget->setCurrentItem(str); }
+    int currentItem() { if (widget) return widget->currentItem();
+                         else return -1; }
 
     virtual void setEnabled(bool b);
 
@@ -668 +670 @@
                        allow_single_step, special_value_text) { }
 };
 
+class MPUBLIC TransListBoxSetting :
+    public ListBoxSetting, public TransientStorage
+{
+  public:
+    TransListBoxSetting() : ListBoxSetting(this), TransientStorage() { }
+};
+
+
 ///////////////////////////////////////////////////////////////////////////////
 
 class MPUBLIC HostSlider : public SliderSetting, public HostDBStorage

libs/libmyth/mythdialogs.h

@@ -189 +189 @@
 */
 class MPUBLIC MythProgressDialog: public MythDialog
 {
+    Q_OBJECT    
   public:
     /** Create a progress bar dialog.
         
         \param message the title string to appear in the progress dialog.
         \param totalSteps the total number of steps
+        \param cancelButton display cancel button
+        \param target target for pressed signal
+        \param slot slot for pressed signal
      */
-    MythProgressDialog(const QString& message, int totalSteps);
+    MythProgressDialog(const QString& message, int totalSteps = 0, 
+                       bool cancelButton = false, 
+                       const QObject * target = NULL, 
+                       const char * slot = NULL);
+    
+    ~MythProgressDialog();
 
+
     /* \brief Close the dialog.
 
         This will close the dialog and return the LCD to the Time screen 
     */
     void Close(void);
+
+    void keyPressEvent(QKeyEvent *);
+    
+  public slots:
     /* \brief Update the progress bar.  
 
        This will move the progress bar the percentage-completed as
@@ -211 +225 @@
        The LCD is updated as well.
     */
     void setProgress(int curprogress);
+    void setLabel(QString newlabel);
+    
+  signals:
+    void pressed();
 
-    void keyPressEvent(QKeyEvent *);
-
   protected:
     QProgressBar *progress;
+    QLabel *msglabel;
 
   private:
     void setTotalSteps(int totalSteps);
@@ -240 +257 @@
         the widget to indicate progress every 100msec;
 
         \param title the title to appear in the progress bar dialog
+        \cancelButton display cancel button
+        \param target target for pressed signal
+        \param slot slot for pressed signal
     */
-    MythBusyDialog(const QString &title);
+    MythBusyDialog(const QString &title,
+                   bool cancelButton = false, 
+                   const QObject * target = NULL, 
+                   const char * slot = NULL);
 
     ~MythBusyDialog();
 

libs/libmyth/mythwidgets.h

@@ -375 +375 @@
     virtual void keyPressEvent(QKeyEvent* e);
 
     void setHelpText(QString help) { helptext = help; }
+    
+    int currentItem() { return QListBox::currentItem(); }
 
   protected:
     void focusInEvent(QFocusEvent *e);