summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-22 01:07:49 (UTC)
committer alwin <alwin>2004-02-22 01:07:49 (UTC)
commit3d3972ee1de2fe930dd32bcfe13a3a4f486f6ac5 (patch) (unidiff)
tree90f90bc883434cbd08ffc6c1777681609063398c
parenta1b94ec1962ddb3fb699c81bf88da58b53c94375 (diff)
downloadopie-3d3972ee1de2fe930dd32bcfe13a3a4f486f6ac5.zip
opie-3d3972ee1de2fe930dd32bcfe13a3a4f486f6ac5.tar.gz
opie-3d3972ee1de2fe930dd32bcfe13a3a4f486f6ac5.tar.bz2
now we can edit subdirs in .opiestorage.cf as used in launcher
or Global for searching for documents. ToDo: Where to (re-)implement the stuff where the dialogs apears if a media is inserted first time???? eg, no .opiestorage.cf exists on this media? I didn't found any usefull :(
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/mediummount/mediumwidget.cc49
-rw-r--r--noncore/settings/mediummount/mediumwidget.h5
2 files changed, 49 insertions, 5 deletions
diff --git a/noncore/settings/mediummount/mediumwidget.cc b/noncore/settings/mediummount/mediumwidget.cc
index 981e1dd..caa9559 100644
--- a/noncore/settings/mediummount/mediumwidget.cc
+++ b/noncore/settings/mediummount/mediumwidget.cc
@@ -2,24 +2,25 @@
2 2
3#include <qcheckbox.h> 3#include <qcheckbox.h>
4#include <qgroupbox.h> 4#include <qgroupbox.h>
5#include <qhbox.h> 5#include <qhbox.h>
6#include <qlabel.h> 6#include <qlabel.h>
7#include <qabstractlayout.h> 7#include <qabstractlayout.h>
8#include <qlayout.h> 8#include <qlayout.h>
9#include <qlineedit.h> 9#include <qlineedit.h>
10#include <qpixmap.h> 10#include <qpixmap.h>
11#include <qpushbutton.h> 11#include <qpushbutton.h>
12#include <qvbox.h> 12#include <qvbox.h>
13#include <qwhatsthis.h> 13#include <qwhatsthis.h>
14#include <qcombobox.h>
14 15
15 16
16#include <qpe/config.h> 17#include <qpe/config.h>
17#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
18 19
19#include "mediumwidget.h" 20#include "mediumwidget.h"
20 21
21 22
22 23
23using namespace MediumMountSetting; 24using namespace MediumMountSetting;
24 25
25/* TRANSLATOR MediumMountSetting::MediumMountWidget */ 26/* TRANSLATOR MediumMountSetting::MediumMountWidget */
@@ -98,33 +99,43 @@ void MediumMountWidget::initGUI()
98 m_checks->addColSpacing(1, 2 ); 99 m_checks->addColSpacing(1, 2 );
99 m_checks->setColStretch(1, -2 ); 100 m_checks->setColStretch(1, -2 );
100 101
101 connect(m_all, SIGNAL(stateChanged(int) ), 102 connect(m_all, SIGNAL(stateChanged(int) ),
102 this, SLOT(slotStateChanged() ) ); 103 this, SLOT(slotStateChanged() ) );
103 104
104 m_box->addWidget( m_group ); 105 m_box->addWidget( m_group );
105 106
106 // label 107 // label
107 m_lblPath = new QLabel(tr("Limit search to:"), this ); 108 m_lblPath = new QLabel(tr("Limit search to:"), this );
108 m_box->addWidget( m_lblPath ); 109 m_box->addWidget( m_lblPath );
109 110
110 // add to 111
112 m_subList = new QComboBox(FALSE,this,"docFolderList");
113 m_subList->setDuplicatesEnabled(FALSE);
114 m_subList->setEditable(TRUE);
115 m_box->addWidget(m_subList);
116
111 m_hboxAdd = new QHBox( this ); 117 m_hboxAdd = new QHBox( this );
112 //m_hboxAdd->setSpacing( 10 );
113 m_edit = new QLineEdit(m_hboxAdd );
114 m_add = new QPushButton(m_hboxAdd ); 118 m_add = new QPushButton(m_hboxAdd );
115 m_add->setText( tr("Add") ); 119 m_add->setText( tr("Add") );
120 m_del = new QPushButton(m_hboxAdd);
121 m_del->setText(tr("Remove"));
122
123 connect(m_add, SIGNAL(clicked() ),
124 this, SLOT(slotAdd() ) );
125 connect(m_del, SIGNAL(clicked() ),
126 this, SLOT(slotRemove() ) );
116 127
117 m_box->addWidget(m_hboxAdd ); 128 m_box->addWidget(m_hboxAdd );
118 129
119 m_always = new QCheckBox( tr("Always check this medium"), this ); 130 m_always = new QCheckBox( tr("Always check this medium"), this );
120 131
121 m_box->addWidget( m_always ); 132 m_box->addWidget( m_always );
122 133
123 QSpacerItem *item = new QSpacerItem(5, 50, 134 QSpacerItem *item = new QSpacerItem(5, 50,
124 QSizePolicy::Fixed, 135 QSizePolicy::Fixed,
125 QSizePolicy::Expanding ); 136 QSizePolicy::Expanding );
126 m_box->addItem(item ); 137 m_box->addItem(item );
127} 138}
128 139
129void MediumMountWidget::readConfig( ) 140void MediumMountWidget::readConfig( )
130{ 141{
@@ -145,48 +156,78 @@ void MediumMountWidget::readConfig( )
145 m_audio->setEnabled( true ); 156 m_audio->setEnabled( true );
146 m_image->setEnabled( true ); 157 m_image->setEnabled( true );
147 m_text->setEnabled ( true ); 158 m_text->setEnabled ( true );
148 m_all->setEnabled ( true ); 159 m_all->setEnabled ( true );
149 160
150 m_all->setChecked( false ); 161 m_all->setChecked( false );
151 162
152 m_audio->setChecked( m_config->readBoolEntry("audio", true ) ); 163 m_audio->setChecked( m_config->readBoolEntry("audio", true ) );
153 m_image->setChecked( m_config->readBoolEntry("image", true ) ); 164 m_image->setChecked( m_config->readBoolEntry("image", true ) );
154 m_text->setChecked ( m_config->readBoolEntry("text" , true ) ); 165 m_text->setChecked ( m_config->readBoolEntry("text" , true ) );
155 m_video->setChecked( m_config->readBoolEntry("video", true ) ); 166 m_video->setChecked( m_config->readBoolEntry("video", true ) );
156 }; 167 };
168 m_config->setGroup("subdirs");
169 QStringList entries = m_config->readListEntry("subdirs",':');
170 m_subList->clear();
171 m_subList->insertStringList(entries);
157} 172}
158 173
159void MediumMountWidget::writeConfig() 174void MediumMountWidget::writeConfig()
160{ 175{
161 m_config->setGroup("main"); 176 m_config->setGroup("main");
162 m_config->writeEntry("check", m_always->isChecked() ); 177 m_config->writeEntry("check", m_always->isChecked() );
163 178
164 m_config->setGroup("mimetypes" ); 179 m_config->setGroup("mimetypes" );
165 if(m_all->isChecked() ){ 180 if(m_all->isChecked() ){
166 m_config->writeEntry("all", true ); 181 m_config->writeEntry("all", true );
167 }else{ 182 }else{
168 m_config->writeEntry("audio", m_audio->isChecked() ); 183 m_config->writeEntry("audio", m_audio->isChecked() );
169 m_config->writeEntry("image", m_image->isChecked() ); 184 m_config->writeEntry("image", m_image->isChecked() );
170 m_config->writeEntry("text" , m_text->isChecked() ); 185 m_config->writeEntry("text" , m_text->isChecked() );
171 m_config->writeEntry("video", m_video->isChecked() ); 186 m_config->writeEntry("video", m_video->isChecked() );
172 } 187 }
188 m_config->setGroup("subdirs");
189 QStringList entries;
190 QString ctext;
191 for (int i = 0; i < m_subList->count();++i) {
192 ctext = m_subList->text(i);
193 if (ctext.isEmpty())
194 continue;
195 if (ctext.startsWith("/")&&ctext.length()>1) {
196 ctext = ctext.right(ctext.length()-1);
197 }
198 entries.append(ctext);
199 }
200 m_config->writeEntry("subdirs",entries,':');
173} 201}
174MediumMountWidget::~MediumMountWidget() 202MediumMountWidget::~MediumMountWidget()
175{ 203{
176 delete m_config; 204 delete m_config;
177} 205}
178 206
179void MediumMountWidget::slotAdd() 207void MediumMountWidget::slotAdd()
180{ 208{
209 if (m_subList->currentText()==m_subList->text(m_subList->currentItem()))
210 return;
211 m_subList->insertItem(m_subList->currentText());
212}
181 213
214void MediumMountWidget::slotRemove()
215{
216 QString text = m_subList->currentText();
217 if (text != m_subList->text(m_subList->currentItem())) {
218 m_subList->clearEdit ();
219 } else {
220 m_subList->removeItem(m_subList->currentItem());
221 }
182} 222}
223
183void MediumMountWidget::slotStateChanged() 224void MediumMountWidget::slotStateChanged()
184{ 225{
185 bool state = !(m_all->isChecked()); 226 bool state = !(m_all->isChecked());
186 227
187 m_audio->setEnabled( state ); 228 m_audio->setEnabled( state );
188 m_text->setEnabled ( state ); 229 m_text->setEnabled ( state );
189 m_video->setEnabled( state ); 230 m_video->setEnabled( state );
190 m_image->setEnabled( state ); 231 m_image->setEnabled( state );
191 232
192} 233}
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h
index 0f27117..28ae369 100644
--- a/noncore/settings/mediummount/mediumwidget.h
+++ b/noncore/settings/mediummount/mediumwidget.h
@@ -9,59 +9,62 @@
9class QLabel; 9class QLabel;
10class QPixmap; 10class QPixmap;
11class Config; 11class Config;
12class QGridLayout; 12class QGridLayout;
13class QCheckBox; 13class QCheckBox;
14class QPushButton; 14class QPushButton;
15class QVBoxLayout; 15class QVBoxLayout;
16class QHBoxLayout; 16class QHBoxLayout;
17class QGroupBox; 17class QGroupBox;
18class QVBox; 18class QVBox;
19class QHBox; 19class QHBox;
20class QLineEdit; 20class QLineEdit;
21class QComboBox;
21 22
22namespace MediumMountSetting { 23namespace MediumMountSetting {
23 24
24 class MediumMountWidget : public QWidget { 25 class MediumMountWidget : public QWidget {
25 Q_OBJECT 26 Q_OBJECT
26 public: 27 public:
27 MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); 28 MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 );
28 ~MediumMountWidget(); 29 ~MediumMountWidget();
29 30
30 31
31 void writeConfig(); 32 void writeConfig();
32 33
33 private slots: 34 private slots:
34 void slotAdd(); 35 void slotAdd();
36 void slotRemove();
35 void slotStateChanged(); 37 void slotStateChanged();
36 38
37 private: 39 private:
38 void readConfig(); 40 void readConfig();
39 void initGUI(); 41 void initGUI();
40 42
41 bool m_dirty : 1; 43 bool m_dirty : 1;
42 44
43 class MediumMountWidgetPrivate; 45 class MediumMountWidgetPrivate;
44 MediumMountWidgetPrivate *d; 46 MediumMountWidgetPrivate *d;
45 47
46 QString m_path; 48 QString m_path;
47 49
48 Config *m_config; 50 Config *m_config;
49 51
50 QHBox *m_infoBox; 52 QHBox *m_infoBox;
51 QLabel *m_label; 53 QLabel *m_label;
52 QLabel *m_desc; 54 QLabel *m_desc;
53 55
54 QLineEdit *m_edit;
55 QPushButton *m_add; 56 QPushButton *m_add;
57 QComboBox *m_subList;
58 QPushButton *m_del;
56 59
57 QVBoxLayout *m_box; 60 QVBoxLayout *m_box;
58 QGridLayout *m_checks; 61 QGridLayout *m_checks;
59 62
60 QGroupBox *m_group; 63 QGroupBox *m_group;
61 QCheckBox *m_all; 64 QCheckBox *m_all;
62 QCheckBox *m_audio; 65 QCheckBox *m_audio;
63 QCheckBox *m_image; 66 QCheckBox *m_image;
64 QCheckBox *m_text; 67 QCheckBox *m_text;
65 QCheckBox *m_video; 68 QCheckBox *m_video;
66 69
67 QCheckBox *m_always; 70 QCheckBox *m_always;