summaryrefslogtreecommitdiff
authoralwin <alwin>2004-08-01 21:26:02 (UTC)
committer alwin <alwin>2004-08-01 21:26:02 (UTC)
commitcd26bd549ac20b73039bab11662d627895f37c1a (patch) (unidiff)
treea1840bf1e13ca4ff1b43572db8194eacdcbe091d
parent9084969d2d4fa39d4d2c185695f0c88739a0f95c (diff)
downloadopie-cd26bd549ac20b73039bab11662d627895f37c1a.zip
opie-cd26bd549ac20b73039bab11662d627895f37c1a.tar.gz
opie-cd26bd549ac20b73039bab11662d627895f37c1a.tar.bz2
reorganized zkbapplet for easier packaging within OE
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/zkbapplet/applet/applet.pro20
-rw-r--r--noncore/applets/zkbapplet/applet/zkbwidget.cpp (renamed from noncore/applets/zkbapplet/zkbwidget.cpp)0
-rw-r--r--noncore/applets/zkbapplet/applet/zkbwidget.h (renamed from noncore/applets/zkbapplet/zkbwidget.h)0
-rw-r--r--noncore/applets/zkbapplet/config.in4
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp (renamed from noncore/apps/keyz-cfg/cfgdlg.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/cfgdlg.h (renamed from noncore/apps/keyz-cfg/cfgdlg.h)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/cfgfile.cpp (renamed from noncore/apps/keyz-cfg/cfgfile.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/cfgfile.h (renamed from noncore/apps/keyz-cfg/cfgfile.h)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro (renamed from noncore/apps/keyz-cfg/keyz-cfg.pro)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/main.cpp (renamed from noncore/apps/keyz-cfg/main.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkb.cpp (renamed from noncore/apps/keyz-cfg/zkb.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkb.h (renamed from noncore/apps/keyz-cfg/zkb.h)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp (renamed from noncore/apps/keyz-cfg/zkbcfg.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbcfg.h (renamed from noncore/apps/keyz-cfg/zkbcfg.h)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp (renamed from noncore/apps/keyz-cfg/zkbnames.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbnames.h (renamed from noncore/apps/keyz-cfg/zkbnames.h)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbxml.cpp (renamed from noncore/apps/keyz-cfg/zkbxml.cpp)0
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbxml.h (renamed from noncore/apps/keyz-cfg/zkbxml.h)0
-rw-r--r--noncore/applets/zkbapplet/zkbapplet.pro22
-rw-r--r--noncore/apps/keyz-cfg/.cvsignore16
-rw-r--r--noncore/apps/keyz-cfg/config.in4
-rw-r--r--packages1
22 files changed, 24 insertions, 43 deletions
diff --git a/noncore/applets/zkbapplet/applet/applet.pro b/noncore/applets/zkbapplet/applet/applet.pro
new file mode 100644
index 0000000..20a4c89
--- a/dev/null
+++ b/noncore/applets/zkbapplet/applet/applet.pro
@@ -0,0 +1,20 @@
1TEMPLATE = lib
2CONFIG += qt plugin warn_on
3HEADERS = zkbwidget.h \
4 ../keyz-cfg/zkbcfg.h \
5 ../keyz-cfg/zkbnames.h \
6 ../keyz-cfg/zkbxml.h \
7 ../keyz-cfg/zkb.h
8SOURCES = zkbwidget.cpp \
9 ../keyz-cfg/zkbcfg.cpp \
10 ../keyz-cfg/zkbnames.cpp \
11 ../keyz-cfg/zkbxml.cpp \
12 ../keyz-cfg/zkb.cpp
13TARGET = zkbapplet
14DESTDIR = $(OPIEDIR)/plugins/applets
15INCLUDEPATH += $(OPIEDIR)/include ../keyz-cfg
16DEPENDPATH +=
17VERSION = 0.7.0
18LIBS += -lqpe -lopiecore2
19
20include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
index 8499500..8499500 100644
--- a/noncore/applets/zkbapplet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
diff --git a/noncore/applets/zkbapplet/zkbwidget.h b/noncore/applets/zkbapplet/applet/zkbwidget.h
index 9bce85a..9bce85a 100644
--- a/noncore/applets/zkbapplet/zkbwidget.h
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.h
diff --git a/noncore/applets/zkbapplet/config.in b/noncore/applets/zkbapplet/config.in
index 3e02fdd..b3d3fc5 100644
--- a/noncore/applets/zkbapplet/config.in
+++ b/noncore/applets/zkbapplet/config.in
@@ -1,4 +1,4 @@
1 config ZKBAPPLET 1 config ZKBAPPLET
2 boolean "zkbapplet (Switch hardware keyboard layout on the fly)" 2 boolean "zkbapplet (Switch hardware keyboard layout on the fly)"
3 default "n" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && KEYZCFG 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/apps/keyz-cfg/cfgdlg.cpp b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
index 8d868d4..8d868d4 100644
--- a/noncore/apps/keyz-cfg/cfgdlg.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
diff --git a/noncore/apps/keyz-cfg/cfgdlg.h b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.h
index cbefdf1..cbefdf1 100644
--- a/noncore/apps/keyz-cfg/cfgdlg.h
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.h
diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/applets/zkbapplet/keyzcfg/cfgfile.cpp
index be7150e..be7150e 100644
--- a/noncore/apps/keyz-cfg/cfgfile.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgfile.cpp
diff --git a/noncore/apps/keyz-cfg/cfgfile.h b/noncore/applets/zkbapplet/keyzcfg/cfgfile.h
index 9759900..9759900 100644
--- a/noncore/apps/keyz-cfg/cfgfile.h
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgfile.h
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.pro b/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro
index 7ac604b..7ac604b 100644
--- a/noncore/apps/keyz-cfg/keyz-cfg.pro
+++ b/noncore/applets/zkbapplet/keyzcfg/keyzcfg.pro
diff --git a/noncore/apps/keyz-cfg/main.cpp b/noncore/applets/zkbapplet/keyzcfg/main.cpp
index 4615562..4615562 100644
--- a/noncore/apps/keyz-cfg/main.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/main.cpp
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/applets/zkbapplet/keyzcfg/zkb.cpp
index a357b88..a357b88 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkb.cpp
diff --git a/noncore/apps/keyz-cfg/zkb.h b/noncore/applets/zkbapplet/keyzcfg/zkb.h
index deff869..deff869 100644
--- a/noncore/apps/keyz-cfg/zkb.h
+++ b/noncore/applets/zkbapplet/keyzcfg/zkb.h
diff --git a/noncore/apps/keyz-cfg/zkbcfg.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp
index 24bd897..24bd897 100644
--- a/noncore/apps/keyz-cfg/zkbcfg.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp
diff --git a/noncore/apps/keyz-cfg/zkbcfg.h b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.h
index dc1ac07..dc1ac07 100644
--- a/noncore/apps/keyz-cfg/zkbcfg.h
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.h
diff --git a/noncore/apps/keyz-cfg/zkbnames.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
index b2180ba..b2180ba 100644
--- a/noncore/apps/keyz-cfg/zkbnames.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
diff --git a/noncore/apps/keyz-cfg/zkbnames.h b/noncore/applets/zkbapplet/keyzcfg/zkbnames.h
index 0d1e7f5..0d1e7f5 100644
--- a/noncore/apps/keyz-cfg/zkbnames.h
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbnames.h
diff --git a/noncore/apps/keyz-cfg/zkbxml.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbxml.cpp
index 5b0084c..5b0084c 100644
--- a/noncore/apps/keyz-cfg/zkbxml.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbxml.cpp
diff --git a/noncore/apps/keyz-cfg/zkbxml.h b/noncore/applets/zkbapplet/keyzcfg/zkbxml.h
index 2b15cbb..2b15cbb 100644
--- a/noncore/apps/keyz-cfg/zkbxml.h
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbxml.h
diff --git a/noncore/applets/zkbapplet/zkbapplet.pro b/noncore/applets/zkbapplet/zkbapplet.pro
index d270c28..cf60af2 100644
--- a/noncore/applets/zkbapplet/zkbapplet.pro
+++ b/noncore/applets/zkbapplet/zkbapplet.pro
@@ -1,20 +1,2 @@
1TEMPLATE = lib 1TEMPLATE = subdirs
2CONFIG += qt plugin warn_on 2SUBDIRS = keyz-cfg zkbapplet
3HEADERS = zkbwidget.h \
4 ../../apps/keyz-cfg/zkbcfg.h \
5 ../../apps/keyz-cfg/zkbnames.h \
6 ../../apps/keyz-cfg/zkbxml.h \
7 ../../apps/keyz-cfg/zkb.h
8SOURCES = zkbwidget.cpp \
9 ../../apps/keyz-cfg/zkbcfg.cpp \
10 ../../apps/keyz-cfg/zkbnames.cpp \
11 ../../apps/keyz-cfg/zkbxml.cpp \
12 ../../apps/keyz-cfg/zkb.cpp
13TARGET = zkbapplet
14DESTDIR = $(OPIEDIR)/plugins/applets
15INCLUDEPATH += $(OPIEDIR)/include ../../apps/keyz-cfg
16DEPENDPATH +=
17VERSION = 0.6.0
18LIBS += -lqpe
19
20include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/keyz-cfg/.cvsignore b/noncore/apps/keyz-cfg/.cvsignore
deleted file mode 100644
index a8916d5..0000000
--- a/noncore/apps/keyz-cfg/.cvsignore
+++ b/dev/null
@@ -1,16 +0,0 @@
1.moc
2categorydialog.cpp
3categorydialog.h
4infoform.cpp
5infoform.h
6newdialog.cpp
7newdialog.h
8passworddialog.cpp
9passworddialog.h
10searchdialog.cpp
11searchdialog.h
12wait.cpp
13wait.h
14Makefile
15Makefile.in
16moc*
diff --git a/noncore/apps/keyz-cfg/config.in b/noncore/apps/keyz-cfg/config.in
deleted file mode 100644
index 8e1be2d..0000000
--- a/noncore/apps/keyz-cfg/config.in
+++ b/dev/null
@@ -1,4 +0,0 @@
1 config KEYZCFG
2 boolean "keyz-cfg (configuration tool for keyz applet)"
3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/packages b/packages
index 0fcc08a..d933e59 100644
--- a/packages
+++ b/packages
@@ -60,17 +60,16 @@ CONFIG_HOMEAPPLET core/applets/homeapplet homeapplet.pro
60 CONFIG_INTERFACES noncore/settings/networksettings/interfacesinterfaces.pro 60 CONFIG_INTERFACES noncore/settings/networksettings/interfacesinterfaces.pro
61 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro 61 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro
62 CONFIG_JUMPX inputmethods/jumpxjumpx.pro 62 CONFIG_JUMPX inputmethods/jumpxjumpx.pro
63 CONFIG_KBILL noncore/games/kbillkbill.pro 63 CONFIG_KBILL noncore/games/kbillkbill.pro
64 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro 64 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro
65 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro 65 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro
66 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro 66 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro
67 CONFIG_KEYVIEW development/keyviewkeyview.pro 67 CONFIG_KEYVIEW development/keyviewkeyview.pro
68CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro
69 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro 68 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro
70 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro 69 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro
71 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro 70 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro
72 CONFIG_LAUNCHER core/launcherserver.pro 71 CONFIG_LAUNCHER core/launcherserver.pro
73 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro 72 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro
74 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro 73 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro
75 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro 74 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro
76 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro 75 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro