summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-24 14:29:33 (UTC)
committer mickeyl <mickeyl>2004-02-24 14:29:33 (UTC)
commitb044a19bc3ea1983989c81e2743a3590fab85bae (patch) (side-by-side diff)
tree739825bedb3c86009457aac15a0a87f2c699d391
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 (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
@@ -64,4 +64,9 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
vbox->add( d );
+ // hide custom rotation feature for now, need a new implementation to fit quicklauch,
+ // is confusing for the user and doubtable useful since life rotation
+ d->rotate->hide();
+ d->rotateButtons->hide();
+
d->docname->setText(l->name());
QString inf;
@@ -116,5 +121,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
if ( !l->property("Rotation"). isEmpty ()) {
d->rotate->setChecked ( true );
- d->rotateButtons->setButton((l->rotation().toInt()%360)/90);
+ //don't use rotate buttons for now (see comment above)
+ //d->rotateButtons->setButton((l->rotation().toInt()%360)/90);
}
else {
@@ -169,8 +175,9 @@ void LnkProperties::setupLocations()
(*it)->disk() == "/dev/mtdblock/1" ||
(*it)->disk().left(13) == "/dev/mtdblock" ||
- (*it)->disk() == "/dev/mtdblock6" ||
+ (*it)->disk() == "/dev/mtdblock6" ||
+ (*it )->disk() == "/dev/root" ||
(*it)->disk() == "tmpfs" ) {
d->locationCombo->insertItem( (*it)->name(), index );
- locations.append( ( ((*it)->isRemovable() ||
+ locations.append( ( ((*it)->isRemovable() ||
(*it)->disk() == "/dev/mtdblock6" ||
(*it)->disk() == "tmpfs" )
@@ -276,5 +283,5 @@ void LnkProperties::done(int ok)
bool changed=FALSE;
bool reloadMime=FALSE;
-
+
if ( lnk->name() != d->docname->text() ) {
lnk->setName(d->docname->text());
@@ -290,5 +297,5 @@ void LnkProperties::done(int ok)
if ( !d->rotate->isHidden()) {
QString newrot;
-
+
if ( d->rotate->isChecked() ) {
int rot=0;
@@ -310,5 +317,5 @@ void LnkProperties::done(int ok)
lnk->writeLink();
}
-
+
if ( !d->preload->isHidden() ) {
Config cfg("Launcher");