summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/confedit/confedit.pro7
-rw-r--r--noncore/apps/confedit/main.cpp3
-rw-r--r--noncore/apps/confedit/mainwindow.h2
3 files changed, 3 insertions, 9 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index d2629de..06cd8ab 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,39 +1,36 @@
-DESTDIR = $(OPIEDIR)/bin
-TEMPLATE = app
-#CONFIG = qt warn_on release
-CONFIG = qt warn_on debug
+CONFIG = qt warn_on release quick-app
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
+INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/ioclude
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/main.cpp b/noncore/apps/confedit/main.cpp
index 74923c8..7a312c3 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,8 +1,5 @@
#include "mainwindow.h"
-
-#include <qpe/qpeapplication.h>
#include <opie/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
-
diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h
index 878558a..96331db 100644
--- a/noncore/apps/confedit/mainwindow.h
+++ b/noncore/apps/confedit/mainwindow.h
@@ -3,65 +3,65 @@
* 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>
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <qmainwindow.h>
#include <qdialog.h>
#include <qaction.h>
#include <qtimer.h>
#include <qpopupmenu.h>
#include "editwidget.h"
class QPEToolBar;
class ListViewItemConfFile;
class ListViewConfDir;
class ListViewItemConf;
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
~MainWindow();
-
+ static QString appName() { return QString::fromLatin1("confedit"); }
public slots:
void setCurrent(QListViewItem*);
void groupChanged(const QString&);
void keyChanged(const QString&);
void valueChanged(const QString&);
void showPopup();
void stopTimer( QListViewItem* );
void saveConfFile();
void revertConfFile();
void removeConfFile();
private:
ListViewConfDir *settingList;
EditWidget *editor;
QVBoxLayout *mainLayout;
ListViewItemConf *_item;
ListViewItemConfigEntry *_currentItem;
ListViewItemConfFile *_fileItem;
QTimer *popupTimer;
QPopupMenu *popupMenuFile;
QPopupMenu *popupMenuEntry;
QAction *popupActionSave;
QAction *popupActionRevert;
QAction *popupActionDelete;
QAction *popupActionNew;
// QAction *popupAction;
// QAction *popupAction;
void makeMenu();
};