summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-08-09 17:38:23 (UTC)
committer kergoth <kergoth>2003-08-09 17:38:23 (UTC)
commitec14206f63dd93e9fb84c76cbc76fc1968637590 (patch) (side-by-side diff)
treea42b2a348677476b622c01aeef631b446eb4b0b7
parenta0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93 (diff)
downloadopie-ec14206f63dd93e9fb84c76cbc76fc1968637590.zip
opie-ec14206f63dd93e9fb84c76cbc76fc1968637590.tar.gz
opie-ec14206f63dd93e9fb84c76cbc76fc1968637590.tar.bz2
Merge from BRANCH_1_0
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcher.cpp158
1 files changed, 97 insertions, 61 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 8b2907a..0205622 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,56 +1,58 @@
/**********************************************************************
** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
** This file is part of the Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
// have this class.
#define QTOPIA_INTERNAL_FSLP
+//#include <opie/ofiledialog.h>
+#include <opie/ofileselector.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
#include <qpe/applnk.h>
#include <qpe/config.h>
#include <qpe/global.h>
#include <qpe/qpeapplication.h>
#include <qpe/mimetype.h>
#include <qpe/storage.h>
#include <qpe/palmtoprecord.h>
#include <qpe/version.h>
#include <qdir.h>
#ifdef QWS
#include <qwindowsystem_qws.h>
#endif
#include <qtimer.h>
#include <qcombobox.h>
#include <qvbox.h>
#include <qlayout.h>
#include <qstyle.h>
#include <qpushbutton.h>
#include <qtabbar.h>
#include <qwidgetstack.h>
#include <qlayout.h>
#include <qregexp.h>
#include <qmessagebox.h>
#include <qframe.h>
#include <qpainter.h>
#include <qlabel.h>
#include <qtextstream.h>
#include <qpopupmenu.h>
@@ -134,289 +136,306 @@ CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
}
void CategoryTabWidget::prevTab()
{
if ( categoryBar ) {
int n = categoryBar->count();
int tab = categoryBar->currentTab();
if ( tab >= 0 )
categoryBar->setCurrentTab( (tab - 1 + n)%n );
}
}
void CategoryTabWidget::nextTab()
{
if ( categoryBar ) {
int n = categoryBar->count();
int tab = categoryBar->currentTab();
categoryBar->setCurrentTab( (tab + 1)%n );
}
}
void CategoryTabWidget::showTab(const QString& id)
{
if ( categoryBar ) {
int idx = ids.findIndex( id );
categoryBar->setCurrentTab( idx );
}
}
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++;
+ // }
+ // }
QCopEnvelope e("QPE/TaskBar","reloadApps()");
}
void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* docFolder, const QList<FileSystem> &fs)
+ AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
{
QString current;
if ( categoryBar ) {
int c = categoryBar->currentTab();
if ( c >= 0 ) current = ids[c];
}
delete categoryBar;
categoryBar = new CategoryTabBar( this );
QPalette pal = categoryBar->palette();
pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
categoryBar->setPalette( pal );
delete stack;
stack = new QWidgetStack(this);
tabs=0;
ids.clear();
Config cfg("Launcher");
QStringList types = rootFolder->types();
for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
if ( !(*it).isEmpty() ) {
(void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
setTabAppearance( *it, cfg );
}
}
QListIterator<AppLnk> it( rootFolder->children() );
AppLnk* l;
while ( (l=it.current()) ) {
if ( l->type() == "Separator" ) { // No tr
rootFolder->remove(l);
delete l;
} else {
int i=0;
for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
if ( *it == l->type() )
((LauncherView*)stack->widget(i))->addItem(l,FALSE);
i++;
}
}
++it;
}
rootFolder->detachChildren();
for (int i=0; i<tabs; i++)
((LauncherView*)stack->widget(i))->sort();
// all documents
QImage img( Resource::loadImage( "DocsIcon" ) );
QPixmap pm;
pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- 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
+
+ //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&)) );
connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
((LauncherView*)stack->widget(0))->setFocus();
cfg. setGroup ( "GUI" );
setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null ));
if ( !current.isNull() ) {
showTab(current);
}
categoryBar->show();
stack->show();
+
QCopEnvelope e("QPE/TaskBar","reloadApps()");
}
+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 )
{
QString grp( "Tab %1" ); // No tr
cfg.setGroup( grp.arg(id) );
LauncherView *v = view( id );
int idx = ids.findIndex( id );
CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx );
// View
QString view = cfg.readEntry( "View", "Icon" );
if ( view == "List" ) // No tr
v->setViewMode( LauncherView::List );
QString bgType = cfg.readEntry( "BackgroundType", "Image" );
if ( bgType == "Image" ) { // No tr
QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
v->setBackgroundType( LauncherView::Image, pm );
} else if ( bgType == "SolidColor" ) {
QString c = cfg.readEntry( "BackgroundColor" );
v->setBackgroundType( LauncherView::SolidColor, c );
}
QString textCol = cfg.readEntry( "TextColor" );
if ( textCol.isEmpty() )
v->setTextColor( QColor() );
else
v->setTextColor( QColor(textCol) );
QStringList font = cfg.readListEntry( "Font", ',' );
if ( font.count() == 4 )
v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
// Tabs
QString tabCol = cfg.readEntry( "TabColor" );
if ( tabCol.isEmpty() )
tab->bgColor = QColor();
else
tab->bgColor = QColor(tabCol);
QString tabTextCol = cfg.readEntry( "TabTextColor" );
if ( tabTextCol.isEmpty() )
tab->fgColor = QColor();
else
tab->fgColor = QColor(tabTextCol);
}
-void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs)
-{
- docview->populate( docFolder, QString::null );
- docFolder->detachChildren();
- docview->setFileSystems(fs);
- docview->updateTools();
-}
+//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
+//{
+ // docFolder->detachChildren();
+//}
void CategoryTabWidget::tabProperties()
{
LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() );
QPopupMenu *m = new QPopupMenu( this );
m->insertItem( tr("Icon View"), LauncherView::Icon );
m->insertItem( tr("List View"), LauncherView::List );
m->setItemChecked( (int)view->viewMode(), TRUE );
int rv = m->exec( QCursor::pos() );
if ( rv >= 0 && rv != view->viewMode() ) {
view->setViewMode( (LauncherView::ViewMode)rv );
}
delete m;
}
QString CategoryTabWidget::getAllDocLinkInfo() const
{
- return docview->getAllDocLinkInfo();
+ return "";
}
LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
{
LauncherView* view = new LauncherView( stack );
connect( view, SIGNAL(clicked(const AppLnk*)),
this, SIGNAL(clicked(const AppLnk*)));
connect( view, SIGNAL(rightPressed(AppLnk*)),
this, SIGNAL(rightPressed(AppLnk*)));
ids.append(id);
categoryBar->addTab( new CategoryTab( pm, label ) );
stack->addWidget( view, tabs++ );
return view;
}
void CategoryTabWidget::updateLink(const QString& linkfile)
{
- int i=0;
- LauncherView* view;
- //qApp->processEvents();
- while ((view = (LauncherView*)stack->widget(i++))) {
- if ( view->removeLink(linkfile) )
- break;
- }
- addItem(linkfile);
- docview->updateTools();
+ // LauncherView* view;
+ qApp->processEvents();
+// while ((view = (LauncherView*)stack->widget(i++))) {
+// if ( view->removeLink(linkfile) )
+// break;
+// }
+ // addItem(linkfile);
+ fileSel->reparse();
}
void CategoryTabWidget::paletteChange( const QPalette &p )
{
QVBox::paletteChange( p );
QPalette pal = palette();
pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
categoryBar->setPalette( pal );
categoryBar->update();
}
void CategoryTabWidget::setBusy(bool on)
{
if ( on )
((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
else
- for (int i=0; i<tabs; i++)
+ for (int i=0; i<tabs-1; i++)
((LauncherView*)stack->widget(i))->setBusy(FALSE);
}
LauncherView *CategoryTabWidget::view( const QString &id )
{
int idx = ids.findIndex( id );
return (LauncherView *)stack->widget(idx);
}
void CategoryTabWidget::setBusyIndicatorType ( const QString &type )
{
for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
view ( *it )-> setBusyIndicatorType ( type );
}
//===========================================================================
CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name )
: QTabBar( parent, name )
{
setFocusPolicy( NoFocus );
connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) );
}
CategoryTabBar::~CategoryTabBar()
{
}
void CategoryTabBar::layoutTabs()
{
if ( !count() )
return;
@@ -619,64 +638,65 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
}
//---------------------------------------------------------------------------
Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
: QMainWindow( parent, name, fl )
{
setCaption( tr("Launcher") );
syncDialog = 0;
// we have a pretty good idea how big we'll be
setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() );
tabs = 0;
rootFolder = 0;
docsFolder = 0;
int stamp = uidgen.generate(); // this is our timestamp to see which devices we know
//uidgen.store( stamp );
m_timeStamp = QString::number( stamp );
tabs = new CategoryTabWidget( this );
setCentralWidget( tabs );
connect( tabs, SIGNAL(selected(const QString&)),
this, SLOT(viewSelected(const QString&)) );
connect( tabs, SIGNAL(clicked(const AppLnk*)),
this, SLOT(select(const AppLnk*)));
connect( tabs, SIGNAL(rightPressed(AppLnk*)),
this, SLOT(properties(AppLnk*)));
+
#if !defined(QT_NO_COP)
QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
QCopChannel *channel = new QCopChannel( "QPE/Launcher", this );
connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
this, SLOT(launcherMessage(const QCString&, const QByteArray&)) );
#endif
storage = new StorageInfo( this );
connect( storage, SIGNAL( disksChanged() ), SLOT( storageChanged() ) );
updateTabs();
preloadApps();
in_lnk_props = FALSE;
got_lnk_change = FALSE;
}
Launcher::~Launcher()
{
delete rootFolder;
delete docsFolder;
}
static bool isVisibleWindow(int wid)
{
#ifdef QWS
const QList<QWSWindow> &list = qwsServer->clientWindows();
QWSWindow* w;
for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
@@ -703,193 +723,193 @@ void Launcher::doMaximize()
void Launcher::updateMimeTypes()
{
MimeType::clear();
updateMimeTypes(rootFolder);
}
void Launcher::updateMimeTypes(AppLnkSet* folder)
{
for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
AppLnk *app = it.current();
if ( app->type() == "Folder" ) // No tr
updateMimeTypes((AppLnkSet *)app);
else {
MimeType::registerApp(*app);
}
}
}
/** This is a HACK....
* Reason: scanning huge mediums, microdirvers for examples
* consomes time. To avoid that we invented the MediumMountCheck
*
* a) the user globally disabled medium checking. We can ignore
* all removable medium
* b) the user enabled medium checking globally and we need to use this mimefilter
* c) the user enabled medium checking on a per medium bases
* c1) we already checked and its not ask again turns
* c2) we need to ask and then apply the mimefilter
*/
void Launcher::loadDocs() // ok here comes a hack belonging to Global::
{
-
OWait *owait = new OWait();
Global::statusMessage( tr( "Finding documents" ) );
owait->show();
qApp->processEvents();
-
- delete docsFolder;
+ if(docsFolder) delete docsFolder;
docsFolder = new DocLnkSet;
-
DocLnkSet *tmp = 0;
QString home = QString(getenv("HOME")) + "/Documents";
tmp = new DocLnkSet( home , QString::null);
docsFolder->appendFrom( *tmp );
delete tmp;
// RAM documents
StorageInfo storage;
const QList<FileSystem> &fileSystems = storage.fileSystems();
QListIterator<FileSystem> it ( fileSystems );
for ( ; it.current(); ++it ) {
if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
tmp = new DocLnkSet( (*it)->path(), QString::null );
docsFolder->appendFrom( *tmp );
delete tmp;
}
}
Config mediumCfg( "medium");
mediumCfg.setGroup("main");
// a) -zecke we don't want to check
- if(!mediumCfg.readBoolEntry("use", true ) )
+ if(!mediumCfg.readBoolEntry("use", true ) ) {
+ owait->hide();
+ delete owait;
return;
-
+ }
// find out wich filesystems are new in this round
// We will do this by having a timestamp inside each mountpoint
// if the current timestamp doesn't match this is a new file system and
// come up with our MediumMountGui :) let the hacking begin
int stamp = uidgen.generate();
QString newStamp = QString::number( stamp ); // generates newtime Stamp
// b)
if( mediumCfg.readBoolEntry("global", true ) ){
QString mime = configToMime(&mediumCfg).join(";");
for( it.toFirst(); it.current(); ++it ){
if( (*it)->isRemovable() ){
tmp = new DocLnkSet( (*it)->path(), mime );
docsFolder->appendFrom( *tmp );
delete tmp;
}
} // done
+ owait->hide();
+ delete owait;
return; // save the else
}
// c) zecke
for ( it.toFirst(); it.current(); ++it ) {
if ( (*it)->isRemovable() ) { // let's find out if we should search on it
Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
cfg.setGroup("main");
QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
/** This medium is uptodate
*/
if( stamp == m_timeStamp ){ // ok we know this card
cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
// we need to scan the list now. Hopefully the cache will be there
// read the mimetypes from the config and search for documents
QStringList mimetypes = configToMime( &cfg);
//qApp->processEvents();
Global::statusMessage( tr( "Searching documents" ) );
tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") );
docsFolder->appendFrom( *tmp );
delete tmp;
}else{ // come up with the gui cause this a new card
MediumMountGui medium(&cfg, (*it)->path() );
if( medium.check() ){ // we did not ask before or ask again is off
/** c2) */
if( medium.exec() ){ // he clicked yes so search it
// speicher
//cfg.read(); // cause of a race we need to reread - fixed
cfg.setGroup("main");
cfg.writeEntry("timestamp", newStamp );
cfg.write();
//qApp->processEvents();
tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
docsFolder->appendFrom( *tmp );
delete tmp;
}// no else
/** c1) */
}else{ // we checked
// do something different see what we need to do
// let's see if we should check the device
cfg.setGroup("main" );
bool check = cfg.readBoolEntry("autocheck", true );
if( check ){ // find the documents
//qApp->processEvents();
Global::statusMessage( tr( "Searching documents" ) );
tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
docsFolder->appendFrom( *tmp );
delete tmp;
}
}
}
}
}
m_timeStamp = newStamp;
owait->hide();
delete owait;
}
void Launcher::updateTabs()
{
MimeType::updateApplications(); // ### reads all applnks twice
-
delete rootFolder;
rootFolder = new AppLnkSet( MimeType::appsFolderName() );
loadDocs();
tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems());
}
void Launcher::updateDocs()
{
loadDocs();
- tabs->updateDocs(docsFolder,storage->fileSystems());
+ // tabs->updateDocs(docsFolder,storage->fileSystems());
}
void Launcher::viewSelected(const QString& s)
{
setCaption( s + tr(" - Launcher") );
}
void Launcher::nextView()
{
tabs->nextTab();
}
void Launcher::showTab(const QString& id)
{
tabs->showTab(id);
raise();
}
void Launcher::select( const AppLnk *appLnk )
{
if ( appLnk->type() == "Folder" ) { // No tr
// Not supported: flat is simpler for the user
} else {
if ( appLnk->exec().isNull() ) {
QMessageBox::information(this,tr("No application"),
tr("<p>No application is defined for this document."
"<p>Type is %1.").arg(appLnk->type()));
return;
}
tabs->setBusy(TRUE);
emit executing( appLnk );
appLnk->execute();
@@ -1288,32 +1308,48 @@ bool Launcher::mkdir(const QString &localPath)
else {
// the next directory to check
checkedPath = localPath.left(dirIndex) + "/";
// advance the iterator; the next dir seperator
dirIndex = localPath.find(dirSeps, dirIndex+1);
}
QDir checkDir(checkedPath);
if (!checkDir.exists()) {
//qDebug("mkdir making dir %s", checkedPath.latin1());
if (!checkDir.mkdir(checkedPath)) {
qDebug("Unable to make directory %s", checkedPath.latin1());
return FALSE;
}
}
}
return TRUE;
}
void Launcher::preloadApps()
{
Config cfg("Launcher");
cfg.setGroup("Preload");
QStringList apps = cfg.readListEntry("Apps",',');
for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
#ifndef QT_NO_COP
QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
#endif
}
}
+
+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() {
+
+}
+