summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/mediummountgui.cpp97
-rw-r--r--core/launcher/mediummountgui.h4
2 files changed, 42 insertions, 59 deletions
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index eb2308e..6d60ce4 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -3,3 +3,2 @@
-#include <qvariant.h>
#include <qcheckbox.h>
@@ -10,6 +9,6 @@
#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
+#include <qvbox.h>
+#include <qhbox.h>
@@ -18,7 +17,2 @@
-#include <qpe/config.h>
-
-
-#include <qapplication.h>
-
@@ -28,6 +22,2 @@ MediumMountGui::MediumMountGui( Config *cfg, const QString &path ,QWidget* paren
m_cfg = cfg;
- QWidget *d = QApplication::desktop();
- int w=d->width();
- int h=d->height();
- resize( w , h );
setCaption( tr( "Medium inserted" ) );
@@ -37,2 +27,3 @@ MediumMountGui::MediumMountGui( Config *cfg, const QString &path ,QWidget* paren
startGui();
+ showMaximized();
}
@@ -61,4 +52,3 @@ bool MediumMountGui::check() {
QStringList MediumMountGui::dirs() {
- QStringList list = QStringList::split(",", limittodirs );
- return list;
+ return QStringList::split( ",", limittodirs );
}
@@ -83,3 +73,2 @@ void MediumMountGui::writeConfig(bool autocheck) {
-
// if all is checked then add only "QString::null" to the list.
@@ -107,11 +96,15 @@ void MediumMountGui::startGui() {
- QPixmap image = Resource::loadPixmap( "HelpBrowser");
+ QVBoxLayout* mainLayout = new QVBoxLayout( this );
+ QHBoxLayout * titelBox = new QHBoxLayout( mainLayout );
Text_2 = new QLabel( this );
- Text_2->setGeometry( QRect( 10, 15, 40, 40 ) );
- Text_2->setPixmap( image );
+ // FIXME needs an image
+ Text_2->setPixmap( Resource::loadPixmap( "mediummount/mediummount" ) );
Text = new QLabel( this, "Text" );
- Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) );
Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
+ titelBox->addWidget( Text_2 );
+ titelBox->setStretchFactor( Text_2, 2 );
+ titelBox->addWidget( Text );
+ titelBox->setStretchFactor( Text, 8 );
@@ -119,7 +112,7 @@ void MediumMountGui::startGui() {
GroupBox1 = new QGroupBox( this, "GroupBox1" );
- GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 80 ) );
GroupBox1->setTitle( tr( "Which media files" ) );
+ QGridLayout *mimeLayout = new QGridLayout( GroupBox1, 3, 2, 10 );
+
CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
- CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) );
CheckBoxAudio->setText( tr( "Audio" ) );
@@ -127,3 +120,2 @@ void MediumMountGui::startGui() {
CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" );
- CheckBoxImage->setGeometry( QRect( 10, 35,(GroupBox1->width()/2)-15, 15 ) );
CheckBoxImage->setText( tr( "Image" ) );
@@ -131,3 +123,2 @@ void MediumMountGui::startGui() {
CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" );
- CheckBoxText->setGeometry( QRect((GroupBox1->width()/2) , 15, (GroupBox1->width()/2)-15, 15 ) );
CheckBoxText->setText( tr( "Text" ) );
@@ -135,3 +126,2 @@ void MediumMountGui::startGui() {
CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
- CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) );
CheckBoxVideo->setText( tr( "Video" ) );
@@ -139,10 +129,5 @@ void MediumMountGui::startGui() {
CheckBoxAll = new QCheckBox ( GroupBox1);
- CheckBoxAll->setGeometry( QRect( 10, 55, (GroupBox1->width()/2)-15, 15 ) );
CheckBoxAll->setText( tr( "All" ) );
- QObject::connect( (QObject*)CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers()) );
-
-
CheckBoxLink = new QCheckBox ( GroupBox1);
- CheckBoxLink->setGeometry( QRect( (GroupBox1->width()/2), 55, (GroupBox1->width()/2)-15, 15 ) );
CheckBoxLink->setText( tr( "Link apps" ) );
@@ -151,20 +136,25 @@ void MediumMountGui::startGui() {
+ mimeLayout->addWidget( CheckBoxAudio, 0, 0 );
+ mimeLayout->addWidget( CheckBoxImage, 0, 1 );
+ mimeLayout->addWidget( CheckBoxText , 1, 0 );
+ mimeLayout->addWidget( CheckBoxVideo, 1, 1 );
+ mimeLayout->addWidget( CheckBoxAll, 2, 0 );
+ mimeLayout->addWidget( CheckBoxLink, 2, 1 );
- // select dirs
+ connect( CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers() ) );
- DirSelectText = new QLabel( this, "DirSelectText" );
- DirSelectText->setGeometry( QRect( 10, 160,this->width() , 20 ) );
- DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
+ QVBox* dirBox = new QVBox( this );
+ dirBox->setMargin( 4 );
- LineEdit1 = new QLineEdit( this );
- LineEdit1->setGeometry( QRect( 10, 180, (this->width())-60, 20 ) );
+ // select dirs
+ DirSelectText = new QLabel( dirBox, "DirSelectText" );
+ DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
- PushButton3 = new QPushButton( this );
- PushButton3->setGeometry( QRect( (this->width())-40, 180, 30, 20 ) );
+ QHBox* dirLineBox = new QHBox( dirBox );
+ LineEdit1 = new QLineEdit( dirLineBox );
+ PushButton3 = new QPushButton( dirLineBox );
PushButton3->setText( tr( "Add" ) );
-
// decision
- DirSelectText_2 = new QLabel( this );
- DirSelectText_2->setGeometry( QRect( 10,240,this->width(), 15 ) );
+ DirSelectText_2 = new QLabel( dirBox );
DirSelectText_2->setText( tr( "Your decision will be stored on the medium." ) );
@@ -172,7 +162,5 @@ void MediumMountGui::startGui() {
// ask again
- AskBox = new QCheckBox( this );
- AskBox->setGeometry( QRect( 10, 215, (this->width())-15 , 15 ) );
+ AskBox = new QCheckBox( dirBox );
AskBox->setText( tr( "Do not ask again for this medium" ) );
-
AskBox->setChecked(checkagain);
@@ -184,16 +172,17 @@ void MediumMountGui::startGui() {
deactivateOthers();
+
+ QHBox* buttonBox = new QHBox( this );
// buttons
- quit = new QPushButton( this );
- quit->setGeometry( QRect( (this->width()/2)- 90 , 260, 80, 22 ) );
+ quit = new QPushButton( buttonBox );
quit->setFocus();
quit->setText( tr( "Yes" ) );
-
- quit_2 = new QPushButton( this );
- quit_2->setGeometry( QRect((this->width()/2) , 260, 80, 22 ) );
+ quit_2 = new QPushButton( buttonBox );
quit_2->setText( tr( "No" ) );
- QObject::connect( (QObject*)quit, SIGNAL( clicked() ), this, SLOT(yesPressed() ) );
- QObject::connect( (QObject*)quit_2, SIGNAL( clicked() ), this, SLOT(noPressed() ) );
-
+ mainLayout->addWidget( GroupBox1 );
+ mainLayout->addWidget( dirBox );
+ mainLayout->addWidget( buttonBox );
+ connect( quit, SIGNAL( clicked() ), this, SLOT( yesPressed() ) );
+ connect( quit_2, SIGNAL( clicked() ), this, SLOT( noPressed() ) );
}
@@ -203,8 +192,2 @@ void MediumMountGui::deactivateOthers() {
bool mod = !(CheckBoxAll->isChecked());
-
- //if (!CheckBoxVideo->isChecked()){
- // mod = false;
- //} else {
- // mod = true;
- //}
CheckBoxVideo->setEnabled(mod);
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 8292c3a..39f9a52 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -5,2 +5,3 @@
#include <qdialog.h>
+
class QVBoxLayout;
@@ -15,4 +16,3 @@ class Config;
-class MediumMountGui : public QDialog
-{
+class MediumMountGui : public QDialog {
Q_OBJECT