author | harlekin <harlekin> | 2002-02-23 21:35:06 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-23 21:35:06 (UTC) |
commit | 9f9006e0257e3d4c5d66331a7d6061c8a5da164b (patch) (unidiff) | |
tree | 7919a33f366cd63b2a1769d42047568d31121a12 | |
parent | c200950a2b120b015783f1552fd68c355bcc3185 (diff) | |
download | opie-9f9006e0257e3d4c5d66331a7d6061c8a5da164b.zip opie-9f9006e0257e3d4c5d66331a7d6061c8a5da164b.tar.gz opie-9f9006e0257e3d4c5d66331a7d6061c8a5da164b.tar.bz2 |
changes property dialog in documents; now it is possible to delete only the icon not also the file
-rw-r--r-- | library/lnkproperties.cpp | 23 | ||||
-rw-r--r-- | library/lnkproperties.h | 13 | ||||
-rw-r--r-- | library/lnkpropertiesbase_p.ui | 17 |
3 files changed, 52 insertions, 1 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp index e278cb2..abd430c 100644 --- a/library/lnkproperties.cpp +++ b/library/lnkproperties.cpp | |||
@@ -15,12 +15,16 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT | ||
22 | // have this class. | ||
23 | #define QTOPIA_INTERNAL_FSLP | ||
24 | #include "lnkproperties.h" | ||
21 | #include "lnkproperties.h" | 25 | #include "lnkproperties.h" |
22 | #include "lnkpropertiesbase_p.h" | 26 | #include "lnkpropertiesbase_p.h" |
23 | #include "ir.h" | 27 | #include "ir.h" |
24 | 28 | ||
25 | #include <qpe/applnk.h> | 29 | #include <qpe/applnk.h> |
26 | #include <qpe/global.h> | 30 | #include <qpe/global.h> |
@@ -71,13 +75,14 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | |||
71 | } | 75 | } |
72 | 76 | ||
73 | connect(d->beam,SIGNAL(clicked()),this,SLOT(beamLnk())); | 77 | connect(d->beam,SIGNAL(clicked()),this,SLOT(beamLnk())); |
74 | if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed) | 78 | if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed) |
75 | connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk())); | 79 | connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk())); |
76 | connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk())); | 80 | connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk())); |
77 | 81 | connect(d->delicon,SIGNAL(clicked()),this,SLOT(unlinkIcon())); | |
82 | |||
78 | d->docname->setReadOnly( FALSE ); | 83 | d->docname->setReadOnly( FALSE ); |
79 | d->preload->hide(); | 84 | d->preload->hide(); |
80 | d->spacer->hide(); | 85 | d->spacer->hide(); |
81 | 86 | ||
82 | // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT | 87 | // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT |
83 | d->categoryEdit->kludge(); | 88 | d->categoryEdit->kludge(); |
@@ -127,12 +132,28 @@ void LnkProperties::unlinkLnk() | |||
127 | } else { | 132 | } else { |
128 | reject(); | 133 | reject(); |
129 | } | 134 | } |
130 | } | 135 | } |
131 | } | 136 | } |
132 | 137 | ||
138 | |||
139 | /* | ||
140 | * remove only the link from documents, not also the file | ||
141 | */ | ||
142 | void LnkProperties::unlinkIcon() | ||
143 | { | ||
144 | if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { | ||
145 | lnk->removeLinkFile(); | ||
146 | if ( QFile::exists(lnk->linkFile()) ) { | ||
147 | QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); | ||
148 | } else { | ||
149 | reject(); | ||
150 | } | ||
151 | } | ||
152 | } | ||
153 | |||
133 | void LnkProperties::setupLocations() | 154 | void LnkProperties::setupLocations() |
134 | { | 155 | { |
135 | QFileInfo fi( lnk->file() ); | 156 | QFileInfo fi( lnk->file() ); |
136 | fileSize = fi.size(); | 157 | fileSize = fi.size(); |
137 | StorageInfo storage; | 158 | StorageInfo storage; |
138 | const QList<FileSystem> &fs = storage.fileSystems(); | 159 | const QList<FileSystem> &fs = storage.fileSystems(); |
diff --git a/library/lnkproperties.h b/library/lnkproperties.h index 501692e..38da5b2 100644 --- a/library/lnkproperties.h +++ b/library/lnkproperties.h | |||
@@ -14,12 +14,20 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
21 | |||
22 | // | ||
23 | // DO NOT ATTEMPT TO USE THIS CLASS | ||
24 | // | ||
25 | |||
26 | |||
27 | |||
20 | #ifndef LNKPROPERTIES_H | 28 | #ifndef LNKPROPERTIES_H |
21 | #define LNKPROPERTIES_H | 29 | #define LNKPROPERTIES_H |
22 | #include <qstringlist.h> | 30 | #include <qstringlist.h> |
23 | #include <qdialog.h> | 31 | #include <qdialog.h> |
24 | 32 | ||
25 | class AppLnk; | 33 | class AppLnk; |
@@ -30,19 +38,24 @@ class LnkPropertiesBase; | |||
30 | 38 | ||
31 | class LnkProperties : public QDialog | 39 | class LnkProperties : public QDialog |
32 | { | 40 | { |
33 | Q_OBJECT | 41 | Q_OBJECT |
34 | 42 | ||
35 | public: | 43 | public: |
44 | // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT | ||
45 | // have this class. | ||
46 | #ifdef QTOPIA_INTERNAL_FSLP | ||
36 | LnkProperties( AppLnk* lnk, QWidget* parent = 0 ); | 47 | LnkProperties( AppLnk* lnk, QWidget* parent = 0 ); |
37 | ~LnkProperties(); | 48 | ~LnkProperties(); |
49 | #endif | ||
38 | 50 | ||
39 | void done(int); | 51 | void done(int); |
40 | private slots: | 52 | private slots: |
41 | void beamLnk(); | 53 | void beamLnk(); |
42 | void unlinkLnk(); | 54 | void unlinkLnk(); |
55 | void unlinkIcon(); | ||
43 | void duplicateLnk(); | 56 | void duplicateLnk(); |
44 | 57 | ||
45 | signals: | 58 | signals: |
46 | void select(const AppLnk *); | 59 | void select(const AppLnk *); |
47 | 60 | ||
48 | private: | 61 | private: |
diff --git a/library/lnkpropertiesbase_p.ui b/library/lnkpropertiesbase_p.ui index d99b228..3d35bca 100644 --- a/library/lnkpropertiesbase_p.ui +++ b/library/lnkpropertiesbase_p.ui | |||
@@ -325,12 +325,29 @@ | |||
325 | </property> | 325 | </property> |
326 | <property stdset="1"> | 326 | <property stdset="1"> |
327 | <name>autoDefault</name> | 327 | <name>autoDefault</name> |
328 | <bool>false</bool> | 328 | <bool>false</bool> |
329 | </property> | 329 | </property> |
330 | </widget> | 330 | </widget> |
331 | |||
332 | <widget> | ||
333 | <class>QPushButton</class> | ||
334 | <property stdset="1"> | ||
335 | <name>name</name> | ||
336 | <cstring>delicon</cstring> | ||
337 | </property> | ||
338 | <property stdset="1"> | ||
339 | <name>text</name> | ||
340 | <string>Del Icon</string> | ||
341 | </property> | ||
342 | <property stdset="1"> | ||
343 | <name>autoDefault</name> | ||
344 | <bool>false</bool> | ||
345 | </property> | ||
346 | </widget> | ||
347 | |||
331 | <widget> | 348 | <widget> |
332 | <class>QPushButton</class> | 349 | <class>QPushButton</class> |
333 | <property stdset="1"> | 350 | <property stdset="1"> |
334 | <name>name</name> | 351 | <name>name</name> |
335 | <cstring>duplicate</cstring> | 352 | <cstring>duplicate</cstring> |
336 | </property> | 353 | </property> |