summaryrefslogtreecommitdiff
Unidiff
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,43 +1,40 @@
1 DESTDIR = $(OPIEDIR)/bin 1 CONFIG = qt warn_on release quick-app
2 TEMPLATE= app
3 #CONFIG = qt warn_on release
4 CONFIG = qt warn_on debug
5 HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h 2 HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
6 SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp 3 SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
7INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/ioclude 5 DEPENDPATH+= $(OPIEDIR)/ioclude
9 INTERFACES= 6 INTERFACES=
10LIBS += -lopiecore2 -lopieui2 7LIBS += -lopiecore2 -lopieui2
11 TARGET = confedit 8 TARGET = confedit
12 9
13TRANSLATIONS = ../../../i18n/de/confedit.ts \ 10TRANSLATIONS = ../../../i18n/de/confedit.ts \
14 ../../../i18n/nl/confedit.ts \ 11 ../../../i18n/nl/confedit.ts \
15 ../../../i18n/da/confedit.ts \ 12 ../../../i18n/da/confedit.ts \
16 ../../../i18n/xx/confedit.ts \ 13 ../../../i18n/xx/confedit.ts \
17 ../../../i18n/en/confedit.ts \ 14 ../../../i18n/en/confedit.ts \
18 ../../../i18n/es/confedit.ts \ 15 ../../../i18n/es/confedit.ts \
19 ../../../i18n/fr/confedit.ts \ 16 ../../../i18n/fr/confedit.ts \
20 ../../../i18n/hu/confedit.ts \ 17 ../../../i18n/hu/confedit.ts \
21 ../../../i18n/ja/confedit.ts \ 18 ../../../i18n/ja/confedit.ts \
22 ../../../i18n/ko/confedit.ts \ 19 ../../../i18n/ko/confedit.ts \
23 ../../../i18n/no/confedit.ts \ 20 ../../../i18n/no/confedit.ts \
24 ../../../i18n/pl/confedit.ts \ 21 ../../../i18n/pl/confedit.ts \
25 ../../../i18n/pt/confedit.ts \ 22 ../../../i18n/pt/confedit.ts \
26 ../../../i18n/pt_BR/confedit.ts \ 23 ../../../i18n/pt_BR/confedit.ts \
27 ../../../i18n/sl/confedit.ts \ 24 ../../../i18n/sl/confedit.ts \
28 ../../../i18n/zh_CN/confedit.ts \ 25 ../../../i18n/zh_CN/confedit.ts \
29 ../../../i18n/zh_TW/confedit.ts 26 ../../../i18n/zh_TW/confedit.ts
30 27
31 28
32!contains( platform, x11 ) { 29!contains( platform, x11 ) {
33 30
34 include ( $(OPIEDIR)/include.pro ) 31 include ( $(OPIEDIR)/include.pro )
35 LIBS += -lqpe 32 LIBS += -lqpe
36} 33}
37 34
38contains( platform, x11 ) { 35contains( platform, x11 ) {
39 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 36 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
40} 37}
41 38
42 39
43 40
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 @@
1 1
2#include "mainwindow.h" 2#include "mainwindow.h"
3
4#include <qpe/qpeapplication.h>
5#include <opie/oapplicationfactory.h> 3#include <opie/oapplicationfactory.h>
6 4
7OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 5OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
8
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
@@ -1,68 +1,68 @@
1/*************************************************************************** 1/***************************************************************************
2 * * 2 * *
3 * This program is free software; you can redistribute it and/or modify * 3 * This program is free software; you can redistribute it and/or modify *
4 * it under the terms of the GNU General Public License as published by * 4 * it under the terms of the GNU General Public License as published by *
5 * the Free Software Foundation; either version 2 of the License, or * 5 * the Free Software Foundation; either version 2 of the License, or *
6 * (at your option) any later version. * 6 * (at your option) any later version. *
7 * * 7 * *
8 ***************************************************************************/ 8 ***************************************************************************/
9 9
10// (c) 2002 Patrick S. Vogt <tille@handhelds.org> 10// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
11 11
12#ifndef MAINWINDOW_H 12#ifndef MAINWINDOW_H
13#define MAINWINDOW_H 13#define MAINWINDOW_H
14 14
15#include <qmainwindow.h> 15#include <qmainwindow.h>
16#include <qdialog.h> 16#include <qdialog.h>
17#include <qaction.h> 17#include <qaction.h>
18#include <qtimer.h> 18#include <qtimer.h>
19#include <qpopupmenu.h> 19#include <qpopupmenu.h>
20#include "editwidget.h" 20#include "editwidget.h"
21 21
22class QPEToolBar; 22class QPEToolBar;
23class ListViewItemConfFile; 23class ListViewItemConfFile;
24class ListViewConfDir; 24class ListViewConfDir;
25class ListViewItemConf; 25class ListViewItemConf;
26 26
27class MainWindow : public QMainWindow 27class MainWindow : public QMainWindow
28{ 28{
29 Q_OBJECT 29 Q_OBJECT
30 30
31 31
32public: 32public:
33 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 33 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
34 ~MainWindow(); 34 ~MainWindow();
35 35 static QString appName() { return QString::fromLatin1("confedit"); }
36 36
37public slots: 37public slots:
38 void setCurrent(QListViewItem*); 38 void setCurrent(QListViewItem*);
39 void groupChanged(const QString&); 39 void groupChanged(const QString&);
40 void keyChanged(const QString&); 40 void keyChanged(const QString&);
41 void valueChanged(const QString&); 41 void valueChanged(const QString&);
42 void showPopup(); 42 void showPopup();
43 void stopTimer( QListViewItem* ); 43 void stopTimer( QListViewItem* );
44 void saveConfFile(); 44 void saveConfFile();
45 void revertConfFile(); 45 void revertConfFile();
46 void removeConfFile(); 46 void removeConfFile();
47 47
48private: 48private:
49 ListViewConfDir *settingList; 49 ListViewConfDir *settingList;
50 EditWidget *editor; 50 EditWidget *editor;
51 QVBoxLayout *mainLayout; 51 QVBoxLayout *mainLayout;
52 ListViewItemConf *_item; 52 ListViewItemConf *_item;
53 ListViewItemConfigEntry *_currentItem; 53 ListViewItemConfigEntry *_currentItem;
54 ListViewItemConfFile *_fileItem; 54 ListViewItemConfFile *_fileItem;
55 QTimer *popupTimer; 55 QTimer *popupTimer;
56 QPopupMenu *popupMenuFile; 56 QPopupMenu *popupMenuFile;
57 QPopupMenu *popupMenuEntry; 57 QPopupMenu *popupMenuEntry;
58 QAction *popupActionSave; 58 QAction *popupActionSave;
59 QAction *popupActionRevert; 59 QAction *popupActionRevert;
60 QAction *popupActionDelete; 60 QAction *popupActionDelete;
61 QAction *popupActionNew; 61 QAction *popupActionNew;
62 //QAction *popupAction; 62 //QAction *popupAction;
63 //QAction *popupAction; 63 //QAction *popupAction;
64 64
65 void makeMenu(); 65 void makeMenu();
66}; 66};
67 67
68#endif 68#endif