Drop automake build support.

Add basic cmake build instructions in the INSTALL file.
Deleted empty file: NEWS.
Deleted obsolete file: kkbswitch.spec .
Some cleanup in the README, the "man" page and the "help" page files.
The man page as well as the icons have moved in their own folder.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/3/head
gregory guy 5 years ago
parent 8a53bde7e8
commit 9d191894a5
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4

3
.gitmodules vendored

@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"] [submodule "cmake"]
path = cmake path = cmake
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

@ -41,16 +41,16 @@ tde_setup_paths( )
##### optional stuff ##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
option( WITH_RU_UA_LAYOUT "Add Russian and Ukrainian keyboard" ${WITH_ALL_OPTIONS} ) option( WITH_RU_UA_LAYOUT "Add Russian and Ukrainian keyboard" ${WITH_ALL_OPTIONS} )
##### user requested modules ##### user requested modules
option( BUILD_ALL "Build all" ON ) option( BUILD_ALL "Build all" OFF )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
##### configure checks ##### configure checks
@ -69,26 +69,13 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
##### directories ##### directories
add_subdirectory( icons )
add_subdirectory( ${PROJECT_NAME} ) add_subdirectory( ${PROJECT_NAME} )
add_subdirectory( ${PROJECT_NAME}.upd ) add_subdirectory( ${PROJECT_NAME}.upd )
tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
##### man page
INSTALL(
FILES ${PROJECT_NAME}.1
DESTINATION ${MAN_INSTALL_DIR}/man1
COMPONENT doc
)
##### icons
tde_install_icons( ${PROJECT_NAME} )
##### write configure files ##### write configure files
configure_file( config.h.cmake config.h @ONLY ) configure_file( config.h.cmake config.h @ONLY )

@ -1,6 +1,27 @@
Basic Installation Basic Installation
================== ==================
Kkbswitch relies on cmake to build.
Here are suggested default options:
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON"
##### the following instructions, kept as a reference, are basically obsolete - October 17 2019 #####
These are generic installation instructions. These are generic installation instructions.
The `configure' shell script attempts to guess correct values for The `configure' shell script attempts to guess correct values for

@ -1,46 +0,0 @@
SUBDIRS = $(TOPSUBDIRS)
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
$(top_srcdir)/subdirs:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
package-messages:
cd $(top_srcdir) && $(MAKE) includedir=$(kde_includes) -f admin/Makefile.common package-messages
$(MAKE) -C po merge
EXTRA_DIST = admin COPYING configure.in.in Makefile.cvs kkbswitch.1\
configure.files Doxyfile kkbswitch.tdevelop kkbswitch.lsm \
kkbswitch.spec kkbswitch.xpm subdirs kkbswitch.sgml
man_MANS = kkbswitch.1
DISTCHECK_CONFIGURE_FLAGS = --disable-ru-ua-layout
KDE_OPTIONS = noautodist
dist-hook:
cd $(top_distdir) && perl admin/am_edit -padmin
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
# rm -f $(distdir)/kkbswitch.tdevelop.pcs
# rm -f $(distdir)/$(PACKAGE)-*.tar.gz
rpmdir = _rpm
specfile = $(PACKAGE).spec
rpm: $(specfile)
rm -rf $(rpmdir)
mkdir $(rpmdir)
mkdir -p rpms
cd $(rpmdir) && \
mkdir RPMS SRPMS SOURCES SPECS BUILD RPMS/i386 RPMS/noarch && \
cp ../$(specfile) SPECS && \
cp ../$(distdir).tar.gz SOURCES && \
rpmbuild --define "_topdir "`pwd` -ba SPECS/$(specfile) && \
cp SRPMS/* RPMS/*/* ../rpms && cd .. && rm -rf $(rpmdir)
KDE_ICON = kkbswitch

@ -1,10 +0,0 @@
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
$(MAKE) -f admin/Makefile.common cvs
dist:
$(MAKE) -f admin/Makefile.common dist
.SILENT:

@ -1 +0,0 @@

146
README

@ -1,81 +1,95 @@
NOTE: As of version 1.0 KKBSwitch has online documentation, so refer to it for KKBSwitch - a keyboard layout indicator for TDE.
more information. This README file will no longer be maintained, but the
documentation will instead.
KKBSwitch displays an icon in the system tray that indicates which
KKBSwitch layout is currently active and enables you to switch layouts by clicking
by Leonid Zeitlin <lz@europe.com> the icon or by selecting from the menu.
Version 1.0
KKBSwitch is a keyboard layout indicator for KDE 2. It is useful when you have It is useful when you have configured the XKeyboard extension of your
configured the XKeyboard extension of your X Server to have more than one Xorg Server to have more than one keyboard group, for example US/ASCII
keyboard group, for example US/ASCII and Russian. KKBSwitch displays an icon and Russian. It displays an icon in the system tray that indicates which
in the system tray that indicates which layout is currently active. Note that layout is currently active. Note that KKBSwitch does not help you
KKBSwitch does not help you configure XKeyboard, it merely serves as the configure XKeyboard, it merely serves as the indicator of the current
indicator of the current group. You still have to configure XKeyboard by group.
editing XF86Config file.
KKBSwitch features: Features include:
- displays an icon in the KDE's system tray indicating the active keyboard group - displays an icon in the system tray indicating the active keyboard
- you can switch keyboard groups by clicking the icon or selecting the group.
desired group from the icon's menu - Configurable icons for the keyboard layouts (chosen from country flag
- icons corresponding to different groups are configurable (chosen from country pixmaps that ship with TDE).
flag pixmaps that ship with KDE) - The "toggle mode" to toggle between the two most recently-used
- "Toggle mode" (see below for more). keyboard layouts.
- Choose to use a global layout, a per-application layout or
a per-window layout.
- Configurable keyboard shortcuts.
NB: You still have to configure XKeyboard with the usual xorg options
(XkbModel, XkbLayout, XkbVariant and XkbOptions).
Using KKBSwicth. Using KKBSwicth.
The most basic usage is simply to let it sit in the system tray and show you The most basic usage is simply to let it sit in the system tray and show
which keyboard group is currently active. You can also click the KKBSwicth you which keyboard group is currently active. You can also click the
system tray icon to switch keyboard layouts. When right-clicked, the system KKBSwicth system tray icon to switch keyboard layouts.
tray icon displays a menu with the following entries: When right-clicked, the system tray icon displays a menu with the
following entries:
- one or more entries corresponding to the configured keyboard groups
(XKeyboard can have up to 4 groups configured). The currently active
group will be checked.
- one or more entries corresponding to the configured keyboard groups (XKeyboard Selecting a menu entry corresponding to a group will make that group
can have up to 4 groups configured). The currently active group will be checked. active.
Selecting a menu entry corresponding to a group will make that group active.
- "Configure Keyboard Switch..." entry lets you configure KKBSwitch - "Configure Keyboard Switch..." entry lets you configure KKBSwitch
- "About Keyboard Switch" displays a standard "About" dialog - "About Keyboard Switch" displays a standard "About" dialog
- "Quit" quits KKBSwitch. - "Quit" quits KKBSwitch.
Configuring KKBSwicth. Configuring KKBSwicth.
In the KKBSwitch configuration dialog you can do the following: In the KKBSwitch configuration dialog you can do the following:
- set the icons corresponding to the available keyboard groups. Note that - set the icons corresponding to the available keyboard groups. Note
KKBSwitch will try hard to guess the correct icon based on the name of the that KKBSwitch will try hard to guess the correct icon based on the name
keyboard group (the names are configured in XKeyboard). For example, it will of the keyboard group (the names are configured in XKeyboard).
display the US flag for US/ASCII group, German flag for German group, Russian For example, it will display the US flag for US/ASCII group, German flag
flag for Russian group, etc. If it cannot guess an icon, it will display the for German group, Russian flag for Russian group, etc. If it cannot
"default" icon, which simply shows the group's number. Use the configuration guess an icon, it will display the "default" icon, which simply shows
dialog to customize the icons: select a group in the "Available keyboard groups" the group's number. Use the configuration dialog to customize the icons:
listbox, and click "Change icon..." button. You will be able to select from the - select a group in the "Available keyboard groups" listbox, and click
list of country flag pixmaps that is shipped with KDE. "Change icon..." button. You will be able to select from the list of
- turn the "Toggle mode" on and off. "Toggle mode" is a convient feature of country flag pixmaps that is shipped with TDE.
KKBSwitch, which is useful if you have more than 2 groups. When "Toggle mode" - turn the "Toggle mode" on and off. "Toggle mode" is a convient feature
is on, pressing the XKeyboard's group switch key or clicking KKBSwitch's tray of KKBSwitch, which is useful if you have more than 2 groups.
icon will toggle between the two most recently used groups. To activate the When "Toggle mode" is on, pressing the XKeyboard's group switch key or
third or the fourth (if available) group you'll need to right-click KKBSwitch's clicking KKBSwitch's tray icon will toggle between the two most recently
tray icon and select the desired group from the menu. For example, I have used groups. To activate the third or the fourth (if available) group
US/ASCII, Russian and Ukrainian layouts configured. Most of the time I use you'll need to right-click KKBSwitch's tray icon and select the desired
either US/ASCII or Russian layout and switch back and forth between them without group from the menu. For example, I have US/ASCII, Russian and Ukrainian
activating the rarely needed Ukrainian layout. But sometimes I need to write layouts configured. Most of the time I use either US/ASCII or Russian
something in Ukrainian, so I select this layout from the tray icon's menu. When layout and switch back and forth between them without activating the
"Toggle mode" is on, the two most recently used groups will be marked with an rarely needed Ukrainian layout. But sometimes I need to write something
asterisk in the KKBSwitch tray icon's menu. in Ukrainian, so I select this layout from the tray icon's menu. When
"Toggle mode" is on, the two most recently used groups will be marked
with an asterisk in the KKBSwitch tray icon's menu.
DCOP Bindings DCOP Bindings
As of version 0.2, KKBSwitch can be manipulated programmatically with DCOP. As of version 0.2, KKBSwitch can be manipulated programmatically with
It exports an interface named KBSwitchIntf. The interfaces offers the following DCOP. It exports an interface named KBSwitchIntf.
methods: The interfaces offers the following methods:
- int getNumKbdGroups() - returns the number of configured keyboard groups - int getNumKbdGroups() returns the number of configured keyboard
(layouts) groups (layouts)
- ASYNC selectNextGroup() - does the same thing as clicking on the KKBSwitch's - ASYNC selectNextGroup() does the same thing as clicking on the
tray icon, i.e. makes the next keyboard group active. If in "toggle mode", toggles KKBSwitch's tray icon, i.e. makes the next keyboard group active.
between the two recently used ones, just like clicking on the tray icon does. If in "toggle mode", toggles between the two recently used ones, just
- ASYNC selectGroup(int groupno) - makes the group whose number is groupno active like clicking on the tray icon does.
(like selecting a group from the tray icon popup menu) - ASYNC selectGroup(int groupno) makes the group whose number is
- QStringList getGroupNames() - returns the list of the keyboard group names, groupno active (like selecting a group from the tray icon popup menu)
as configured in XKeyboard. - TQStringList getGroupNames() returns the list of the keyboard group
names as configured in XKeyboard.

File diff suppressed because it is too large Load Diff

12012
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

@ -1 +0,0 @@
Subproject commit 68f23556e638353e46b444d3a4863a64936bd36a

@ -1,225 +0,0 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
/* Defines if your system has the crypt function */
#undef HAVE_CRYPT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have libjpeg */
#undef HAVE_LIBJPEG
/* Define if you have libpng */
#undef HAVE_LIBPNG
/* Define if you have a working libpthread (will enable threaded code) */
#undef HAVE_LIBPTHREAD
/* Define to 1 if you have the `xkbfile' library (-lxkbfile). */
#undef HAVE_LIBXKBFILE
/* Define if you have libz */
#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
/* Define if you have the res_init function */
#undef HAVE_RES_INIT
/* Define if you have a STL implementation by SGI */
#undef HAVE_SGI_STL
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have strlcat */
#undef HAVE_STRLCAT
/* Define if you have the strlcat prototype */
#undef HAVE_STRLCAT_PROTO
/* Define if you have strlcpy */
#undef HAVE_STRLCPY
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
/* Define to 1 if you have the <X11/extensions/XKBrules.h> header file. */
#undef HAVE_X11_EXTENSIONS_XKBRULES_H
/* Suffix for lib directories */
#undef KDELIBSUFF
/* Define a safe value for MAXPATHLEN */
#undef KDEMAXPATHLEN
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of a `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of a `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* The size of a `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
/*
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
* that defines bzero.
*/
#if defined(_AIX)
#include <strings.h>
#endif
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
# include <sys/time.h>
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#endif
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcat(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcpy(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
#if __STDC__
#include <stdarg.h>
#include <stdlib.h>
#else
#include <varargs.h>
#endif
#ifdef __cplusplus
extern "C"
#endif
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#ifdef __cplusplus
extern "C"
#endif
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
#endif
/* Compatibility define */
#undef ksize_t
/* Define the real type of socklen_t */
#undef socklen_t

@ -1,2 +0,0 @@
./admin/configure.in.min
configure.in.in

@ -1,104 +0,0 @@
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
dnl This file is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Library General Public
dnl License as published by the Free Software Foundation; either
dnl version 2 of the License, or (at your option) any later version.
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Library General Public License for more details.
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
dnl Boston, MA 02111-1307, USA.
# Original Author was Kalle@kde.org
# I lifted it in some mater. (Stephan Kulow)
# I used much code from Janos Farkas
dnl Process this file with autoconf to produce a configure script.
AC_INIT(acinclude.m4) dnl a source file from your sub dir
dnl This is so we can use kde-common
AC_CONFIG_AUX_DIR(admin)
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
unset CDPATH
dnl Checking host/target/build systems, for make, install etc.
AC_CANONICAL_SYSTEM
dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kkbswitch, 1.4.3) dnl searches for some needed programs
KDE_SET_PREFIX
dnl generate the config header
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_CHECK_COMPILERS
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
KDE_PROG_LIBTOOL
dnl for NLS support. Call them in this order!
dnl WITH_NLS is for the po files
AM_KDE_WITH_NLS
KDE_USE_TQT(3.0.0)
AC_PATH_KDE
#MIN_CONFIG(3.0.0)
dnl PACKAGE set before
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
AC_CHECK_HEADERS([X11/extensions/XKBrules.h], [], [], [
#include <stdio.h>
#include <X11/XKBlib.h>])
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $all_libraries"
AC_CHECK_LIB(xkbfile, XkbRF_GetNamesProp)
LDFLAGS="$save_LDFLAGS"
AC_ARG_ENABLE(ru-ua-layout,
[ --enable-ru-ua-layout Install Russian/Ukrainian layout file
(default: don't install)],
enable_ru_ua_layout="$enableval",
enable_ru_ua_layout="no")
AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
dnl set prefix according to installed KDE. Strange that KDE build scripts
dnl don't do it by default
AC_PREFIX_DEFAULT(`tde-config --prefix`)
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ])
AC_CONFIG_FILES([ doc/en/Makefile ])
AC_CONFIG_FILES([ kkbswitch/Makefile ])
AC_CONFIG_FILES([ kkbswitch.upd/Makefile ])
AC_CONFIG_FILES([ po/Makefile ])
AC_OUTPUT
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
fi
else
echo ""
echo "Good - your configure finished. Start make now"
echo ""
fi

@ -1,27 +0,0 @@
#MIN_CONFIG(3.0.0)
AM_INIT_AUTOMAKE(kkbswitch, 1.4.3)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
AC_CHECK_HEADERS([X11/extensions/XKBrules.h], [], [], [
#include <stdio.h>
#include <X11/XKBlib.h>])
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $all_libraries"
AC_CHECK_LIB(xkbfile, XkbRF_GetNamesProp)
LDFLAGS="$save_LDFLAGS"
AC_ARG_ENABLE(ru-ua-layout,
[ --enable-ru-ua-layout Install Russian/Ukrainian layout file
(default: don't install)],
enable_ru_ua_layout="$enableval",
enable_ru_ua_layout="no")
AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
dnl set prefix according to installed KDE. Strange that KDE build scripts
dnl don't do it by default
AC_PREFIX_DEFAULT(`tde-config --prefix`)

@ -1,6 +0,0 @@
# the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir
KDE_LANG = en
KDE_DOCS = kkbswitch
SUBDIRS = $(AUTODIRS)

@ -1,13 +0,0 @@
KDE_DOCS = kkbswitch
KDE_LANG = en
.PHONY: html
html: HTML/index.html
HTML/index.html: $(srcdir)/index.docbook
rm -fr HTML
mkdir HTML
(cd HTML && meinproc --check --stylesheet $(KDE_XSL_STYLESHEET) ../$(srcdir)/index.docbook && ln -s /usr/share/doc/HTML/en/common; \
for name in ../$(srcdir)/*.png; do ln -s $$name; done)

@ -46,7 +46,7 @@
<abstract> <abstract>
<para> <para>
&kkbswitch; is a keyboard layout indicator for &kde;. &kkbswitch; is a keyboard layout indicator for &tde;.
</para> </para>
</abstract> </abstract>
@ -65,7 +65,7 @@
<title>Introduction</title> <title>Introduction</title>
<para> <para>
&kkbswitch; is a keyboard layout indicator for &kde; 2 or 3. It is useful when &kkbswitch; is a keyboard layout indicator for &tde;. It is useful when
you have configured the XKeyboard extension of your X Server to have more than you have configured the XKeyboard extension of your X Server to have more than
one keyboard group (layout), for example US/ASCII and Russian. &kkbswitch; one keyboard group (layout), for example US/ASCII and Russian. &kkbswitch;
displays an icon in the system tray that indicates which layout is currently displays an icon in the system tray that indicates which layout is currently
@ -74,10 +74,8 @@ serves as the indicator of the current layout. You still have to configure
XKeyboard by editing the <filename>XF86Config</filename> file. XKeyboard by editing the <filename>XF86Config</filename> file.
</para> </para>
<para> <para>
Please report any problems or feature requests to the author, Leonid Please report any problems or feature requests to the Trinity Desktop Environment project.
Zeitlin, at the address <email>lz@europe.com</email>.
</para> </para>
</chapter> </chapter>
<chapter id="using-kapp"> <chapter id="using-kapp">
@ -154,7 +152,7 @@ This style displays the two-letter ISO language code corresponding to the curren
<varlistentry> <varlistentry>
<term>Flag and code</term> <term>Flag and code</term>
<listitem><para> <listitem><para>
This style displays the language code against the background of a country flag. This style mimics &kde;'s <application>kxkb</application> application. This style displays the language code against the background of a country flag. This style mimics &tde;'s <application>kxkb</application> application.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -400,7 +398,7 @@ active (like selecting a layout from the tray icon popup menu).
<funcsynopsis> <funcsynopsis>
<funcprototype> <funcprototype>
<funcdef>QStringList <function>getGroupNames</function></funcdef> <funcdef>TQStringList <function>getGroupNames</function></funcdef>
<void/> <void/>
</funcprototype> </funcprototype>
</funcsynopsis> </funcsynopsis>
@ -541,63 +539,23 @@ Documentation copyright 2001-2005 Leonid Zeitlin <email>lz@europe.com</email>
<title>How to obtain &kkbswitch;</title> <title>How to obtain &kkbswitch;</title>
<para> <para>
&kkbswitch; has a home page at SourceForge: &kkbswitch; is part of the Trinity Desktop Environment project:
<ulink url="http://kkbswitch.sourceforge.net"> <ulink url="http://trinitydesktop.org/">http://trinitydesktop.org</ulink>. Check there for the latest news.
http://kkbswitch.sourceforge.net</ulink>. Check there for the latest news. The latest version is available for download from the project page: <ulink url="http://sourceforge.net/projects/kkbswitch">
http://sourceforge.net/projects/kkbswitch</ulink>.
</para>
<!-- <para>
&kkbswitch; can be found in the at the <ulink
url="http://apps.kde.com/">apps.kde.com</ulink> site at <ulink
url="http://ftp.kde.com/Desktop/Utilities/KKBSwitch/">
http://ftp.kde.com/Desktop/Utilities/KKBSwitch/</ulink>
</para> </para>
<para>
&kkbswitch; doesn't have a homepage yet. For the latest version check <ulink
url="http://apps.kde.com/">apps.kde.com</ulink>
</para> -->
</sect1> </sect1>
<sect1 id="requirements"> <sect1 id="requirements">
<title>Requirements</title> <title>Requirements</title>
<para> <para>
&kkbswitch; doesn't require any special environment to compile and run besides &kkbswitch; doesn't require any special environment to compile and run besides
the standard &kde; 2 or 3 tdelibs and tdebase. the standard &tde; tdelibs and tdebase.
</para> </para>
</sect1> </sect1>
<sect1 id="compilation"> <sect1 id="compilation">
<title>Compilation and Installation</title> <title>Compilation and Installation</title>
<para> <para>
In order to compile and install &kkbswitch; on your system, type the following &kkbswitch; relies on cmake to build, please read the INSTALL file.
in the base directory of the &kkbswitch; distribution:
<screen width="40">
<prompt>&percnt;</prompt> <userinput>./configure</userinput>
<prompt>&percnt;</prompt> <userinput>make</userinput>
<prompt>&percnt;</prompt> <userinput>make install</userinput>
</screen>
</para>
<para>
Options you may want or need to give to the <command>configure</command> command are:
</para>
<simplelist>
<member>
<option>--prefix</option>=<replaceable>dir</replaceable> - set the prefix where your &kde; installation is located. Alternatively, you can set $<envar>TDEDIR</envar> environment variable to the &kde; directory. Under regular circumstances, the configuration script will find the &kde; location automatically; use this option only if you are having problems without it.
</member>
<member>
<option>--enable-ru-ua-layout</option> - install the Russian/Ukrainian layout file (described in <xref linkend="ru_ua"/>). This option is useful for users of XFree86 prior to version 4.3, who want to use Russian/Ukrainian layout file. Note that with this option it is not possible to install &kkbswitch; without root privileges, because the layout file <emphasis>must</emphasis> go to the system XKB layout directory where ordinary users don't have write access.
</member>
<member>
<option>--without-arts</option> - do not check for &arts; development headers. &arts; is &kde;'s multimedia framework, which &kkbswitch; does not use. However, since &kkbswitch; uses standard &kde; configuration macros, the configuration script will check for &arts; headers and complain if they are not found. If this happens to you, specify this option to compile &kkbswitch;. Alternatively, install &arts; development headers, you'll need them one day.
</member>
</simplelist>
<para>
Since &kkbswitch; uses autoconf and automake you should have not trouble
compiling it. &kkbswitch; was tested under several versions of &Linux; and FreeBSD,
and a FreeBSD port is available.
</para> </para>
<para> <para>
@ -680,16 +638,3 @@ sgml-indent-step:0
sgml-indent-data:nil sgml-indent-data:nil
End: End:
--> -->

@ -0,0 +1,5 @@
INSTALL(
FILES ${PROJECT_NAME}.1
DESTINATION ${MAN_INSTALL_DIR}/man1
COMPONENT doc
)

@ -6,10 +6,10 @@
.TH "KKBSWITCH" "1" "06 November 2004" "" "" .TH "KKBSWITCH" "1" "06 November 2004" "" ""
.SH NAME .SH NAME
kkbswitch \- A keyboard layout indicator for KDE 3. kkbswitch \- A keyboard layout indicator for TDE.
.SH SYNOPSIS .SH SYNOPSIS
\fBkkbswitch\fR [ \fB\-\-help\fI\fB\fR ] [ \fB\-\-help-kde\fI\fB\fR ] [ \fB\-\-help-qt\fI\fB\fR ] [ \fB\-\-version\fI \-v\fB\fR ] [ \fB\-\-license\fI\fB\fR ] [ \fB\-\-author\fI\fB\fR ] [ \fB\-\-caption <caption>\fI\fB\fR ] [ \fB\-\-icon <icon>\fI\fB\fR ] [ \fB\-\-miniicon <icon>\fI\fB\fR ] [ \fB\-\-dcopserver <server>\fI\fB\fR ] [ \fB\-\-nocrashhandler\fI\fB\fR ] [ \fB\-\-waitforwm\fI\fB\fR ] [ \fB\-\-style <style>\fI\fB\fR ] [ \fB\-\-geometry <geometry>\fI\fB\fR ] [ \fB\-\-display <display>\fI\fB\fR ] [ \fB\-\-session <sessionid>\fI\fB\fR ] [ \fB\-\-cmap\fI\fB\fR ] [ \fB\-\-ncols <columns>\fI\fB\fR ] [ \fB\-\-nograb\fI\fB\fR ] [ \fB\-\-dograb\fI\fB\fR ] [ \fB\-\-sync\fI\fB\fR ] [ \fB\-\-font\fI \-\-fn <fontname>\fB\fR ] [ \fB\-\-background\fI \-\-bg <colour>\fB\fR ] [ \fB\-\-button\fI \-\-btn <colour>\fB\fR ] [ \fB\-\-name\fI <name>\fB\fR ] [ \fB\-\-title\fI <title>\fB\fR ] [ \fB\-\-visual\fI TrueColor\fB\fR ] [ \fB\-\-inputstyle\fI <style>\fB\fR ] [ \fB\-\-im\fI <server>\fB\fR ] [ \fB\-\-noxim\fI\fB\fR ] \fBkkbswitch\fR [ \fB\-\-help\fI\fB\fR ] [ \fB\-\-help-tde\fI\fB\fR ] [ \fB\-\-help-qt\fI\fB\fR ] [ \fB\-\-version\fI \-v\fB\fR ] [ \fB\-\-license\fI\fB\fR ] [ \fB\-\-author\fI\fB\fR ] [ \fB\-\-caption <caption>\fI\fB\fR ] [ \fB\-\-icon <icon>\fI\fB\fR ] [ \fB\-\-miniicon <icon>\fI\fB\fR ] [ \fB\-\-dcopserver <server>\fI\fB\fR ] [ \fB\-\-nocrashhandler\fI\fB\fR ] [ \fB\-\-waitforwm\fI\fB\fR ] [ \fB\-\-style <style>\fI\fB\fR ] [ \fB\-\-geometry <geometry>\fI\fB\fR ] [ \fB\-\-display <display>\fI\fB\fR ] [ \fB\-\-session <sessionid>\fI\fB\fR ] [ \fB\-\-cmap\fI\fB\fR ] [ \fB\-\-ncols <columns>\fI\fB\fR ] [ \fB\-\-nograb\fI\fB\fR ] [ \fB\-\-dograb\fI\fB\fR ] [ \fB\-\-sync\fI\fB\fR ] [ \fB\-\-font\fI \-\-fn <fontname>\fB\fR ] [ \fB\-\-background\fI \-\-bg <colour>\fB\fR ] [ \fB\-\-button\fI \-\-btn <colour>\fB\fR ] [ \fB\-\-name\fI <name>\fB\fR ] [ \fB\-\-title\fI <title>\fB\fR ] [ \fB\-\-visual\fI TrueColor\fB\fR ] [ \fB\-\-inputstyle\fI <style>\fB\fR ] [ \fB\-\-im\fI <server>\fB\fR ] [ \fB\-\-noxim\fI\fB\fR ]
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
@ -25,7 +25,7 @@ Instead, it has documentation in the KDE handbook format; see below.
It is useful when you have configured the XKeyboard extension of your X Server to have more than one keyboard group (layout), for example US/ASCII and Russian. It is useful when you have configured the XKeyboard extension of your X Server to have more than one keyboard group (layout), for example US/ASCII and Russian.
KKBSwitch displays an icon in the system tray that indicates which layout is currently active and enables layout switching by clicking the icon or by right click and selecting layout from a popup menu. Note that KKBSwitch does not help you configure XKeyboard. KKBSwitch displays an icon in the system tray that indicates which layout is currently active and enables layout switching by clicking the icon or by right click and selecting layout from a popup menu. Note that KKBSwitch does not help you configure XKeyboard.
This means that you still have to configure XKeyboard by editing the XF86Config file or use a setup program to do it for you. This means that you still have to configure XKeyboard by editing the XF86Config file or use a setup program to do it for you.
KKBSwitch is a KDE application, but is reported to work under GNOME as well. KKBSwitch is a TDE application, but is reported to work under GNOME as well.
.SH "OPTIONS" .SH "OPTIONS"
.PP .PP
These programs follow the usual GNU command line syntax, These programs follow the usual GNU command line syntax,
@ -123,7 +123,7 @@ Sets X Input Method (XIM) server.
Disables X Input Method (XIM) support. Disables X Input Method (XIM) support.
.SH "SEE ALSO" .SH "SEE ALSO"
.PP .PP
This program includes documentation in the format of KDE handbook available in /usr/share/doc/kde/HTML/en/kkbswitch/ or by help option in the user interface. This program includes documentation in the format of TDE handbook available in /usr/share/doc/kde/HTML/en/kkbswitch/ or by help option in the user interface.
.SH "AUTHOR" .SH "AUTHOR"
.PP .PP
This manual page was written by Shlomi Loubaton <shlomister@gmail.com> for This manual page was written by Shlomi Loubaton <shlomister@gmail.com> for

@ -0,0 +1,3 @@
##### icons
tde_install_icons( ${PROJECT_NAME} )

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 772 B

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -1,104 +0,0 @@
# This spec file was generated using Kpp
# If you find any problems with this spec file please report
# the error to ian geiser <geiseri@msoe.edu>
# build with --without ru_ua_layout to disable installation
# of ru_ua XKB layout file
Summary: Keyboard layout indicator for KDE
Name: kkbswitch
Version: 1.4.3
Release: 1
License: GPL
Vendor: Leonid Zeitlin <lz@europe.com>
Url: http://kkbswitch.sourceforge.net
Packager: Leonid Zeitlin <lz@europe.com>
Group: User Interface/Desktops
Source: kkbswitch-%{version}.tar.gz
BuildRequires: tdelibs-devel
BuildRoot: %{_tmppath}/kkbswitch-root
%description
KKBSwitch is a keyboard layout indicator for KDE. It is useful when
you have configured the XKeyboard extension of your X Server to have more
than one keyboard group (layout), for example US/ASCII and Russian.
KKBSwitch displays an icon in the system tray that indicates which layout
is currently active. Note that KKBSwitch does not help you configure
XKeyboard, it merely serves as the indicator of the current layout. You
still have to configure XKeyboard by editing the XF86Config file.
%prep
%setup
%build
export TDEDIR=%{_prefix}
# Workaround for legacy auto* tools
#[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
#[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5?
#autoheader
#[ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
#[ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
#export PATH=`pwd`:$PATH
# End workaround
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
--prefix=%{_prefix} --mandir=%{_mandir} $LOCALFLAGS \
%{?_with_ru_ua_layout:--enable-ru-ua-layout}
# Setup for parallel builds
numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
if [ "$numprocs" = "0" ]; then
numprocs=1
fi
make -j$numprocs
%install
make install-strip DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc %{_docdir}/HTML/*/kkbswitch/*
%{_bindir}/kkbswitch
%{_datadir}/applnk/Utilities/kkbswitch.desktop
%{_datadir}/apps/kkbswitch/*
%{_datadir}/apps/tdeconf_update/kkbswitch.upd
%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
%{_datadir}/locale/*/LC_MESSAGES/kkbswitch.mo
%{_datadir}/autostart/kkbswitch.desktop
%{_mandir}/man1/kkbswitch.1*
%if 0%{?_with_ru_ua_layout:1}
/usr/X11R6/lib/X11/xkb/symbols/ru_ua
%endif
%changelog
* Sat Jan 15 2005 Leonid Zeitlin <lz@europe.com> 1.4.2
- Version 1.4.3
* Sat Nov 13 2004 Leonid Zeitlin <lz@europe.com> 1.4.2-2
- Added explicit BuildRequires: tdelibs-devel
- Don't use %configure, it causes binary to be named something like
i686-redhat-linux-gnu-kkbswitch on older (RH 7.3) systems
* Sat Nov 6 2004 Leonid Zeitlin <lz@europe.com>
- Version 1.4.2
* Tue Jun 15 2004 Leonid Zeitlin <lz@europe.com>
- Version 1.4.1
* Sat May 8 2004 Leonid Zeitlin <lz@europe.com>
- Version 1.4
- provide files list explicitly
- --without ru_ua_layout support
* Thu Jan 8 2004 Leonid Zeitlin <lz@europe.com>
- Version 1.3.2
* Sun Nov 2 2003 Leonid Zeitlin <lz@europe.com>
- Version 1.3.1
* Tue Oct 21 2003 Leonid Zeitlin <lz@europe.com>
- Version 1.3

@ -1,4 +0,0 @@
updatedir = $(kde_datadir)/tdeconf_update
update_SCRIPTS = kkbswitch_update_14_icons kkbswitch_update_14_options
update_DATA = kkbswitch.upd

@ -1,29 +0,0 @@
METASOURCES = AUTO
bin_PROGRAMS = kkbswitch
kkbswitch_LDFLAGS = $(KDE_RPATH) $(all_libraries)
kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdlg.cpp kbgroup.cpp kbpickicondlg.cpp kbswitchapp.cpp kbswitchintf.cpp kbswitchtrayicon.cpp main.cpp pathlistboxitem.cpp xkeyboard.cpp kbswitchintf.skel boldlistboxitem.h boldmenuitem.h kbconfigdlg.h kbconfig.h kbgroup.h kbpickicondlg.h kbswitchapp.h kbswitchintf.h kbswitchtrayicon.h pathlistboxitem.h xkeyboard.h windowwatcher.cpp singlewindowwatcher.cpp windowclasswatcher.cpp
INCLUDES = $(all_includes)
kkbswitch_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lDCOP
messages:
$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot
noinst_HEADERS = windowwatcher.h singlewindowwatcher.h windowclasswatcher.h
kkbswitchdatadir = $(kde_datadir)/kkbswitch
kkbswitchdata_DATA = group_names
applnkUtilities_DATA = kkbswitch.desktop
applnkUtilitiesdir = $(kde_appsdir)/Utilities
if ENABLE_RU_UA_LAYOUT
xkbsymbolsdir = $(x_libraries)/X11/xkb/symbols
xkbsymbols_DATA = ru_ua
endif
autostartdir = $(prefix)/share/autostart
autostart_DATA = kkbswitch.desktop

@ -1 +0,0 @@
POFILES = AUTO

@ -1,4 +0,0 @@
doc
kkbswitch
kkbswitch.upd
po
Loading…
Cancel
Save