summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-11-04 20:06:58 (UTC)
committer harlekin <harlekin>2002-11-04 20:06:58 (UTC)
commit222d1d8b75494d520b5373fbaf64518afcdfcf89 (patch) (side-by-side diff)
tree77faff83517567d4a8ce562a644f8582b57e8737
parent3c2605811571b5c8ccfbe2bdb1a03ec7a9c9f1c1 (diff)
downloadopie-222d1d8b75494d520b5373fbaf64518afcdfcf89.zip
opie-222d1d8b75494d520b5373fbaf64518afcdfcf89.tar.gz
opie-222d1d8b75494d520b5373fbaf64518afcdfcf89.tar.bz2
removed extra buttons - why double when they are in the titelbar
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/mediummountgui.cpp24
-rw-r--r--core/launcher/mediummountgui.h10
2 files changed, 10 insertions, 24 deletions
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 6d60ce4..b0a1b10 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -135,83 +135,73 @@ void MediumMountGui::startGui() {
CheckBoxLink->setEnabled( false );
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 );
connect( CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers() ) );
QVBox* dirBox = new QVBox( this );
- dirBox->setMargin( 4 );
+ dirBox->setMargin( 5 );
// select dirs
DirSelectText = new QLabel( dirBox, "DirSelectText" );
DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
QHBox* dirLineBox = new QHBox( dirBox );
LineEdit1 = new QLineEdit( dirLineBox );
PushButton3 = new QPushButton( dirLineBox );
PushButton3->setText( tr( "Add" ) );
+ PushButton3->setFocus();
// decision
DirSelectText_2 = new QLabel( dirBox );
DirSelectText_2->setText( tr( "Your decision will be stored on the medium." ) );
// ask again
AskBox = new QCheckBox( dirBox );
AskBox->setText( tr( "Do not ask again for this medium" ) );
AskBox->setChecked( checkagain );
CheckBoxAudio->setChecked( checkmimeaudio );
CheckBoxImage->setChecked( checkmimeimage );
CheckBoxText->setChecked( checkmimetext );
CheckBoxVideo->setChecked( checkmimevideo );
CheckBoxAll->setChecked( checkmimeall );
deactivateOthers();
- QHBox* buttonBox = new QHBox( this );
- // buttons
- quit = new QPushButton( buttonBox );
- quit->setFocus();
- quit->setText( tr( "Yes" ) );
- quit_2 = new QPushButton( buttonBox );
- quit_2->setText( tr( "No" ) );
-
mainLayout->addWidget( GroupBox1 );
mainLayout->addWidget( dirBox );
- mainLayout->addWidget( buttonBox );
-
- connect( quit, SIGNAL( clicked() ), this, SLOT( yesPressed() ) );
- connect( quit_2, SIGNAL( clicked() ), this, SLOT( noPressed() ) );
+ mainLayout->addStretch( 0 );
}
void MediumMountGui::deactivateOthers() {
bool mod = !( CheckBoxAll->isChecked() );
CheckBoxVideo->setEnabled( mod );
CheckBoxAudio->setEnabled( mod );
CheckBoxText->setEnabled( mod );
CheckBoxImage->setEnabled( mod );
}
-void MediumMountGui::yesPressed() {
+void MediumMountGui::accept() {
writeConfig( true );
// and do something
- accept();
+ QDialog::accept();
}
QStringList MediumMountGui::mimeTypes() {
return mimeTypeList;
}
-void MediumMountGui::noPressed() {
+void MediumMountGui::reject() {
writeConfig( false );
- reject();
+ QDialog::reject();
}
MediumMountGui::~MediumMountGui() {
}
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 39f9a52..d5c0fe7 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -9,62 +9,58 @@ class QHBoxLayout;
class QGridLayout;
class QCheckBox;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPushButton;
class Config;
class MediumMountGui : public QDialog {
Q_OBJECT
public:
- MediumMountGui( Config *cfg, const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE ,WFlags fl = 0 );
+ MediumMountGui( Config *cfg, const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE ,WFlags fl = 0 );
~MediumMountGui();
protected:
- QPushButton* quit;
- QPushButton* quit_2;
QLabel* DirSelectText_2;
QLineEdit* LineEdit1;
QPushButton* PushButton3;
QLabel* DirSelectText;
QLabel* Text_2;
QLabel* Text;
QGroupBox* GroupBox1;
QCheckBox* CheckBoxAudio;
QCheckBox* CheckBoxImage;
QCheckBox* CheckBoxText;
QCheckBox* CheckBoxVideo;
QCheckBox* CheckBoxAll;
QCheckBox* CheckBoxLink;
QCheckBox* AskBox;
-
public:
bool check();
QStringList mimeTypes();
QStringList dirs();
private:
void startGui();
void readConfig();
void writeConfig( bool checkagain );
private slots:
- void yesPressed();
- void noPressed();
+ void accept();
+ void reject();
void deactivateOthers();
private:
QString mediumPath;
-
bool checkagain:1;
bool checkmimeaudio:1;
bool checkmimeimage:1;
bool checkmimetext:1;
bool checkmimevideo:1;
bool checkmimeall:1;
QString limittodirs;
QStringList mimeTypeList;
Config *m_cfg;
};