summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
+TEMPLATE = lib
+CONFIG += qt plugin warn_on
+HEADERS = zkbwidget.h \
+ ../keyz-cfg/zkbcfg.h \
+ ../keyz-cfg/zkbnames.h \
+ ../keyz-cfg/zkbxml.h \
+ ../keyz-cfg/zkb.h
+SOURCES = zkbwidget.cpp \
+ ../keyz-cfg/zkbcfg.cpp \
+ ../keyz-cfg/zkbnames.cpp \
+ ../keyz-cfg/zkbxml.cpp \
+ ../keyz-cfg/zkb.cpp
+TARGET = zkbapplet
+DESTDIR = $(OPIEDIR)/plugins/applets
+INCLUDEPATH += $(OPIEDIR)/include ../keyz-cfg
+DEPENDPATH +=
+VERSION = 0.7.0
+LIBS += -lqpe -lopiecore2
+
+include ( $(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 @@
config ZKBAPPLET
boolean "zkbapplet (Switch hardware keyboard layout on the fly)"
- default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && KEYZCFG
+ default "y"
+ 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 @@
-TEMPLATE = lib
-CONFIG += qt plugin warn_on
-HEADERS = zkbwidget.h \
- ../../apps/keyz-cfg/zkbcfg.h \
- ../../apps/keyz-cfg/zkbnames.h \
- ../../apps/keyz-cfg/zkbxml.h \
- ../../apps/keyz-cfg/zkb.h
-SOURCES = zkbwidget.cpp \
- ../../apps/keyz-cfg/zkbcfg.cpp \
- ../../apps/keyz-cfg/zkbnames.cpp \
- ../../apps/keyz-cfg/zkbxml.cpp \
- ../../apps/keyz-cfg/zkb.cpp
-TARGET = zkbapplet
-DESTDIR = $(OPIEDIR)/plugins/applets
-INCLUDEPATH += $(OPIEDIR)/include ../../apps/keyz-cfg
-DEPENDPATH +=
-VERSION = 0.6.0
-LIBS += -lqpe
-
-include ( $(OPIEDIR)/include.pro )
+TEMPLATE = subdirs
+SUBDIRS = keyz-cfg zkbapplet
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 @@
-.moc
-categorydialog.cpp
-categorydialog.h
-infoform.cpp
-infoform.h
-newdialog.cpp
-newdialog.h
-passworddialog.cpp
-passworddialog.h
-searchdialog.cpp
-searchdialog.h
-wait.cpp
-wait.h
-Makefile
-Makefile.in
-moc*
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 @@
- config KEYZCFG
- boolean "keyz-cfg (configuration tool for keyz applet)"
- default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/packages b/packages
index 0fcc08a..d933e59 100644
--- a/packages
+++ b/packages
@@ -64,9 +64,8 @@ CONFIG_KBILL noncore/games/kbill kbill.pro
CONFIG_KCHECKERS noncore/games/kcheckers kcheckers.pro
CONFIG_KEYBOARD inputmethods/keyboard keyboard.pro
CONFIG_KEYPEBBLE noncore/comm/keypebble keypebble.pro
CONFIG_KEYVIEW development/keyview keyview.pro
-CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro
CONFIG_KJUMPX inputmethods/kjumpx kjumpx.pro
CONFIG_KPACMAN noncore/games/kpacman kpacman.pro
CONFIG_LANGUAGE noncore/settings/language language.pro
CONFIG_LAUNCHER core/launcher server.pro