summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/mediummount/mainwindow.cc2
-rw-r--r--noncore/settings/mediummount/mainwindow.h2
-rw-r--r--noncore/settings/mediummount/mediumwidget.cc11
3 files changed, 5 insertions, 10 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,51 +1,51 @@
#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;
const QList<FileSystem> &fs = storage.fileSystems();
QListIterator<FileSystem> it( fs );
MediumMountWidget *wid;
for( ; it.current(); ++it ){
if( (*it)->isRemovable() ){
wid = new MediumMountWidget((*it)->path(), QPixmap(), m_tab );
m_mediums.append( wid );
m_tab->addTab( wid, (*it)->name() );
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
@@ -2,69 +2,64 @@
#include <qcheckbox.h>
#include <qgroupbox.h>
#include <qhbox.h>
#include <qlabel.h>
#include <qabstractlayout.h>
#include <qlayout.h>
#include <qlineedit.h>
#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"
" closed. To update the Document Tab you need"
" to remove and insert this medium."));
m_desc->setText("" );
m_box->addWidget( m_infoBox ); // add the widget to the layout
// groupbox
m_group = new QGroupBox(tr("Which media files"), this, "MediaFiles" );
@@ -79,85 +74,85 @@ void MediumMountWidget::initGUI()
m_box->addItem( item2 );
m_audio = new QCheckBox( tr("Audio"), m_group );
m_all = new QCheckBox( tr("All") , m_group );
m_image = new QCheckBox( tr("Image"), m_group );
m_text = new QCheckBox( tr("Text") , m_group );
m_video = new QCheckBox( tr("Video"), m_group );
QSpacerItem *iti1b = new QSpacerItem(2, 10, QSizePolicy::Fixed,
QSizePolicy::Fixed );
m_checks->addItem( iti1b, 0, 0 );
m_checks->addWidget(m_audio, 1, 0 );
m_checks->addWidget(m_image, 2, 0 );
m_checks->addWidget(m_all , 3, 0 );
m_checks->addWidget(m_text, 1, 2 );
m_checks->addWidget(m_video, 2, 2 );
m_checks->addRowSpacing(0, 8 );
m_checks->addColSpacing(1, 2 );
m_checks->setColStretch(1, -2 );
connect(m_all, SIGNAL(stateChanged(int) ),
this, SLOT(slotStateChanged() ) );
m_box->addWidget( m_group );
// label
m_lblPath = new QLabel(tr("Limit search to:"), this );
m_box->addWidget( m_lblPath );
-
+
m_subList = new QComboBox(FALSE,this,"docFolderList");
m_subList->setDuplicatesEnabled(FALSE);
m_subList->setEditable(TRUE);
m_box->addWidget(m_subList);
m_hboxAdd = new QHBox( this );
m_add = new QPushButton(m_hboxAdd );
m_add->setText( tr("Add") );
m_del = new QPushButton(m_hboxAdd);
m_del->setText(tr("Remove"));
-
+
connect(m_add, SIGNAL(clicked() ),
this, SLOT(slotAdd() ) );
connect(m_del, SIGNAL(clicked() ),
this, SLOT(slotRemove() ) );
m_box->addWidget(m_hboxAdd );
m_scan_all_check = new QCheckBox( tr("Scan whole media"), this );
connect(m_scan_all_check,SIGNAL(stateChanged(int)),this,SLOT(slotScanAllChanged(int)));
-
+
m_box->addWidget(m_scan_all_check);
m_always = new QCheckBox( tr("Always check this medium"), this );
m_box->addWidget( m_always );
QSpacerItem *item = new QSpacerItem(5, 50,
QSizePolicy::Fixed,
QSizePolicy::Expanding );
m_box->addItem(item );
}
void MediumMountWidget::readConfig( )
{
if( m_config == 0 )
m_config = new Config(m_path + "/.opiestorage.cf", Config::File );
m_config->setGroup( "main" );
m_always->setChecked( m_config->readBoolEntry("check", false) );
m_config->setGroup( "mimetypes" );
if( m_config->readBoolEntry("all", false ) ){
m_audio->setEnabled( false );
m_image->setEnabled( false );
m_text->setEnabled ( false );
m_video->setEnabled( false );
m_all->setChecked( true );
}else{
m_audio->setEnabled( true );
m_image->setEnabled( true );
m_text->setEnabled ( true );
m_all->setEnabled ( true );