summaryrefslogtreecommitdiff
path: root/library/lnkproperties.cpp
authormickeyl <mickeyl>2004-02-24 14:29:33 (UTC)
committer mickeyl <mickeyl>2004-02-24 14:29:33 (UTC)
commitb044a19bc3ea1983989c81e2743a3590fab85bae (patch) (unidiff)
tree739825bedb3c86009457aac15a0a87f2c699d391 /library/lnkproperties.cpp
parent5548f96b149e8416dd65661f9cc85ba8e434e0e5 (diff)
downloadopie-b044a19bc3ea1983989c81e2743a3590fab85bae.zip
opie-b044a19bc3ea1983989c81e2743a3590fab85bae.tar.gz
opie-b044a19bc3ea1983989c81e2743a3590fab85bae.tar.bz2
add missing patch from v1_0_3 disabling fixed custom rotation in favour of live rotation
Diffstat (limited to 'library/lnkproperties.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/lnkproperties.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index 50cf5af..8dca4ab 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -63,6 +63,11 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
63 d = new LnkPropertiesBase( this ); 63 d = new LnkPropertiesBase( this );
64 vbox->add( d ); 64 vbox->add( d );
65 65
66 // hide custom rotation feature for now, need a new implementation to fit quicklauch,
67 // is confusing for the user and doubtable useful since life rotation
68 d->rotate->hide();
69 d->rotateButtons->hide();
70
66 d->docname->setText(l->name()); 71 d->docname->setText(l->name());
67 QString inf; 72 QString inf;
68 if ( l->type().isEmpty() ) { 73 if ( l->type().isEmpty() ) {
@@ -115,7 +120,8 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
115 d->preload->hide(); 120 d->preload->hide();
116 if ( !l->property("Rotation"). isEmpty ()) { 121 if ( !l->property("Rotation"). isEmpty ()) {
117 d->rotate->setChecked ( true ); 122 d->rotate->setChecked ( true );
118 d->rotateButtons->setButton((l->rotation().toInt()%360)/90); 123 //don't use rotate buttons for now (see comment above)
124 //d->rotateButtons->setButton((l->rotation().toInt()%360)/90);
119 } 125 }
120 else { 126 else {
121 d->rotateButtons->setEnabled(false); 127 d->rotateButtons->setEnabled(false);
@@ -168,10 +174,11 @@ void LnkProperties::setupLocations()
168 (*it)->disk() == "/dev/mtdblock1" || 174 (*it)->disk() == "/dev/mtdblock1" ||
169 (*it)->disk() == "/dev/mtdblock/1" || 175 (*it)->disk() == "/dev/mtdblock/1" ||
170 (*it)->disk().left(13) == "/dev/mtdblock" || 176 (*it)->disk().left(13) == "/dev/mtdblock" ||
171 (*it)->disk() == "/dev/mtdblock6" || 177 (*it)->disk() == "/dev/mtdblock6" ||
178 (*it )->disk() == "/dev/root" ||
172 (*it)->disk() == "tmpfs" ) { 179 (*it)->disk() == "tmpfs" ) {
173 d->locationCombo->insertItem( (*it)->name(), index ); 180 d->locationCombo->insertItem( (*it)->name(), index );
174 locations.append( ( ((*it)->isRemovable() || 181 locations.append( ( ((*it)->isRemovable() ||
175 (*it)->disk() == "/dev/mtdblock6" || 182 (*it)->disk() == "/dev/mtdblock6" ||
176 (*it)->disk() == "tmpfs" ) 183 (*it)->disk() == "tmpfs" )
177 ? (*it)->path() : homeDir) ); 184 ? (*it)->path() : homeDir) );
@@ -275,7 +282,7 @@ void LnkProperties::done(int ok)
275 if ( ok ) { 282 if ( ok ) {
276 bool changed=FALSE; 283 bool changed=FALSE;
277 bool reloadMime=FALSE; 284 bool reloadMime=FALSE;
278 285
279 if ( lnk->name() != d->docname->text() ) { 286 if ( lnk->name() != d->docname->text() ) {
280 lnk->setName(d->docname->text()); 287 lnk->setName(d->docname->text());
281 changed=TRUE; 288 changed=TRUE;
@@ -289,7 +296,7 @@ void LnkProperties::done(int ok)
289 } 296 }
290 if ( !d->rotate->isHidden()) { 297 if ( !d->rotate->isHidden()) {
291 QString newrot; 298 QString newrot;
292 299
293 if ( d->rotate->isChecked() ) { 300 if ( d->rotate->isChecked() ) {
294 int rot=0; 301 int rot=0;
295 for(; rot<4; rot++) { 302 for(; rot<4; rot++) {
@@ -309,7 +316,7 @@ void LnkProperties::done(int ok)
309 } else if ( changed ) { 316 } else if ( changed ) {
310 lnk->writeLink(); 317 lnk->writeLink();
311 } 318 }
312 319
313 if ( !d->preload->isHidden() ) { 320 if ( !d->preload->isHidden() ) {
314 Config cfg("Launcher"); 321 Config cfg("Launcher");
315 cfg.setGroup("Preload"); 322 cfg.setGroup("Preload");