summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp10
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp2
-rw-r--r--core/applets/cardmon/cardmon.cpp4
-rw-r--r--core/applets/homeapplet/home.h0
-rw-r--r--core/applets/restartapplet2/.cvsignore1
-rw-r--r--core/applets/suspendapplet/suspend.h0
-rw-r--r--core/launcher/launcher.cpp158
-rw-r--r--core/obex/obex.cc13
-rw-r--r--core/obex/obexhandler.cpp2
-rw-r--r--core/obex/obeximpl.cpp2
-rw-r--r--core/obex/obexsend.cpp2
-rw-r--r--core/obex/receiver.cpp73
-rw-r--r--core/obex/receiver.h5
13 files changed, 130 insertions, 142 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 480d261..078ce8d 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -124,14 +124,4 @@ void BatteryMeter::paintEvent( QPaintEvent* )
p.setFont( f );
- if ( percent > 98 ) {
- p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "F" ) );
- }
- else if ( percent < 5 )
- {
- p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "E" ) );
- }
- else
- {
p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
- }
return;
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 092a48d..5936b5d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -242,3 +242,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
- int jackPerc = ( jackPercent / 100.0 ) * screenWidth - 47;
+ int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index b8c4553..4ed09b8 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -274,3 +274,5 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
}
+#ifndef QT_NO_SOUND
QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
}
@@ -326,3 +328,5 @@ bool CardMonitor::getStatusSd(int showPopUp)
//qDebug("TEXT: " + text );
+#ifndef QT_NO_SOUND
QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
popUp(text, "cardmon/ide"); // XX add SD pic
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 64af97d..1186caf 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
diff --git a/core/applets/restartapplet2/.cvsignore b/core/applets/restartapplet2/.cvsignore
index a403d26..4943911 100644
--- a/core/applets/restartapplet2/.cvsignore
+++ b/core/applets/restartapplet2/.cvsignore
@@ -6,2 +6 @@ moc_*
opieobjconfig.in
-opieobj
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 0c92bcb..75467c1 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0205622..8b2907a 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -24,4 +24,2 @@
-//#include <opie/ofiledialog.h>
-#include <opie/ofileselector.h>
#include <qpe/qcopenvelope_qws.h>
@@ -167,31 +165,31 @@ void CategoryTabWidget::addItem( const QString& linkfile )
{
-// int i=0;
-// AppLnk *app = new AppLnk(linkfile);
-// if ( !app->isValid() ) {
-// delete app;
-// app=0;
-// }
-// if ( !app || !app->file().isEmpty() ) {
+ int i=0;
+ AppLnk *app = new AppLnk(linkfile);
+ if ( !app->isValid() ) {
+ delete app;
+ app=0;
+ }
+ if ( !app || !app->file().isEmpty() ) {
// A document
-// delete app;
-// app = new DocLnk(linkfile);
-// if ( app->fileKnown() ) {
-// ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
-// } else {
-// ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
-// delete app;
-// }
-// return;
-// }
+ delete app;
+ app = new DocLnk(linkfile);
+ if ( app->fileKnown() ) {
+ ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
+ } else {
+ ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
+ delete app;
+ }
+ return;
+ }
// An application
-// for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
-// if ( !(*it).isEmpty() ) {
-// QRegExp tf(*it,FALSE,TRUE);
-// if ( tf.match(app->type()) >= 0 ) {
-// ((LauncherView*)stack->widget(i))->addItem(app);
-// return;
-// }
-// i++;
- // }
- // }
+ for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
+ if ( !(*it).isEmpty() ) {
+ QRegExp tf(*it,FALSE,TRUE);
+ if ( tf.match(app->type()) >= 0 ) {
+ ((LauncherView*)stack->widget(i))->addItem(app);
+ return;
+ }
+ i++;
+ }
+ }
@@ -201,3 +199,3 @@ void CategoryTabWidget::addItem( const QString& linkfile )
void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
+ AppLnkSet* docFolder, const QList<FileSystem> &fs)
{
@@ -255,19 +253,9 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
-
- //ljpotter
- CategoryTab *catTab ;
- catTab = new CategoryTab( pm, "Documents" );
-
- categoryBar->addTab( catTab );
-
- fileSel = new DocumentTab( stack, 4, 0, "/","");
- stack->addWidget( fileSel, tabs++ );
-
- // fileSel->hide();
-
- connect( fileSel, SIGNAL( fileSelected( const DocLnk & )),
- this, SLOT(clickie(const DocLnk&)) );
-
-// connect( fileSel, SIGNAL( fileSelected( const QString & )),
-// this, SLOT(clickie(const QString&)) );
+ docview = newView( "Documents", // No tr
+ pm, tr("Documents"));
+ docview->populate( docFolder, QString::null );
+ docFolder->detachChildren();
+ docview->setFileSystems(fs);
+ docview->setToolsEnabled(TRUE);
+ setTabAppearance( "Documents", cfg ); // No tr
@@ -287,3 +275,2 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
-
QCopEnvelope e("QPE/TaskBar","reloadApps()");
@@ -291,12 +278,2 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
-void CategoryTabWidget::clickie(const DocLnk &lnk) {
- lnk.execute();
- // fileSel->reparse();
-}
-
-void CategoryTabWidget::clickie(const QString &appStr) {
-// DocLnk lnk(appStr);
-// lnk.execute();
-}
-
void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
@@ -343,6 +320,9 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
-//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
-//{
- // docFolder->detachChildren();
-//}
+void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs)
+{
+ docview->populate( docFolder, QString::null );
+ docFolder->detachChildren();
+ docview->setFileSystems(fs);
+ docview->updateTools();
+}
@@ -365,3 +345,3 @@ QString CategoryTabWidget::getAllDocLinkInfo() const
{
- return "";
+ return docview->getAllDocLinkInfo();
}
@@ -383,10 +363,11 @@ void CategoryTabWidget::updateLink(const QString& linkfile)
{
- // LauncherView* view;
- qApp->processEvents();
-// while ((view = (LauncherView*)stack->widget(i++))) {
-// if ( view->removeLink(linkfile) )
-// break;
-// }
- // addItem(linkfile);
- fileSel->reparse();
+ int i=0;
+ LauncherView* view;
+ //qApp->processEvents();
+ while ((view = (LauncherView*)stack->widget(i++))) {
+ if ( view->removeLink(linkfile) )
+ break;
+ }
+ addItem(linkfile);
+ docview->updateTools();
}
@@ -408,3 +389,3 @@ void CategoryTabWidget::setBusy(bool on)
else
- for (int i=0; i<tabs-1; i++)
+ for (int i=0; i<tabs; i++)
((LauncherView*)stack->widget(i))->setBusy(FALSE);
@@ -669,3 +650,2 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
-
#if !defined(QT_NO_COP)
@@ -754,2 +734,3 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
{
+
OWait *owait = new OWait();
@@ -759,4 +740,6 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
qApp->processEvents();
- if(docsFolder) delete docsFolder;
+
+ delete docsFolder;
docsFolder = new DocLnkSet;
+
DocLnkSet *tmp = 0;
@@ -783,7 +766,5 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
// a) -zecke we don't want to check
- if(!mediumCfg.readBoolEntry("use", true ) ) {
- owait->hide();
- delete owait;
+ if(!mediumCfg.readBoolEntry("use", true ) )
return;
- }
+
// find out wich filesystems are new in this round
@@ -806,4 +787,2 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
} // done
- owait->hide();
- delete owait;
return; // save the else
@@ -871,2 +850,3 @@ void Launcher::updateTabs()
MimeType::updateApplications(); // ### reads all applnks twice
+
delete rootFolder;
@@ -882,3 +862,3 @@ void Launcher::updateDocs()
loadDocs();
- // tabs->updateDocs(docsFolder,storage->fileSystems());
+ tabs->updateDocs(docsFolder,storage->fileSystems());
}
@@ -1339,17 +1319 @@ void Launcher::preloadApps()
}
-
-DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
- : OFileSelector(parent,mode,selector,dirName,fileName)
-{
- setYesCancelVisible(false);
- setToolbarVisible(false);
- setPermissionBarVisible(false);
- setLineEditVisible(false) ;
- //setChooserVisible( bool chooser );
-
-}
-
-DocumentTab::~DocumentTab() {
-
-}
-
diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 595fed9..2a306de 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -13,2 +13,4 @@ using namespace OpieObex;
+/* TRANSLATOR OpieObex::Obex */
+
Obex::Obex( QObject *parent, const char* name )
@@ -111,6 +113,2 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){
if ( proc == m_rec ) { // only receive
- for (int i = 0; i < len; i++ ) {
- printf("%c", buf[i] );
- }
- printf("\n");
QByteArray ar( len );
@@ -127,9 +125,2 @@ void Obex::received() {
qWarning("ACHTUNG %s", filename.latin1() );
- if (filename.contains( 'ö' ) || filename.contains( 'ä' ) || filename.contains('ü' ) ) {
- qWarning("renaming!!!!");
- QFileInfo inf( filename );
- QString newName = "/tmp/opie-obex." + inf.extension();
- ::rename( QFile::encodeName( filename ).data(), newName );
- qWarning("name is %s", QFile::encodeName( filename ).data() );
- }
emit receivedFile( filename );
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 6509d12..5aaf63c 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -10,2 +10,4 @@ using namespace OpieObex;
+/* TRANSLATOR OpieObex::ObexHandler */
+
ObexHandler::ObexHandler() {
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 12a078f..5bfc779 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -5,2 +5,4 @@ using namespace OpieObex;
+/* TRANSLATOR OpieObex::ObexImpl */
+
ObexImpl::ObexImpl() {
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 2931cf7..cf5d958 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -17,2 +17,4 @@ using namespace OpieObex;
+/* TRANSLATOR OpieObex::SendWidget */
+
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index 31c6afe..bf9e30c 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -3,2 +3,3 @@
#include <sys/mman.h>
+#include <stdlib.h> // int system
#include <unistd.h>
@@ -11,2 +12,3 @@
#include <qhbox.h>
+#include <qregexp.h>
#include <qtextview.h>
@@ -17,2 +19,3 @@
#include <qpe/qcopenvelope_qws.h>
+#include <qpe/global.h>
@@ -23,2 +26,4 @@ using namespace OpieObex;
+/* TRANSLATOR OpieObex::Receiver */
+
Receiver::Receiver() {
@@ -33,3 +38,4 @@ Receiver::~Receiver() {
}
-void Receiver::slotReceived( const QString& file ) {
+void Receiver::slotReceived( const QString& _file ) {
+ QString file = _file;
int check = checkFile(file);
@@ -61,9 +67,33 @@ void Receiver::handleOther( const QString& other ) {
}
-int Receiver::checkFile( const QString& file ) {
+void Receiver::tidyUp( QString& _file, const QString& ending) {
+ /* libversit fails on BASE64 encoding we try to sed it away */
+ QString file = _file;
+ char foo[24]; // big enough
+ (void)::strcpy(foo, "/tmp/opie-XXXXXX");
+
+ int fd = ::mkstemp(foo);
+
+ if ( fd == -1 )
+ return;
+
+ (void)::strncat( foo, ending.latin1(), 4 );
+ _file = QString::fromLatin1( foo );
+ QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) );
+ qWarning("Executing: %s", cmd.latin1() );
+ (void)::system( cmd.latin1() );
+
+ cmd = QString("rm %1").arg( Global::shellQuote(file) );
+ (void)::system( cmd.latin1() );
+}
+int Receiver::checkFile( QString& file ) {
qWarning("check file!! %s", file.latin1() );
int ret;
+ QString ending;
+
if (file.right(4) == ".vcs" ) {
ret = Datebook;
+ ending = QString::fromLatin1(".vcs");
}else if ( file.right(4) == ".vcf") {
ret = AddressBook;
+ ending = QString::fromLatin1(".vcf");
}else
@@ -72,2 +102,13 @@ int Receiver::checkFile( const QString& file ) {
+ if (ending.isEmpty() )
+ return ret;
+
+ /**
+ * currently the parser is broken in regard of BASE64 encoding
+ * and M$ likes to send that. So we will executed a small
+ * tidy up system sed script
+ * At this point we can also remove umlaute from the filename
+ */
+ tidyUp( file, ending );
+
qWarning("check it now %d", ret );
@@ -76,2 +117,4 @@ int Receiver::checkFile( const QString& file ) {
+/* TRANSLATOR OpieObex::OtherHandler */
+
OtherHandler::OtherHandler()
@@ -135,2 +178,6 @@ QString OtherHandler::targetName( const QString& file ) {
QFileInfo info( file );
+
+ /* $HOME needs to be set!!!! */
+ Global::createDocDir();
+
QString newFile = QPEApplication::documentDir()+ "/"+ info.baseName();
@@ -151,21 +198,5 @@ void OtherHandler::copy(const QString& src, const QString& file) {
qWarning("src %s, dest %s", src.latin1(),file.latin1() );
- int src_fd = ::open( QFile::encodeName( src ), O_RDONLY );
- int to_fd = ::open( QFile::encodeName( file), O_RDWR| O_CREAT| O_TRUNC,
- S_IRUSR, S_IWUSR, S_IRGRP, S_IRGRP );
-
- struct stat stater;
- ::fstat(src_fd, &stater );
- ::lseek(to_fd, stater.st_size-1, SEEK_SET );
- ::write(to_fd, "", 1 );
-
- void *src_addr, *dest_addr;
- src_addr = ::mmap(0, stater.st_size, PROT_READ,
- MAP_FILE | MAP_SHARED, src_fd, 0 );
- dest_addr= ::mmap(0, stater.st_size, PROT_READ | PROT_WRITE,
- MAP_FILE | MAP_PRIVATE, to_fd, 0 );
-
- ::memcpy(dest_addr , src_addr, stater.st_size );
- ::munmap(src_addr , stater.st_size );
- ::munmap(dest_addr, stater.st_size );
-
+ QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )).
+ arg( Global::shellQuote( file ) );
+ ::system( cmd.latin1() );
// done
diff --git a/core/obex/receiver.h b/core/obex/receiver.h
index 5b20146..e1d54df 100644
--- a/core/obex/receiver.h
+++ b/core/obex/receiver.h
@@ -23,5 +23,8 @@ namespace OpieObex {
void handleOther(const QString& );
- int checkFile( const QString& file );
+ /* will alter the file name */
+ int checkFile( QString& file );
bool testDateTodo(const QString& file);
bool testAddressbook(const QString& file);
+ /* called by checkFile */
+ void tidyUp( QString& file, const QString& ending );