| -rw-r--r-- | noncore/apps/confedit/confedit.pro | 12 | ||||
| -rw-r--r-- | noncore/apps/confedit/listviewitemconf.cpp | 3 | ||||
| -rw-r--r-- | noncore/apps/confedit/main.cpp | 5 | ||||
| -rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 13 |
4 files changed, 23 insertions, 10 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro index f6227f7..d2629de 100644 --- a/noncore/apps/confedit/confedit.pro +++ b/noncore/apps/confedit/confedit.pro @@ -1,33 +1,43 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app #CONFIG = qt warn_on release CONFIG = qt warn_on debug HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/ioclude -LIBS += -lqpe INTERFACES = +LIBS += -lopiecore2 -lopieui2 TARGET = confedit TRANSLATIONS = ../../../i18n/de/confedit.ts \ ../../../i18n/nl/confedit.ts \ ../../../i18n/da/confedit.ts \ ../../../i18n/xx/confedit.ts \ ../../../i18n/en/confedit.ts \ ../../../i18n/es/confedit.ts \ ../../../i18n/fr/confedit.ts \ ../../../i18n/hu/confedit.ts \ ../../../i18n/ja/confedit.ts \ ../../../i18n/ko/confedit.ts \ ../../../i18n/no/confedit.ts \ ../../../i18n/pl/confedit.ts \ ../../../i18n/pt/confedit.ts \ ../../../i18n/pt_BR/confedit.ts \ ../../../i18n/sl/confedit.ts \ ../../../i18n/zh_CN/confedit.ts \ ../../../i18n/zh_TW/confedit.ts +!contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) + LIBS += -lqpe +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} + + + diff --git a/noncore/apps/confedit/listviewitemconf.cpp b/noncore/apps/confedit/listviewitemconf.cpp index 91edca2..61bd7ea 100644 --- a/noncore/apps/confedit/listviewitemconf.cpp +++ b/noncore/apps/confedit/listviewitemconf.cpp @@ -28,24 +28,27 @@ int ListViewItemConf::getType() { return _type; } void ListViewItemConf::changed() { _changed=true; displayText(); } void ListViewItemConf::unchanged() { _changed=false; for (QListViewItem *it = firstChild(); it!=0;it = it->nextSibling()) { ((ListViewItemConf*)it)->unchanged(); } displayText(); } bool ListViewItemConf::revertable() { return _changed; }
\ No newline at end of file + + + diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp index 6c18adb..7e7f064 100644 --- a/noncore/apps/confedit/main.cpp +++ b/noncore/apps/confedit/main.cpp @@ -1,14 +1,13 @@ #include "mainwindow.h" -#include <qpe/qpeapplication.h> +#include <opie2/oapplication.h> int main( int argc, char ** argv ) { - - QPEApplication a( argc, argv ); + OApplication a( argc, argv, "confedit" ); MainWindow mw; mw.showMaximized(); a.showMainDocumentWidget( &mw ); return a.exec(); } diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 8e36980..58538af 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp @@ -1,54 +1,55 @@ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ // (c) 2002 Patrick S. Vogt <tille@handhelds.org> #include "mainwindow.h" -#include <qpe/qpemenubar.h> -#include <qpe/qpemessagebox.h> -#include <qpe/resource.h> -#include <qpe/config.h> -#include <qpe/qpetoolbar.h> -#include <qpe/qpeapplication.h> +#include <opie2/omenubar.h> +#include <opie2/omessagebox.h> +#include <opie2/oresource.h> +#include <opie2/oconfig.h> +#include <opie2/otoolbar.h> +#include <opie2/oapplication.h> #include <qaction.h> #include <qmessagebox.h> #include <qpopupmenu.h> #include <qtoolbutton.h> #include <qstring.h> #include <qlabel.h> #include <qfile.h> #include <qpushbutton.h> #include <qlayout.h> #include <qlineedit.h> +#include <qcursor.h> #include "listviewconfdir.h" #include "listviewitemconf.h" #include "listviewitemconfigentry.h" MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0) { setCaption( tr("Conf File Editor") ); // setBaseSize( qApp->globalStrut() ); setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); mainLayout = new QVBoxLayout( this ); mainLayout->setSpacing( 0 ); mainLayout->setMargin( 0 ); qDebug("creating settingList"); settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist"); settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); mainLayout->addWidget( settingList, 0); |