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 | |
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 | |||
@@ -54,24 +54,29 @@ | |||
54 | 54 | ||
55 | #include <stdlib.h> | 55 | #include <stdlib.h> |
56 | 56 | ||
57 | LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | 57 | LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) |
58 | : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 ) | 58 | : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 ) |
59 | { | 59 | { |
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 { |
72 | d->type->setText( l->type() ); | 77 | d->type->setText( l->type() ); |
73 | } | 78 | } |
74 | 79 | ||
75 | if ( l->comment().isEmpty() ) { | 80 | if ( l->comment().isEmpty() ) { |
76 | d->comment->hide(); | 81 | d->comment->hide(); |
77 | d->commentLabel->hide(); | 82 | d->commentLabel->hide(); |
@@ -106,25 +111,26 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | |||
106 | d->locationCombo->hide(); | 111 | d->locationCombo->hide(); |
107 | 112 | ||
108 | // Can't edit categories, since the app .desktop files are global, | 113 | // Can't edit categories, since the app .desktop files are global, |
109 | // possibly read-only. | 114 | // possibly read-only. |
110 | d->categoryEdit->hide(); | 115 | d->categoryEdit->hide(); |
111 | 116 | ||
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"); |
125 | cfg.setGroup("Preload"); | 131 | cfg.setGroup("Preload"); |
126 | QStringList apps = cfg.readListEntry("Apps",','); | 132 | QStringList apps = cfg.readListEntry("Apps",','); |
127 | d->preload->setChecked( apps.contains(l->exec()) ); | 133 | d->preload->setChecked( apps.contains(l->exec()) ); |
128 | if ( Global::isBuiltinCommand(lnk->exec()) ) | 134 | if ( Global::isBuiltinCommand(lnk->exec()) ) |
129 | d->preload->hide(); // builtins are always fast | 135 | d->preload->hide(); // builtins are always fast |
130 | 136 | ||
@@ -160,24 +166,25 @@ void LnkProperties::setupLocations() | |||
160 | QString hardDiskHome; | 166 | QString hardDiskHome; |
161 | QString hardDiskPath; | 167 | QString hardDiskPath; |
162 | int index = 0; | 168 | int index = 0; |
163 | currentLocation = -1; | 169 | currentLocation = -1; |
164 | for ( ; it.current(); ++it ) { | 170 | for ( ; it.current(); ++it ) { |
165 | // we add 10k to the file size so we are sure we can also save the desktop file | 171 | // we add 10k to the file size so we are sure we can also save the desktop file |
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) ); |
178 | if ( lnk->file().contains( (*it)->path() ) ) { | 185 | if ( lnk->file().contains( (*it)->path() ) ) { |
179 | d->locationCombo->setCurrentItem( index ); | 186 | d->locationCombo->setCurrentItem( index ); |
180 | currentLocation = index; | 187 | currentLocation = index; |
181 | } | 188 | } |
182 | index++; | 189 | index++; |
183 | } else if ( (*it)->name().contains( tr("Hard Disk") ) && | 190 | } else if ( (*it)->name().contains( tr("Hard Disk") ) && |