From 35615947e11575a61456c8483e7f6d67fe59d5ed Mon Sep 17 00:00:00 2001 From: mickeyl Date: Wed, 29 Oct 2003 17:22:08 +0000 Subject: merge noncore/settings/* except networksettings for which tille volunteered (thanks) --- diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 00128d3..9e5eede 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp @@ -564,10 +564,6 @@ void Appearance::accept ( ) config. write ( ); // need to flush the config info first Global::applyStyle ( ); - if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) { - QCopEnvelope e( "QPE/System", "restart()" ); - } - QDialog::accept ( ); } diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h index da9e976..51e9636 100644 --- a/noncore/settings/appearance2/appearance.h +++ b/noncore/settings/appearance2/appearance.h @@ -55,11 +55,12 @@ class Appearance : public QDialog public: Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Appearance(); + static QString appName() { return QString::fromLatin1("appearance"); } protected: virtual void accept ( ); virtual void done ( int r ); - + protected slots: void styleClicked ( int ); void styleSettingsClicked ( ); diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro index e37536d..145de2f 100644 --- a/noncore/settings/appearance2/appearance2.pro +++ b/noncore/settings/appearance2/appearance2.pro @@ -1,15 +1,14 @@ -TEMPLATE = app -CONFIG = qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG = qt warn_on release quick-app HEADERS = appearance.h editScheme.h sample.h SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe -lopie -TARGET = appearance INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include +TARGET = appearance + TRANSLATIONS = ../../../i18n/de/appearance.ts \ ../../../i18n/nl/appearance.ts \ ../../../i18n/xx/appearance.ts \ @@ -29,5 +28,4 @@ TRANSLATIONS = ../../../i18n/de/appearance.ts \ ../../../i18n/da/appearance.ts - include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp index ad24cf3..5595429 100644 --- a/noncore/settings/appearance2/main.cpp +++ b/noncore/settings/appearance2/main.cpp @@ -15,7 +15,7 @@     =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A   _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General ..}^=.=       =       ; Public License for more details. -++=   -.     .`     .: +++=   -.     .`     .:  :     =  ...= . :.=- You should have received a copy of the GNU  -.   .:....=;==+<; General Public License along with this file;   -_. . .   )=.  = see the file COPYING. If not, write to the @@ -28,15 +28,7 @@ #include "appearance.h" #include +#include -int main ( int argc, char **argv ) -{ - QPEApplication app ( argc, argv ); - - Appearance m; - app. showMainDocumentWidget ( &m ); - - return app. exec ( ); -} - +OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index cadb381..1e9af61 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = backuprestore.h SOURCES = main.cpp backuprestore.cpp INCLUDEPATH += $(OPIEDIR)/include @@ -8,7 +6,6 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = backuprestorebase.ui errordialog.ui TARGET = backup -DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../../../i18n/de/backup.ts \ ../../../i18n/nl/backup.ts \ @@ -30,6 +27,4 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \ ../../../i18n/da/backup.ts - - include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 922523b..1c854d9 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -37,8 +37,8 @@ const QString tempFileName = "/tmp/backup.err"; -BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) - : BackupAndRestoreBase(parent, name){ +BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) + : BackupAndRestoreBase(parent, name, fl){ this->showMaximized(); backupList->header()->hide(); restoreList->header()->hide(); @@ -47,11 +47,11 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) connect(restoreButton, SIGNAL(clicked()), this, SLOT(restore())); connect(backupList, SIGNAL(clicked( QListViewItem * )), - this, SLOT(selectItem(QListViewItem*))); + this, SLOT(selectItem(QListViewItem*))); connect(restoreSource, SIGNAL(activated( int )), - this, SLOT(sourceDirChanged(int))); + this, SLOT(sourceDirChanged(int))); connect(updateList, SIGNAL(clicked()), - this, SLOT( fileListUpdate())); + this, SLOT( fileListUpdate())); applicationSettings = new QListViewItem(backupList, "Application Settings", "", QDir::homeDirPath() + "/Settings/"); @@ -62,13 +62,13 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) documents= new QListViewItem(backupList, "Documents", "", QDir::homeDirPath() + "/Documents/"); selectItem(documents); - + scanForApplicationSettings(); - + Config config("BackupAndRestore"); config.setGroup("General"); int totalLocations = config.readNumEntry("totalLocations",0); - + //todo make less static here and use Storage class to get infos if(totalLocations == 0){ backupLocations.insert("Documents", "/root/Documents"); @@ -86,8 +86,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) storeToLocation->insertItem(it.key()); restoreSource->insertItem(it.key()); } - - // Read the list of items to ignore. + + // Read the list of items to ignore. QList dontBackupList; dontBackupList.setAutoDelete(true); config.setGroup("DontBackup"); @@ -98,7 +98,7 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) QList list; getAllItems(backupList->firstChild(), list); - + for(uint i = 0; i < list.count(); i++){ QString text = list.at(i)->text(HEADER_NAME); for(uint i2 = 0; i2 < dontBackupList.count(); i2++){ @@ -113,11 +113,11 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) BackupAndRestore::~BackupAndRestore(){ QList list; getAllItems(backupList->firstChild(), list); - + Config config("BackupAndRestore"); config.setGroup("DontBackup"); config.clearGroup(); - + int count = 0; for(uint i = 0; i < list.count(); i++){ if(list.at(i)->text(HEADER_BACKUP) == ""){ @@ -135,7 +135,7 @@ BackupAndRestore::~BackupAndRestore(){ QList BackupAndRestore::getAllItems(QListViewItem *item, QList &list){ while(item){ if(item->childCount() > 0) - getAllItems(item->firstChild(), list); + getAllItems(item->firstChild(), list); list.append(item); item = item->nextSibling(); } @@ -179,27 +179,27 @@ void BackupAndRestore::scanForApplicationSettings(){ /** * The "Backup" button has been pressed. Get a list of all of the files that - * should be backed up. If there are no files, emit and error and exit. + * should be backed up. If there are no files, emit and error and exit. * Determine the file name to store the backup in. Backup the file(s) using * tar and gzip --best. Report failure or success - */ + */ void BackupAndRestore::backupPressed(){ QString backupFiles; if(getBackupFiles(backupFiles, NULL) == 0){ QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") ); - return; + return; } setCaption(tr("Backup and Restore... working...")); QString outputFile = backupLocations[storeToLocation->currentText()]; QDateTime datetime = QDateTime::currentDateTime(); - QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + + QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + QString::number( datetime.date().day() ).rightJustify(2, '0'); outputFile += "/" + dateString; - + QString t = outputFile; int c = 1; while(QFile::exists(outputFile + EXTENSION)){ @@ -207,7 +207,7 @@ void BackupAndRestore::backupPressed(){ c++; } - // We execute tar and compressing its output with gzip.. + // We execute tar and compressing its output with gzip.. // The error output will be written into a temp-file which could be provided // for debugging.. qDebug( "Storing file: %s", outputFile.latin1() ); @@ -228,7 +228,7 @@ void BackupAndRestore::backupPressed(){ perror("Error: "); QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); - switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" + switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){ case 1: @@ -242,7 +242,7 @@ void BackupAndRestore::backupPressed(){ s += t.readLine(); // line of text excluding '\n' } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); @@ -253,18 +253,18 @@ void BackupAndRestore::backupPressed(){ break; } setCaption(tr("Backup and Restore.. Failed !!")); - return; + return; } else{ QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); - + } setCaption(tr("Backup and Restore")); } /*** * Get a list of all of the files to backup. - */ + */ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ QListViewItem * currentItem; QString currentHome; @@ -274,7 +274,7 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent currentItem = parent->firstChild(); currentHome = parent->text(BACKUP_LOCATION); } - + uint count = 0; while( currentItem != 0 ){ if(currentItem->text(HEADER_BACKUP) == "B" ){ @@ -317,7 +317,7 @@ void BackupAndRestore::rescanFolder(QString directory){ QDir d(directory); if(!d.exists()) return; - + d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); @@ -341,26 +341,26 @@ void BackupAndRestore::rescanFolder(QString directory){ /** * Restore a backup file. * Report errors or success - */ + */ void BackupAndRestore::restore(){ QListViewItem *restoreItem = restoreList->currentItem(); if(!restoreItem){ QMessageBox::critical(this, tr( "Message" ), tr( "Please select something to restore." ),QString( tr( "Ok") ) ); - return; + return; } setCaption(tr("Backup and Restore... working...")); QString restoreFile = backupLocations[restoreSource->currentText()]; - + restoreFile += "/" + restoreItem->text(0); - + int r = system(QString("tar -C / -zxf %1 2> %3") .arg( restoreFile.latin1() ) .arg( tempFileName.latin1() ) ); if(r != 0){ QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); - switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" + switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) { case 1: qWarning("Details pressed !"); @@ -373,7 +373,7 @@ void BackupAndRestore::restore(){ s += t.readLine(); // line of text excluding '\n' } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); @@ -383,7 +383,7 @@ void BackupAndRestore::restore(){ delete pErrDialog; setCaption(tr("Backup and Restore.. Failed !!")); - return; + return; break; diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 8c733e3..4bdc758 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -1,4 +1,4 @@ -#ifndef WINDOW_H +#ifndef WINDOW_H #define WINDOW_H #include @@ -8,16 +8,17 @@ class QListViewItem; -class BackupAndRestore : public BackupAndRestoreBase { +class BackupAndRestore : public BackupAndRestoreBase { Q_OBJECT - + public: - BackupAndRestore( QWidget* parent = 0, const char* name = 0); + BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~BackupAndRestore(); - - + + static QString appName() { return QString::fromLatin1("backup"); } + private slots: void backupPressed(); void restore(); diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp index 676e1f0..b375a3b 100644 --- a/noncore/settings/backup/main.cpp +++ b/noncore/settings/backup/main.cpp @@ -1,14 +1,8 @@ #include "backuprestore.h" #include "qnetworkprotocol.h" #include +#include -int main(int argc, char *argv[]) { - QPEApplication a( argc, argv ); - - BackupAndRestore app(0, "mainwindow"); - a.showMainWidget(&app); - return a.exec(); -} -// main.cpp +OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index eb9e0b9..f181f7e 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = settings.h SOURCES = language.cpp main.cpp INTERFACES = languagesettingsbase.ui diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp index a760ff3..8bdf8a5 100644 --- a/noncore/settings/language/main.cpp +++ b/noncore/settings/language/main.cpp @@ -21,16 +21,7 @@ #include "settings.h" #include +#include -int main(int argc, char** argv) -{ - QPEApplication a(argc,argv); - - LanguageSettings dlg; - - a.showMainWidget(&dlg); - - return a.exec(); -} - +OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/settings/language/settings.h b/noncore/settings/language/settings.h index 22cc987..a157d26 100644 --- a/noncore/settings/language/settings.h +++ b/noncore/settings/language/settings.h @@ -35,6 +35,8 @@ public: LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~LanguageSettings(); + static QString appName() { return QString::fromLatin1("language"); } + protected: void accept(); void reject(); diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp index 118a725..b8cdeaf 100644 --- a/noncore/settings/mediummount/main.cpp +++ b/noncore/settings/mediummount/main.cpp @@ -4,14 +4,7 @@ #include #include +#include -int main( int argc, char ** argv ) -{ - QPEApplication a( argc, argv ); +OPIE_EXPORT_APP( OApplicationFactory ) - MediumMountSetting::MainWindow mw; - a.showMainWidget( &mw ); - mw.showMaximized(); - - return a.exec(); -} diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index 71dac79..9649863 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h @@ -17,6 +17,7 @@ namespace MediumMountSetting { public: MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); ~MainWindow(); + static QString appName() { return QString::fromLatin1("mediummount"); } private slots: void slotGlobalChanged(int ); diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro index 97bbbaf..6e29fa5 100644 --- a/noncore/settings/mediummount/mediummount.pro +++ b/noncore/settings/mediummount/mediummount.pro @@ -1,7 +1,7 @@ TEMPLATE = app DESTDIR = $(OPIEDIR)/bin/ #CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = mediumwidget.h mediumglobal.h mainwindow.h SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc INCLUDEPATH += $(OPIEDIR)/include diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h index 7f7b755..0f27117 100644 --- a/noncore/settings/mediummount/mediumwidget.h +++ b/noncore/settings/mediummount/mediumwidget.h @@ -26,6 +26,7 @@ namespace MediumMountSetting { public: MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); ~MediumMountWidget(); + void writeConfig(); diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp index 4b20a61..da98eee 100644 --- a/noncore/settings/netsystemtime/main.cpp +++ b/noncore/settings/netsystemtime/main.cpp @@ -29,13 +29,7 @@ #include "mainwindow.h" #include +#include -int main( int argc, char ** argv ) -{ - QPEApplication a( argc, argv ); - MainWindow mw; - a.showMainWidget( &mw ); - - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 2d240ba..66e1ca3 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) #include @@ -50,7 +51,7 @@ #include #include -MainWindow::MainWindow() +MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) : QDialog( 0x0, 0x0, TRUE, 0 ) { setCaption( tr( "SystemTime" ) ); @@ -66,7 +67,7 @@ MainWindow::MainWindow() ntpProcess = 0x0; ntpTab = 0x0; - // Add tab widgets + // Add tab widgets mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); @@ -79,10 +80,9 @@ MainWindow::MainWindow() mainWidget->setCurrentTab( tr( "Time" ) ); layout->addWidget( mainWidget ); - // Create QCOP channel - QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this ); - connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); + connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), + this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); + // Create NTP socket ntpSock = new QSocket( this ); @@ -110,7 +110,8 @@ MainWindow::MainWindow() slotCheckNtp( -1 ); // Display app - showMaximized(); + //showMaximized(); + (void)new QPEDialogListener(this); } MainWindow::~MainWindow() @@ -165,7 +166,7 @@ void MainWindow::runNTP() if ( !ntpDelayElapsed() && ntpInteractive ) { QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.
Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) ); - + switch ( QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No ) ) @@ -198,8 +199,8 @@ void MainWindow::runNTP() else ntpProcess->clearArguments(); - - *ntpProcess << "ntpdate" << srv; + + *ntpProcess << "ntpdate" << srv; bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); if ( !ret ) { @@ -297,7 +298,7 @@ void MainWindow::slotNtpFinished( OProcess *p ) { QString output; QDateTime dt = QDateTime::currentDateTime(); - + // Verify run was successful if ( p->exitStatus() != 0 || !p->normalExit() ) { @@ -338,7 +339,7 @@ void MainWindow::slotNtpFinished( OProcess *p ) return; int secsSinceLast = time - lastLookup; output = tr( "%1 seconds").arg(QString::number( timeShift )); - + // Display information on time server tab if ( ntpTabEnabled ) { diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h index fa94335..1cdbc1a 100644 --- a/noncore/settings/netsystemtime/mainwindow.h +++ b/noncore/settings/netsystemtime/mainwindow.h @@ -48,8 +48,9 @@ class MainWindow : public QDialog Q_OBJECT public: - MainWindow(); + MainWindow( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0); ~MainWindow(); + static QString appName() { return QString::fromLatin1("systemtime"); } protected: void accept(); diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro index 7a12dd1..2140f2e 100644 --- a/noncore/settings/netsystemtime/netsystemtime.pro +++ b/noncore/settings/netsystemtime/netsystemtime.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -CONFIG = qt warn_on debug -#CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = mainwindow.h \ timetabwidget.h \ formattabwidget.h \ @@ -17,8 +15,7 @@ SOURCES = main.cpp \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie -INTERFACES = -DESTDIR = $(OPIEDIR)/bin + TARGET = systemtime TRANSLATIONS = ../../../i18n/de/systemtime.ts \ diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp index 33b0523..d919ce4 100644 --- a/noncore/settings/sound/main.cpp +++ b/noncore/settings/sound/main.cpp @@ -21,13 +21,9 @@ #include "soundsettings.h" #include +#include + +OPIE_EXPORT_APP( OApplicationFactory ) -int main(int argc, char** argv) -{ - QPEApplication a(argc,argv); - SoundSettings dlg; - a.showMainWidget(&dlg); - return a.exec(); -} diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 48c612e..c0a1ed3 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = soundsettings.h soundsettingsbase.h SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp #INTERFACES = soundsettingsbase.ui diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 71ce6f5..57a360f 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h @@ -29,6 +29,7 @@ class SoundSettings : public SoundSettingsBase Q_OBJECT public: + static QString appName() { return QString::fromLatin1("sound"); } SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); protected: diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control index d05858c..4deccf4 100644 --- a/noncore/settings/sshkeys/opie-sshkeys.control +++ b/noncore/settings/sshkeys/opie-sshkeys.control @@ -1,5 +1,5 @@ Package: opie-sshkeys -Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png +Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png Priority: optional Section: opie/settings Maintainer: David Woodhouse diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp index aa78286..515ea9a 100644 --- a/noncore/settings/usermanager/main.cpp +++ b/noncore/settings/usermanager/main.cpp @@ -9,11 +9,6 @@ #include "usermanager.h" #include +#include -int main( int argc, char ** argv ) -{ - QPEApplication a( argc, argv ); - UserConfig mw(0,0,0); - a.showMainWidget( &mw ); - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h index 6782923..313646a 100644 --- a/noncore/settings/usermanager/usermanager.h +++ b/noncore/settings/usermanager/usermanager.h @@ -27,6 +27,7 @@ class UserConfig : public QMainWindow Q_OBJECT public: + static QString appName() { return QString::fromLatin1("appname"); } UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~UserConfig(); diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro index 576a233..f61fb63 100644 --- a/noncore/settings/usermanager/usermanager.pro +++ b/noncore/settings/usermanager/usermanager.pro @@ -1,13 +1,11 @@ -TEMPLATE = app #CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie -lcrypt TARGET = usermanager -DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../../../i18n/de/usermanager.ts \ ../../../i18n/nl/usermanager.ts \ -- cgit v0.9.0.2