Changeset d0f00ee670c147f64e39d552767aa4924a77126a

Show
Ignore:
Timestamp:
10/06/07 15:40:16 (1 year ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1191678016 +0000
git-parent:

[f913159da06612d0278f87bd8160dafaa8a30b53]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1191678016 +0000
Message:

Qt4: podcast configuration, don't use a modal window, don't use a Qdailog but a QVLCFrame.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/dialogs/podcast_configuration.cpp

    r6ee1e19 rd0f00ee  
    2424#include "podcast_configuration.hpp" 
    2525 
    26 PodcastConfigurationDialog::PodcastConfigurationDialog( intf_thread_t *_p_intf ) 
    27     :p_intf( _p_intf ) 
     26PodcastConfigDialog *PodcastConfigDialog::instance = NULL; 
     27 
     28PodcastConfigDialog::PodcastConfigDialog( intf_thread_t *_p_intf) 
     29                : QVLCFrame( _p_intf ) 
     30 
    2831{ 
    2932    ui.setupUi( this ); 
    30   
     33 
    3134    QPushButton *okButton = new QPushButton( qtr( "OK" ), this ); 
    3235    QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ), this ); 
    …… 
    5255} 
    5356 
    54 void PodcastConfigurationDialog::accept() 
     57PodcastConfigDialog::~PodcastConfigDialog() 
     58{ 
     59} 
     60 
     61void PodcastConfigDialog::accept() 
    5562{ 
    5663    QString urls = ""; 
    …… 
    7582        msg_Dbg( p_intf, "You will need to reload the podcast module to take into account deleted podcast urls" ); 
    7683    } 
    77  
    78     QDialog::accept(); 
    7984} 
    8085 
    81 void PodcastConfigurationDialog::add() 
     86void PodcastConfigDialog::add() 
    8287{ 
    8388    if( ui.podcastURL->text() != QString( "" ) ) 
    …… 
    8893} 
    8994 
    90 void PodcastConfigurationDialog::remove() 
     95void PodcastConfigDialog::remove() 
    9196{ 
    9297    delete ui.podcastList->currentItem(); 

  • modules/gui/qt4/dialogs/podcast_configuration.hpp

    re4bbf1c rd0f00ee  
    2525#define _PODCAST_CONFIGURATION_DIALOG_H_ 
    2626 
    27 #include "qt4.hpp" 
     27#include "util/qvlcframe.hpp" 
    2828#include "ui/podcast_configuration.h" 
    2929 
    30 class PodcastConfigurationDialog : public QDialog 
     30class PodcastConfigDialog : public QVLCFrame 
    3131{ 
    3232    Q_OBJECT; 
    33  
    3433public: 
    35     PodcastConfigurationDialog( intf_thread_t *p_intf ); 
     34    static PodcastConfigDialog * getInstance( intf_thread_t *p_intf ) 
     35    { 
     36        if( !instance) 
     37            instance = new PodcastConfigDialog( p_intf ); 
     38        return instance; 
     39    } 
     40    virtual ~PodcastConfigDialog(); 
    3641 
    3742private: 
     43    PodcastConfigDialog( intf_thread_t *); 
     44    static PodcastConfigDialog *instance; 
    3845    Ui::PodcastConfiguration ui; 
    39     intf_thread_t *p_intf; 
    40  
    41 private slots: 
     46public slots: 
    4247    void accept(); 
    4348    void add(); 

  • modules/gui/qt4/dialogs_provider.cpp

    r0d41ec4 rd0f00ee  
    111111            case INTF_DIALOG_EXTENDED: 
    112112               extendedDialog(); break; 
    113                /* We might want to make it better with custom functions */ 
     113            case INTF_DIALOG_VLM: 
     114               vlmDialog(); break; 
     115            case INTF_DIALOG_INTERACTION: 
     116               doInteraction( de->p_arg ); break; 
    114117            case INTF_DIALOG_POPUPMENU: 
    115118               QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; 
    …… 
    120123            case INTF_DIALOG_MISCPOPUPMENU: 
    121124               QVLCMenu::MiscPopupMenu( p_intf ); break; 
    122             case INTF_DIALOG_INTERACTION: 
    123                doInteraction( de->p_arg ); break; 
    124             case INTF_DIALOG_VLM: 
    125                vlmDialog(); break; 
    126125            case INTF_DIALOG_WIZARD: 
    127126            case INTF_DIALOG_STREAMWIZARD: 
    …… 
    191190    /*  BookmarkDialog::getInstance( p_intf )->toggleVisible(); */ 
    192191} 
     192 
     193void DialogsProvider::podcastConfigureDialog() 
     194{ 
     195    PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); 
     196} 
     197 
    193198 
    194199/**************************************************************************** 
    …… 
    504509} 
    505510 
    506 void DialogsProvider::podcastConfigureDialog() 
    507 { 
    508     PodcastConfigurationDialog c( p_intf ); 
    509     c.exec(); 
    510 } 
    511  
    512511void DialogsProvider::switchToSkins() 
    513512{ 

  • modules/gui/qt4/ui/podcast_configuration.ui

    r7b19600 rd0f00ee  
    11<ui version="4.0" > 
    22 <class>PodcastConfiguration</class> 
    3  <widget class="QDialog" name="PodcastConfiguration" > 
     3 <widget class="QWidget" name="PodcastConfiguration" > 
    44  <property name="geometry" > 
    55   <rect>