-rw-r--r-- | noncore/settings/mediummount/mainwindow.cc | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumwidget.cc | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/noncore/settings/mediummount/mainwindow.cc b/noncore/settings/mediummount/mainwindow.cc index eec786c..ebe1c94 100644 --- a/noncore/settings/mediummount/mainwindow.cc +++ b/noncore/settings/mediummount/mainwindow.cc @@ -1,43 +1,43 @@ #include <qtabwidget.h> #include <qlayout.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qpe/storage.h> #include "mediumwidget.h" #include "mediumglobal.h" #include "mainwindow.h" using namespace MediumMountSetting; /* TRANSLATOR MediumMountSetting::MainWindow */ -MainWindow::MainWindow( QWidget *parent, const char *name, bool modal, WFlags ) +MainWindow::MainWindow( QWidget *parent, const char *name, WFlags, bool modal ) : QDialog( parent, name, modal, WStyle_ContextHelp ) { setCaption ( tr( "Medium Mount Settings" )); m_lay = new QVBoxLayout( this ); m_tab = new QTabWidget( this ); m_lay->addWidget( m_tab ); init(); } MainWindow::~MainWindow() { } void MainWindow::init() { m_global = new MediumGlobalWidget( m_tab, "test drive" ); m_tab->addTab( m_global, tr("Global") ); StorageInfo storage; diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index 9649863..7bcb7f5 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h @@ -1,36 +1,36 @@ #ifndef MediumMountMainwindow_h #define MediumMountMainwindow_h #include <qlist.h> #include <qdialog.h> class QVBoxLayout; class QTabWidget; namespace MediumMountSetting { class MediumMountWidget; class MediumGlobalWidget; class MainWindow : public QDialog { Q_OBJECT public: - MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); + MainWindow(QWidget *parent = 0, const char *name = 0 , WFlags = 0, bool modal=true); ~MainWindow(); static QString appName() { return QString::fromLatin1("mediummount"); } private slots: void slotGlobalChanged(int ); void slotCheckingChanged(int ); void accept(); void done( int ); private: void init(); QTabWidget *m_tab; QVBoxLayout *m_lay; MediumGlobalWidget *m_global; QList<MediumMountWidget> m_mediums; }; }; #endif diff --git a/noncore/settings/mediummount/mediumwidget.cc b/noncore/settings/mediummount/mediumwidget.cc index f39a6ed..ec5b9d5 100644 --- a/noncore/settings/mediummount/mediumwidget.cc +++ b/noncore/settings/mediummount/mediumwidget.cc @@ -10,53 +10,48 @@ #include <qpixmap.h> #include <qpushbutton.h> #include <qvbox.h> #include <qwhatsthis.h> #include <qcombobox.h> #include <qpe/config.h> #include <qpe/qpeapplication.h> #include "mediumwidget.h" using namespace MediumMountSetting; /* TRANSLATOR MediumMountSetting::MediumMountWidget */ MediumMountWidget::MediumMountWidget(const QString &path, const QPixmap &pix, QWidget *parent, const char *name ) : QWidget( parent, name ) { - if(parent == 0){ - resize(QApplication::desktop()->width(), QApplication::desktop()->height() ); - }else{ - resize(parent->width(), parent->height() ); - } m_path = path; initGUI(); m_label->setPixmap(pix ); m_config = 0; readConfig(); } // now we fire up the GUI // if I would know what I'm doing ;) void MediumMountWidget::initGUI() { //main layout m_box = new QVBoxLayout( this , 5, 5 ); //m_box->setSpacing( 5 ); //m_box->addStretch( -1 ); // picture + text m_infoBox = new QHBox(this, "infobox" ); //m_infoBox->setSpacing( 4 ); m_label = new QLabel(m_infoBox ); m_desc = new QLabel(m_infoBox ); m_desc->setTextFormat( Qt::RichText ); QWhatsThis::add( this, tr("Configure this medium. The changes will" " go into effect when the application gets" |