author | mickeyl <mickeyl> | 2004-02-24 14:29:33 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-24 14:29:33 (UTC) |
commit | b044a19bc3ea1983989c81e2743a3590fab85bae (patch) (unidiff) | |
tree | 739825bedb3c86009457aac15a0a87f2c699d391 /library/lnkproperties.cpp | |
parent | 5548f96b149e8416dd65661f9cc85ba8e434e0e5 (diff) | |
download | opie-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
-rw-r--r-- | library/lnkproperties.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp index 50cf5af..8dca4ab 100644 --- a/library/lnkproperties.cpp +++ b/library/lnkproperties.cpp | |||
@@ -60,12 +60,17 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | |||
60 | setCaption( tr("Properties") ); | 60 | setCaption( tr("Properties") ); |
61 | 61 | ||
62 | QVBoxLayout *vbox = new QVBoxLayout( this ); | 62 | QVBoxLayout *vbox = new QVBoxLayout( this ); |
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() ) { |
69 | d->type->hide(); | 74 | d->type->hide(); |
70 | d->typeLabel->hide(); | 75 | d->typeLabel->hide(); |
71 | } else { | 76 | } else { |
@@ -112,13 +117,14 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | |||
112 | d->docname->setReadOnly( TRUE ); | 117 | d->docname->setReadOnly( TRUE ); |
113 | 118 | ||
114 | if ( l->property("CanFastload") == "0" ) | 119 | if ( l->property("CanFastload") == "0" ) |
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); |
122 | } | 128 | } |
123 | 129 | ||
124 | Config cfg("Launcher"); | 130 | Config cfg("Launcher"); |
@@ -166,12 +172,13 @@ void LnkProperties::setupLocations() | |||
166 | if ( (ulong)(*it)->availBlocks() * (ulong)(*it)->blockSize() > (ulong)fileSize + 10000 ) { | 172 | if ( (ulong)(*it)->availBlocks() * (ulong)(*it)->blockSize() > (ulong)fileSize + 10000 ) { |
167 | if ( (*it)->isRemovable() || | 173 | if ( (*it)->isRemovable() || |
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) ); |