summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpedecoration_qws.cpp7
-rw-r--r--library/task-opie-applets.control2
-rw-r--r--library/task-opie-complete.control2
-rw-r--r--library/task-opie-games.control2
-rw-r--r--library/task-opie-pim.control2
-rw-r--r--library/task-opie-settings.control2
6 files changed, 10 insertions, 7 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 708dd23..214c721 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -455,128 +455,131 @@ QRegion WindowDecorationInterface::mask( const WindowData *wd ) const
class DefaultWindowDecoration : public WindowDecorationInterface
{
public:
DefaultWindowDecoration() : ref(0) {}
QString name() const {
return "Default";
}
QPixmap icon() const {
return QPixmap();
}
QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_WindowDecoration )
*iface = this;
if ( *iface )
(*iface)->addRef();
return QS_OK;
}
Q_REFCOUNT
private:
ulong ref;
};
static WindowDecorationInterface *wdiface = 0;
static QLibrary *wdlib = 0;
//===========================================================================
QPEDecoration::QPEDecoration()
: QWSDefaultDecoration()
{
if ( wdlib ) {
wdiface->release();
wdlib->unload();
delete wdlib;
wdlib = 0;
} else {
delete wdiface;
}
wdiface = new DefaultWindowDecoration;
helpFile = QString(qApp->argv()[0]) + ".html";
QStringList helpPath = Global::helpPath();
helpExists = FALSE;
- for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
+ for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) {
helpExists = QFile::exists( *it + "/" + helpFile );
+ qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists);
+ }
qpeManager = new QPEManager( this );
}
QPEDecoration::QPEDecoration( const QString &plugin )
: QWSDefaultDecoration()
{
if ( wdlib ) {
wdiface->release();
wdlib->unload();
delete wdlib;
wdlib = 0;
} else {
delete wdiface;
}
WindowDecorationInterface *iface = 0;
QString path = QPEApplication::qpeDir() + "/plugins/decorations";
QLibrary *lib = new QLibrary( path + "/" + plugin );
if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
wdiface = iface;
wdlib = lib;
} else {
delete lib;
wdiface = new DefaultWindowDecoration;
}
helpFile = QString(qApp->argv()[0]) + ".html";
QStringList helpPath = Global::helpPath();
helpExists = FALSE;
- for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
+ for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) {
helpExists = QFile::exists( *it + "/" + helpFile );
+ qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); }
qpeManager = new QPEManager( this );
}
QPEDecoration::~QPEDecoration()
{
delete qpeManager;
}
const char **QPEDecoration::menuPixmap()
{
return (const char **)0;
}
const char **QPEDecoration::closePixmap()
{
return (const char **)qpe_close_xpm;
}
const char **QPEDecoration::minimizePixmap()
{
return (const char **)qpe_accept_xpm;
}
const char **QPEDecoration::maximizePixmap()
{
return (const char **)0;
}
const char **QPEDecoration::normalizePixmap()
{
return (const char **)0;
}
int QPEDecoration::getTitleHeight( const QWidget *w )
{
WindowDecorationInterface::WindowData wd;
windowData( w, wd );
return wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
}
/*
If rect is empty, no frame is added. (a hack, really)
*/
QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecoration::Region type)
{
qpeManager->updateActive();
WindowDecorationInterface::WindowData wd;
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control
index f0e7780..11e2eae 100644
--- a/library/task-opie-applets.control
+++ b/library/task-opie-applets.control
@@ -1,9 +1,9 @@
Files:
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-netmonapplet, opie-pickboard, opie-keyboard, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard
Description: Opie taskbar applets
- All applets for the taskbar \ No newline at end of file
+ All applets for the taskbar
diff --git a/library/task-opie-complete.control b/library/task-opie-complete.control
index 226a278..6dafc0c 100644
--- a/library/task-opie-complete.control
+++ b/library/task-opie-complete.control
@@ -1,9 +1,9 @@
Files:
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie, task-opie-apps, task-opie-settings, task-opie-games, task-opie-applets
Description: All off Opie
- All apps that are in the feed. \ No newline at end of file
+ All apps that are in the feed.
diff --git a/library/task-opie-games.control b/library/task-opie-games.control
index 014a56d..9695a40 100644
--- a/library/task-opie-games.control
+++ b/library/task-opie-games.control
@@ -1,9 +1,9 @@
Files:
Priority: optional
Section: opie/games
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-fifteen, opie-go, opie-kbill, opie-kcheckers, opie-kpacman, opie-minesweep, opie-parashoot, opie-qasteroids, opie-snake, opie-solitaire, opie-tetrix, opie-tictac, opie-wordgame
Description: Opie game pack
- The full load of Opie games. \ No newline at end of file
+ The full load of Opie games.
diff --git a/library/task-opie-pim.control b/library/task-opie-pim.control
index e971780..6df8c22 100644
--- a/library/task-opie-pim.control
+++ b/library/task-opie-pim.control
@@ -1,9 +1,9 @@
Files:
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-datebook, opie-todo, opie-addressbook, task-opie-today, opie-drawpad, opie-keyboard
Description: Opie pim applications
- Base pack of opie pim applications. Also includes keyboard input. \ No newline at end of file
+ Base pack of opie pim applications. Also includes keyboard input.
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control
index 2fbb4e8..0b572b0 100644
--- a/library/task-opie-settings.control
+++ b/library/task-opie-settings.control
@@ -1,9 +1,9 @@
Files:
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-appearance, opie-security, opie-systemtime, opie-light-and-power, opie-rotation, opie-tabmanager, opie-wlansetup
Description: Opie settings app
- All settings apps \ No newline at end of file
+ All settings apps