-rw-r--r-- | core/launcher/documentlist.cpp | 17 | ||||
-rw-r--r-- | core/launcher/firstuse.cpp | 2 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 35 | ||||
-rw-r--r-- | core/launcher/launcher.h | 2 | ||||
-rw-r--r-- | core/settings/launcher/doctabsettings.cpp | 71 | ||||
-rw-r--r-- | core/settings/launcher/doctabsettings.h | 55 | ||||
-rw-r--r-- | core/settings/launcher/inputmethodsettings.cpp | 3 | ||||
-rw-r--r-- | core/settings/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 5 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.h | 2 |
10 files changed, 184 insertions, 10 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index 7f9366e..dcea4b9 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp | |||
@@ -12,24 +12,25 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "documentlist.h" | 20 | #include "documentlist.h" |
21 | #include "serverinterface.h" | 21 | #include "serverinterface.h" |
22 | #include "launcherglobal.h" | 22 | #include "launcherglobal.h" |
23 | 23 | ||
24 | #include <qtopia/config.h> | ||
24 | #include <qtopia/mimetype.h> | 25 | #include <qtopia/mimetype.h> |
25 | #include <qtopia/resource.h> | 26 | #include <qtopia/resource.h> |
26 | #include <qtopia/global.h> | 27 | #include <qtopia/global.h> |
27 | #include <qtopia/private/categories.h> | 28 | #include <qtopia/private/categories.h> |
28 | #include <qtopia/qpeapplication.h> | 29 | #include <qtopia/qpeapplication.h> |
29 | #include <qtopia/applnk.h> | 30 | #include <qtopia/applnk.h> |
30 | #include <qtopia/storage.h> | 31 | #include <qtopia/storage.h> |
31 | #ifdef Q_WS_QWS | 32 | #ifdef Q_WS_QWS |
32 | #include <qtopia/qcopenvelope_qws.h> | 33 | #include <qtopia/qcopenvelope_qws.h> |
33 | #endif | 34 | #endif |
34 | 35 | ||
35 | #include <qtimer.h> | 36 | #include <qtimer.h> |
@@ -95,25 +96,39 @@ DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs, | |||
95 | { | 96 | { |
96 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); | 97 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); |
97 | d = new DocumentListPrivate( serverGui ); | 98 | d = new DocumentListPrivate( serverGui ); |
98 | d->scanDocs = scanDocs; | 99 | d->scanDocs = scanDocs; |
99 | d->needToSendAllDocLinks = false; | 100 | d->needToSendAllDocLinks = false; |
100 | 101 | ||
101 | QTimer::singleShot( 10, this, SLOT( startInitialScan() ) ); | 102 | QTimer::singleShot( 10, this, SLOT( startInitialScan() ) ); |
102 | } | 103 | } |
103 | 104 | ||
104 | void DocumentList::startInitialScan() | 105 | void DocumentList::startInitialScan() |
105 | { | 106 | { |
106 | reloadAppLnks(); | 107 | reloadAppLnks(); |
107 | reloadDocLnks(); | 108 | |
109 | Config cfg( "Launcher" ); | ||
110 | cfg.setGroup( "DocTab" ); | ||
111 | bool docTabEnabled = cfg.readBoolEntry( "Enable", true ); | ||
112 | if ( docTabEnabled ) | ||
113 | reloadDocLnks(); | ||
114 | else | ||
115 | { | ||
116 | if ( d->sendDocLnks && d->serverGui ) | ||
117 | { | ||
118 | d->serverGui->documentScanningProgress( 0 ); | ||
119 | d->serverGui->allDocumentsRemoved(); | ||
120 | } | ||
121 | } | ||
122 | |||
108 | } | 123 | } |
109 | 124 | ||
110 | DocumentList::~DocumentList() | 125 | DocumentList::~DocumentList() |
111 | { | 126 | { |
112 | delete appLnkSet; | 127 | delete appLnkSet; |
113 | delete d; | 128 | delete d; |
114 | } | 129 | } |
115 | 130 | ||
116 | 131 | ||
117 | void DocumentList::add( const DocLnk& doc ) | 132 | void DocumentList::add( const DocLnk& doc ) |
118 | { | 133 | { |
119 | if ( d->serverGui && QFile::exists( doc.file() ) ) | 134 | if ( d->serverGui && QFile::exists( doc.file() ) ) |
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp index 57469cf..e07920f 100644 --- a/core/launcher/firstuse.cpp +++ b/core/launcher/firstuse.cpp | |||
@@ -69,24 +69,26 @@ | |||
69 | 69 | ||
70 | struct { | 70 | struct { |
71 | bool enabled; | 71 | bool enabled; |
72 | const char *app; | 72 | const char *app; |
73 | const char *start; | 73 | const char *start; |
74 | const char *stop; | 74 | const char *stop; |
75 | const char *desc; | 75 | const char *desc; |
76 | } | 76 | } |
77 | settingsTable [] = | 77 | settingsTable [] = |
78 | { | 78 | { |
79 | { FALSE, "language", "raise()", "accept()", // No tr | 79 | { FALSE, "language", "raise()", "accept()", // No tr |
80 | QT_TR_NOOP("Language") }, | 80 | QT_TR_NOOP("Language") }, |
81 | { FALSE, "doctab", "raise()", "accept()", // No tr | ||
82 | QT_TR_NOOP("DocTab") }, | ||
81 | #ifndef Q_OS_WIN32 | 83 | #ifndef Q_OS_WIN32 |
82 | { FALSE, "systemtime", "raise()", "accept()", // No tr | 84 | { FALSE, "systemtime", "raise()", "accept()", // No tr |
83 | QT_TR_NOOP("Time and Date") }, | 85 | QT_TR_NOOP("Time and Date") }, |
84 | #endif | 86 | #endif |
85 | { FALSE, "addressbook", "editPersonalAndClose()", "accept()", // No tr | 87 | { FALSE, "addressbook", "editPersonalAndClose()", "accept()", // No tr |
86 | QT_TR_NOOP("Personal Information") }, | 88 | QT_TR_NOOP("Personal Information") }, |
87 | { FALSE, 0, 0, 0, 0 } | 89 | { FALSE, 0, 0, 0, 0 } |
88 | }; | 90 | }; |
89 | 91 | ||
90 | 92 | ||
91 | FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) : | 93 | FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) : |
92 | QDialog( parent, name, TRUE, wf), | 94 | QDialog( parent, name, TRUE, wf), |
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index d697c43..b312672 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -73,25 +73,25 @@ | |||
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | #ifdef Q_WS_QWS | 75 | #ifdef Q_WS_QWS |
76 | #include <qkeyboard_qws.h> | 76 | #include <qkeyboard_qws.h> |
77 | #include <qpe/lnkproperties.h> | 77 | #include <qpe/lnkproperties.h> |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | 80 | ||
81 | static bool isVisibleWindow( int ); | 81 | static bool isVisibleWindow( int ); |
82 | //=========================================================================== | 82 | //=========================================================================== |
83 | 83 | ||
84 | LauncherTabWidget::LauncherTabWidget( Launcher* parent ) : | 84 | LauncherTabWidget::LauncherTabWidget( Launcher* parent ) : |
85 | QVBox( parent ) | 85 | QVBox( parent ), docview( 0 ) |
86 | { | 86 | { |
87 | docLoadingWidgetEnabled = false; | 87 | docLoadingWidgetEnabled = false; |
88 | docLoadingWidget = 0; | 88 | docLoadingWidget = 0; |
89 | docLoadingWidgetProgress = 0; | 89 | docLoadingWidgetProgress = 0; |
90 | launcher = parent; | 90 | launcher = parent; |
91 | categoryBar = new LauncherTabBar( this ); | 91 | categoryBar = new LauncherTabBar( this ); |
92 | QPalette pal = categoryBar->palette(); | 92 | QPalette pal = categoryBar->palette(); |
93 | pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) ); | 93 | pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) ); |
94 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); | 94 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); |
95 | categoryBar->setPalette( pal ); | 95 | categoryBar->setPalette( pal ); |
96 | stack = new QWidgetStack(this); | 96 | stack = new QWidgetStack(this); |
97 | connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) ); | 97 | connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) ); |
@@ -122,38 +122,50 @@ void LauncherTabWidget::createDocLoadingWidget() | |||
122 | 122 | ||
123 | docLoadingVBox->setSpacing( 20 ); | 123 | docLoadingVBox->setSpacing( 20 ); |
124 | docLoadingVBox->setMargin( 10 ); | 124 | docLoadingVBox->setMargin( 10 ); |
125 | 125 | ||
126 | QWidget *space1 = new QWidget( docLoadingVBox ); | 126 | QWidget *space1 = new QWidget( docLoadingVBox ); |
127 | docLoadingVBox->setStretchFactor( space1, 1 ); | 127 | docLoadingVBox->setStretchFactor( space1, 1 ); |
128 | 128 | ||
129 | QLabel *waitPixmap = new QLabel( docLoadingVBox ); | 129 | QLabel *waitPixmap = new QLabel( docLoadingVBox ); |
130 | waitPixmap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, waitPixmap->sizePolicy().hasHeightForWidth() ) ); | 130 | waitPixmap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, waitPixmap->sizePolicy().hasHeightForWidth() ) ); |
131 | waitPixmap->setPixmap( Resource::loadPixmap( "bigwait" ) ); | 131 | waitPixmap->setPixmap( Resource::loadPixmap( "bigwait" ) ); |
132 | waitPixmap->setAlignment( int( QLabel::AlignCenter ) ); | 132 | waitPixmap->setAlignment( int( QLabel::AlignCenter ) ); |
133 | 133 | ||
134 | Config cfg( "Launcher" ); | ||
135 | cfg.setGroup( "DocTab" ); | ||
136 | bool docTabEnabled = cfg.readBoolEntry( "Enable", true ); | ||
137 | |||
134 | QLabel *textLabel = new QLabel( docLoadingVBox ); | 138 | QLabel *textLabel = new QLabel( docLoadingVBox ); |
135 | textLabel->setText( tr( "<b>Finding Documents...</b>" ) ); | ||
136 | textLabel->setAlignment( int( QLabel::AlignCenter ) ); | 139 | textLabel->setAlignment( int( QLabel::AlignCenter ) ); |
137 | |||
138 | docLoadingWidgetProgress = new QProgressBar( docLoadingVBox ); | 140 | docLoadingWidgetProgress = new QProgressBar( docLoadingVBox ); |
139 | docLoadingWidgetProgress->setProgress( 0 ); | 141 | docLoadingWidgetProgress->setProgress( 0 ); |
140 | docLoadingWidgetProgress->setCenterIndicator( TRUE ); | 142 | docLoadingWidgetProgress->setCenterIndicator( TRUE ); |
141 | docLoadingWidgetProgress->setBackgroundMode( NoBackground ); // No flicker | 143 | docLoadingWidgetProgress->setBackgroundMode( NoBackground ); // No flicker |
142 | setProgressStyle(); | 144 | setProgressStyle(); |
143 | 145 | ||
146 | if ( docTabEnabled ) | ||
147 | { | ||
148 | textLabel->setText( tr( "<b>Finding Documents...</b>" ) ); | ||
149 | } | ||
150 | else | ||
151 | { | ||
152 | textLabel->setText( tr( "<b>The Documents Tab<p>has been disabled.<p>" | ||
153 | "Use Settings->Launcher->DocTab<p>to reenable it.</b></center>" ) ); | ||
154 | docLoadingWidgetProgress->hide(); | ||
155 | } | ||
156 | |||
144 | QWidget *space2 = new QWidget( docLoadingVBox ); | 157 | QWidget *space2 = new QWidget( docLoadingVBox ); |
145 | docLoadingVBox->setStretchFactor( space2, 1 ); | 158 | docLoadingVBox->setStretchFactor( space2, 1 ); |
146 | 159 | ||
147 | Config cfg("Launcher"); | ||
148 | cfg.setGroup( "Tab Documents" ); // No tr | 160 | cfg.setGroup( "Tab Documents" ); // No tr |
149 | setTabViewAppearance( docLoadingWidget, cfg ); | 161 | setTabViewAppearance( docLoadingWidget, cfg ); |
150 | 162 | ||
151 | stack->addWidget( docLoadingWidget, 0 ); | 163 | stack->addWidget( docLoadingWidget, 0 ); |
152 | } | 164 | } |
153 | 165 | ||
154 | void LauncherTabWidget::initLayout() | 166 | void LauncherTabWidget::initLayout() |
155 | { | 167 | { |
156 | layout()->activate(); | 168 | layout()->activate(); |
157 | docView()->setFocus(); | 169 | docView()->setFocus(); |
158 | categoryBar->showTab("Documents"); | 170 | categoryBar->showTab("Documents"); |
159 | } | 171 | } |
@@ -420,24 +432,27 @@ void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray & | |||
420 | } | 432 | } |
421 | } | 433 | } |
422 | 434 | ||
423 | 435 | ||
424 | 436 | ||
425 | //--------------------------------------------------------------------------- | 437 | //--------------------------------------------------------------------------- |
426 | 438 | ||
427 | Launcher::Launcher() | 439 | Launcher::Launcher() |
428 | : QMainWindow( 0, "PDA User Interface", QWidget::WStyle_Customize | QWidget::WGroupLeader ) | 440 | : QMainWindow( 0, "PDA User Interface", QWidget::WStyle_Customize | QWidget::WGroupLeader ) |
429 | { | 441 | { |
430 | tabs = 0; | 442 | tabs = 0; |
431 | tb = 0; | 443 | tb = 0; |
444 | Config cfg( "Launcher" ); | ||
445 | cfg.setGroup( "DocTab" ); | ||
446 | docTabEnabled = cfg.readBoolEntry( "Enable", true ); | ||
432 | } | 447 | } |
433 | 448 | ||
434 | void Launcher::createGUI() | 449 | void Launcher::createGUI() |
435 | { | 450 | { |
436 | setCaption( tr("Launcher") ); | 451 | setCaption( tr("Launcher") ); |
437 | 452 | ||
438 | // we have a pretty good idea how big we'll be | 453 | // we have a pretty good idea how big we'll be |
439 | setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() ); | 454 | setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() ); |
440 | 455 | ||
441 | tb = new TaskBar; | 456 | tb = new TaskBar; |
442 | tabs = new LauncherTabWidget( this ); | 457 | tabs = new LauncherTabWidget( this ); |
443 | setCentralWidget( tabs ); | 458 | setCentralWidget( tabs ); |
@@ -463,29 +478,29 @@ void Launcher::createGUI() | |||
463 | 478 | ||
464 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 479 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
465 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); | 480 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); |
466 | connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), | 481 | connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), |
467 | this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); | 482 | this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); |
468 | #endif | 483 | #endif |
469 | 484 | ||
470 | // all documents | 485 | // all documents |
471 | QImage img( Resource::loadImage( "DocsIcon" ) ); | 486 | QImage img( Resource::loadImage( "DocsIcon" ) ); |
472 | QPixmap pm; | 487 | QPixmap pm; |
473 | pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 488 | pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
474 | // It could add this itself if it handles docs | 489 | // It could add this itself if it handles docs |
490 | |||
475 | tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE ); | 491 | tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE ); |
476 | QTimer::singleShot( 0, tabs, SLOT( initLayout() ) ); | ||
477 | 492 | ||
493 | QTimer::singleShot( 0, tabs, SLOT( initLayout() ) ); | ||
478 | qApp->setMainWidget( this ); | 494 | qApp->setMainWidget( this ); |
479 | |||
480 | QTimer::singleShot( 500, this, SLOT( makeVisible() ) ); | 495 | QTimer::singleShot( 500, this, SLOT( makeVisible() ) ); |
481 | } | 496 | } |
482 | 497 | ||
483 | Launcher::~Launcher() | 498 | Launcher::~Launcher() |
484 | { | 499 | { |
485 | if ( tb ) | 500 | if ( tb ) |
486 | destroyGUI(); | 501 | destroyGUI(); |
487 | } | 502 | } |
488 | 503 | ||
489 | void Launcher::makeVisible() | 504 | void Launcher::makeVisible() |
490 | { | 505 | { |
491 | showMaximized(); | 506 | showMaximized(); |
@@ -725,24 +740,32 @@ void Launcher::applicationScanningProgress( int percent ) | |||
725 | tabs->view( (*it) )->setUpdatesEnabled( TRUE ); | 740 | tabs->view( (*it) )->setUpdatesEnabled( TRUE ); |
726 | tabs->view( (*it) )->setSortEnabled( TRUE ); | 741 | tabs->view( (*it) )->setSortEnabled( TRUE ); |
727 | } | 742 | } |
728 | break; | 743 | break; |
729 | } | 744 | } |
730 | default: | 745 | default: |
731 | break; | 746 | break; |
732 | } | 747 | } |
733 | } | 748 | } |
734 | 749 | ||
735 | void Launcher::documentScanningProgress( int percent ) | 750 | void Launcher::documentScanningProgress( int percent ) |
736 | { | 751 | { |
752 | if ( !docTabEnabled ) | ||
753 | { | ||
754 | qDebug( "Launcher: document tab disabled!" ); | ||
755 | tabs->setLoadingProgress( 100 ); | ||
756 | tabs->setLoadingWidgetEnabled( TRUE ); | ||
757 | return; | ||
758 | } | ||
759 | |||
737 | switch ( percent ) { | 760 | switch ( percent ) { |
738 | case 0: { | 761 | case 0: { |
739 | tabs->setLoadingProgress( 0 ); | 762 | tabs->setLoadingProgress( 0 ); |
740 | tabs->setLoadingWidgetEnabled( TRUE ); | 763 | tabs->setLoadingWidgetEnabled( TRUE ); |
741 | tabs->docView()->setUpdatesEnabled( FALSE ); | 764 | tabs->docView()->setUpdatesEnabled( FALSE ); |
742 | tabs->docView()->setSortEnabled( FALSE ); | 765 | tabs->docView()->setSortEnabled( FALSE ); |
743 | break; | 766 | break; |
744 | } | 767 | } |
745 | case 100: { | 768 | case 100: { |
746 | tabs->docView()->updateTools(); | 769 | tabs->docView()->updateTools(); |
747 | tabs->docView()->setSortEnabled( TRUE ); | 770 | tabs->docView()->setSortEnabled( TRUE ); |
748 | tabs->docView()->setUpdatesEnabled( TRUE ); | 771 | tabs->docView()->setUpdatesEnabled( TRUE ); |
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h index 2917027..1d046ee 100644 --- a/core/launcher/launcher.h +++ b/core/launcher/launcher.h | |||
@@ -141,15 +141,17 @@ private slots: | |||
141 | protected: | 141 | protected: |
142 | bool eventFilter( QObject *o, QEvent *ev ); | 142 | bool eventFilter( QObject *o, QEvent *ev ); |
143 | 143 | ||
144 | private: | 144 | private: |
145 | void updateApps(); | 145 | void updateApps(); |
146 | void loadDocs(); | 146 | void loadDocs(); |
147 | void updateDocs(); | 147 | void updateDocs(); |
148 | void updateTabs(); | 148 | void updateTabs(); |
149 | 149 | ||
150 | LauncherTabWidget *tabs; | 150 | LauncherTabWidget *tabs; |
151 | QStringList ids; | 151 | QStringList ids; |
152 | TaskBar *tb; | 152 | TaskBar *tb; |
153 | |||
154 | bool docTabEnabled; | ||
153 | }; | 155 | }; |
154 | 156 | ||
155 | #endif // LAUNCHERVIEW_H | 157 | #endif // LAUNCHERVIEW_H |
diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp new file mode 100644 index 0000000..8077b8c --- a/dev/null +++ b/core/settings/launcher/doctabsettings.cpp | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | This file is part of the OPIE Project | ||
3 | =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> | ||
4 | .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org> | ||
5 | .>+-= | ||
6 | _;:, .> :=|. This file is free software; you can | ||
7 | .> <`_, > . <= redistribute it and/or modify it under | ||
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
9 | .="- .-=="i, .._ License as published by the Free Software | ||
10 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
11 | ._= =} : or (at your option) any later version. | ||
12 | .%`+i> _;_. | ||
13 | .i_,=:_. -<s. This file is distributed in the hope that | ||
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
15 | : .. .:, . . . without even the implied warranty of | ||
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | ||
18 | ..}^=.= = ; Public License for more details. | ||
19 | ++= -. .` .: | ||
20 | : = ...= . :.=- You should have received a copy of the GNU | ||
21 | -. .:....=;==+<; General Public License along with this file; | ||
22 | -_. . . )=. = see the file COPYING. If not, write to the | ||
23 | -- :-=` Free Software Foundation, Inc., | ||
24 | 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #include "doctabsettings.h" | ||
30 | |||
31 | #include <qpe/config.h> | ||
32 | #include <qpe/qlibrary.h> | ||
33 | #include <qpe/qpeapplication.h> | ||
34 | |||
35 | #include <qspinbox.h> | ||
36 | #include <qcheckbox.h> | ||
37 | #include <qlayout.h> | ||
38 | #include <qlabel.h> | ||
39 | #include <qwhatsthis.h> | ||
40 | |||
41 | DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) | ||
42 | { | ||
43 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); | ||
44 | |||
45 | _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this ); | ||
46 | |||
47 | Config cfg( "Launcher" ); | ||
48 | cfg.setGroup( "DocTab" ); | ||
49 | _enable->setChecked( cfg.readBoolEntry( "Enable", true ) ); | ||
50 | |||
51 | lay->addWidget( _enable ); | ||
52 | lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) ); | ||
53 | |||
54 | lay->addStretch(); | ||
55 | |||
56 | QWhatsThis::add( _enable, tr( "Check, if you want the Documents Tab to be visible." ) ); | ||
57 | } | ||
58 | |||
59 | void DocTabSettings::appletChanged() | ||
60 | { | ||
61 | } | ||
62 | |||
63 | void DocTabSettings::accept() | ||
64 | { | ||
65 | qDebug( "DocTabSettings::accept()" ); | ||
66 | Config cfg( "Launcher" ); | ||
67 | cfg.setGroup( "DocTab" ); | ||
68 | cfg.writeEntry( "Enable", _enable->isChecked() ); | ||
69 | cfg.write(); | ||
70 | } | ||
71 | |||
diff --git a/core/settings/launcher/doctabsettings.h b/core/settings/launcher/doctabsettings.h new file mode 100644 index 0000000..ad6447c --- a/dev/null +++ b/core/settings/launcher/doctabsettings.h | |||
@@ -0,0 +1,55 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This file is free software; you can | ||
6 | .> <`_, > . <= redistribute it and/or modify it under | ||
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%`+i> _;_. | ||
12 | .i_,=:_. -<s. This file is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | ||
17 | ..}^=.= = ; Public License for more details. | ||
18 | ++= -. .` .: | ||
19 | : = ...= . :.=- You should have received a copy of the GNU | ||
20 | -. .:....=;==+<; General Public License along with this file; | ||
21 | -_. . . )=. = see the file COPYING. If not, write to the | ||
22 | -- :-=` Free Software Foundation, Inc., | ||
23 | 59 Temple Place - Suite 330, | ||
24 | Boston, MA 02111-1307, USA. | ||
25 | |||
26 | */ | ||
27 | |||
28 | #ifndef __DOCTAB_SETTINGS_H__ | ||
29 | #define __DOCTAB_SETTINGS_H__ | ||
30 | |||
31 | #include <qwidget.h> | ||
32 | |||
33 | class QCheckBox; | ||
34 | class QSpinBox; | ||
35 | |||
36 | class DocTabSettings : public QWidget | ||
37 | { | ||
38 | Q_OBJECT | ||
39 | |||
40 | public: | ||
41 | DocTabSettings ( QWidget *parent = 0, const char *name = 0 ); | ||
42 | |||
43 | void accept ( ); | ||
44 | |||
45 | protected slots: | ||
46 | void appletChanged ( ); | ||
47 | |||
48 | protected: | ||
49 | void init ( ); | ||
50 | |||
51 | private: | ||
52 | QCheckBox* _enable; | ||
53 | }; | ||
54 | |||
55 | #endif | ||
diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp index 1aa1ae8..147a00d 100644 --- a/core/settings/launcher/inputmethodsettings.cpp +++ b/core/settings/launcher/inputmethodsettings.cpp | |||
@@ -36,40 +36,39 @@ | |||
36 | #include <qcheckbox.h> | 36 | #include <qcheckbox.h> |
37 | #include <qlayout.h> | 37 | #include <qlayout.h> |
38 | #include <qlabel.h> | 38 | #include <qlabel.h> |
39 | #include <qwhatsthis.h> | 39 | #include <qwhatsthis.h> |
40 | 40 | ||
41 | InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) | 41 | InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) |
42 | { | 42 | { |
43 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); | 43 | QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); |
44 | 44 | ||
45 | _resize = new QCheckBox( tr( "Resize application on Popup" ), this ); | 45 | _resize = new QCheckBox( tr( "Resize application on Popup" ), this ); |
46 | _float = new QCheckBox( tr( "Enable floating and resizing" ), this ); | 46 | _float = new QCheckBox( tr( "Enable floating and resizing" ), this ); |
47 | 47 | ||
48 | QHBoxLayout* hbox = new QHBoxLayout( this, 4, 4 ); | 48 | QHBoxLayout* hbox = new QHBoxLayout( lay, 4 ); |
49 | hbox->addWidget( new QLabel( "Initial Width:", this ) ); | 49 | hbox->addWidget( new QLabel( "Initial Width:", this ) ); |
50 | _size = new QSpinBox( 10, 100, 10, this ); | 50 | _size = new QSpinBox( 10, 100, 10, this ); |
51 | _size->setSuffix( "%" ); | 51 | _size->setSuffix( "%" ); |
52 | hbox->addWidget( _size ); | 52 | hbox->addWidget( _size ); |
53 | hbox->addStretch(); | 53 | hbox->addStretch(); |
54 | 54 | ||
55 | Config cfg( "Launcher" ); | 55 | Config cfg( "Launcher" ); |
56 | cfg.setGroup( "InputMethods" ); | 56 | cfg.setGroup( "InputMethods" ); |
57 | _resize->setChecked( cfg.readBoolEntry( "Resize", true ) ); | 57 | _resize->setChecked( cfg.readBoolEntry( "Resize", true ) ); |
58 | _float->setChecked( cfg.readBoolEntry( "Float", false ) ); | 58 | _float->setChecked( cfg.readBoolEntry( "Float", false ) ); |
59 | _size->setValue( cfg.readNumEntry( "Width", 100 ) ); | 59 | _size->setValue( cfg.readNumEntry( "Width", 100 ) ); |
60 | 60 | ||
61 | lay->addWidget( _resize ); | 61 | lay->addWidget( _resize ); |
62 | lay->addWidget( _float ); | 62 | lay->addWidget( _float ); |
63 | lay->addLayout( hbox ); | ||
64 | lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) ); | 63 | lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) ); |
65 | 64 | ||
66 | lay->addStretch(); | 65 | lay->addStretch(); |
67 | 66 | ||
68 | QWhatsThis::add( _resize, tr( "Check, if you want the application to be automatically resized if the input method pops up." ) ); | 67 | QWhatsThis::add( _resize, tr( "Check, if you want the application to be automatically resized if the input method pops up." ) ); |
69 | QWhatsThis::add( _float, tr( "Check, if you want to move and/or resize input methods" ) ); | 68 | QWhatsThis::add( _float, tr( "Check, if you want to move and/or resize input methods" ) ); |
70 | QWhatsThis::add( _size, tr( "Specify the percentage of the screen width for the input method" ) ); | 69 | QWhatsThis::add( _size, tr( "Specify the percentage of the screen width for the input method" ) ); |
71 | } | 70 | } |
72 | 71 | ||
73 | void InputMethodSettings::appletChanged() | 72 | void InputMethodSettings::appletChanged() |
74 | { | 73 | { |
75 | } | 74 | } |
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 9d05832..3261ee8 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro | |||
@@ -1,26 +1,28 @@ | |||
1 | CONFIG += qt warn_on release quick-app | 1 | CONFIG += qt warn_on release quick-app |
2 | HEADERS = launchersettings.h \ | 2 | HEADERS = launchersettings.h \ |
3 | tabssettings.h \ | 3 | tabssettings.h \ |
4 | taskbarsettings.h \ | 4 | taskbarsettings.h \ |
5 | menusettings.h \ | 5 | menusettings.h \ |
6 | inputmethodsettings.h \ | 6 | inputmethodsettings.h \ |
7 | doctabsettings.h \ | ||
7 | tabconfig.h \ | 8 | tabconfig.h \ |
8 | tabdialog.h | 9 | tabdialog.h |
9 | 10 | ||
10 | SOURCES = main.cpp \ | 11 | SOURCES = main.cpp \ |
11 | launchersettings.cpp \ | 12 | launchersettings.cpp \ |
12 | tabssettings.cpp \ | 13 | tabssettings.cpp \ |
13 | taskbarsettings.cpp \ | 14 | taskbarsettings.cpp \ |
14 | menusettings.cpp \ | 15 | menusettings.cpp \ |
15 | inputmethodsettings.cpp \ | 16 | inputmethodsettings.cpp \ |
17 | doctabsettings.cpp \ | ||
16 | tabdialog.cpp | 18 | tabdialog.cpp |
17 | 19 | ||
18 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH += $(OPIEDIR)/include | 21 | DEPENDPATH += $(OPIEDIR)/include |
20 | LIBS += -lqpe -lopie | 22 | LIBS += -lqpe -lopie |
21 | TARGET = launchersettings | 23 | TARGET = launchersettings |
22 | 24 | ||
23 | 25 | ||
24 | 26 | ||
25 | 27 | ||
26 | include ( $(OPIEDIR)/include.pro ) | 28 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index efc4a86..e129849 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -27,51 +27,54 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | 31 | ||
32 | #include <opie/otabwidget.h> | 32 | #include <opie/otabwidget.h> |
33 | 33 | ||
34 | #include "launchersettings.h" | 34 | #include "launchersettings.h" |
35 | #include "tabssettings.h" | 35 | #include "tabssettings.h" |
36 | #include "menusettings.h" | 36 | #include "menusettings.h" |
37 | #include "taskbarsettings.h" | 37 | #include "taskbarsettings.h" |
38 | #include "inputmethodsettings.h" | 38 | #include "inputmethodsettings.h" |
39 | #include "doctabsettings.h" | ||
39 | 40 | ||
40 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) | 41 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) |
41 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | 42 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) |
42 | { | 43 | { |
43 | setCaption ( tr( "Launcher Settings" )); | 44 | setCaption ( tr( "Launcher Settings" )); |
44 | 45 | ||
45 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 46 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
46 | 47 | ||
47 | OTabWidget *tw = new OTabWidget ( this, "otab" ); | 48 | OTabWidget *tw = new OTabWidget ( this, "otab" ); |
48 | lay-> addWidget ( tw ); | 49 | lay-> addWidget ( tw ); |
49 | 50 | ||
50 | m_tabs = new TabsSettings ( tw ); | 51 | m_tabs = new TabsSettings ( tw ); |
51 | m_taskbar = new TaskbarSettings ( tw ); | 52 | m_taskbar = new TaskbarSettings ( tw ); |
52 | m_menu = new MenuSettings ( tw ); | 53 | m_menu = new MenuSettings ( tw ); |
53 | m_imethods = new InputMethodSettings ( tw ); | 54 | m_imethods = new InputMethodSettings ( tw ); |
55 | m_doctab = new DocTabSettings ( tw ); | ||
54 | 56 | ||
55 | tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" )); | 57 | tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" )); |
56 | tw-> addTab ( m_menu, "go", tr( "O-Menu" )); | 58 | tw-> addTab ( m_menu, "go", tr( "O-Menu" )); |
57 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); | 59 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); |
58 | tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" )); | 60 | tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" )); |
59 | 61 | tw-> addTab ( m_doctab, "DocsIcon", tr( "DocTab" ) ); | |
60 | tw-> setCurrentTab ( m_taskbar ); | 62 | tw-> setCurrentTab ( m_taskbar ); |
61 | } | 63 | } |
62 | 64 | ||
63 | void LauncherSettings::accept ( ) | 65 | void LauncherSettings::accept ( ) |
64 | { | 66 | { |
65 | m_taskbar-> accept ( ); | 67 | m_taskbar-> accept ( ); |
66 | m_menu-> accept ( ); | 68 | m_menu-> accept ( ); |
67 | m_tabs-> accept ( ); | 69 | m_tabs-> accept ( ); |
68 | m_imethods-> accept ( ); | 70 | m_imethods-> accept ( ); |
71 | m_doctab-> accept ( ); | ||
69 | 72 | ||
70 | QDialog::accept ( ); | 73 | QDialog::accept ( ); |
71 | } | 74 | } |
72 | 75 | ||
73 | void LauncherSettings::done ( int r ) | 76 | void LauncherSettings::done ( int r ) |
74 | { | 77 | { |
75 | QDialog::done ( r ); | 78 | QDialog::done ( r ); |
76 | close ( ); | 79 | close ( ); |
77 | } | 80 | } |
diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h index 7458d8b..9ba2942 100644 --- a/core/settings/launcher/launchersettings.h +++ b/core/settings/launcher/launchersettings.h | |||
@@ -25,31 +25,33 @@ | |||
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #ifndef __LAUNCHER_SETTINGS_H__ | 28 | #ifndef __LAUNCHER_SETTINGS_H__ |
29 | #define __LAUNCHER_SETTINGS_H__ | 29 | #define __LAUNCHER_SETTINGS_H__ |
30 | 30 | ||
31 | #include <qdialog.h> | 31 | #include <qdialog.h> |
32 | 32 | ||
33 | class TabsSettings; | 33 | class TabsSettings; |
34 | class TaskbarSettings; | 34 | class TaskbarSettings; |
35 | class MenuSettings; | 35 | class MenuSettings; |
36 | class InputMethodSettings; | 36 | class InputMethodSettings; |
37 | class DocTabSettings; | ||
37 | 38 | ||
38 | class LauncherSettings : public QDialog { | 39 | class LauncherSettings : public QDialog { |
39 | Q_OBJECT | 40 | Q_OBJECT |
40 | 41 | ||
41 | public: | 42 | public: |
42 | static QString appName() { return QString::fromLatin1("launchersettings"); } | 43 | static QString appName() { return QString::fromLatin1("launchersettings"); } |
43 | LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); | 44 | LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); |
44 | 45 | ||
45 | virtual void accept ( ); | 46 | virtual void accept ( ); |
46 | virtual void done ( int r ); | 47 | virtual void done ( int r ); |
47 | 48 | ||
48 | private: | 49 | private: |
49 | TabsSettings *m_tabs; | 50 | TabsSettings *m_tabs; |
50 | TaskbarSettings *m_taskbar; | 51 | TaskbarSettings *m_taskbar; |
51 | MenuSettings *m_menu; | 52 | MenuSettings *m_menu; |
52 | InputMethodSettings* m_imethods; | 53 | InputMethodSettings* m_imethods; |
54 | DocTabSettings *m_doctab; | ||
53 | }; | 55 | }; |
54 | 56 | ||
55 | #endif | 57 | #endif |