.gitmodules

diff --git a/.gitmodules b/.gitmodules

index 4fce771..5b98c56 100644

--- a/.gitmodules

+++ b/.gitmodules

@@ -1,6 +1,3 @@

-[submodule "admin"]

-	path = admin

-	url = http://system@.../scm/git/tde-common-admin

 [submodule "cmake"]

 	path = cmake

 	url = http://system@.../scm/git/tde-common-cmake

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt

index cedb50d..549b957 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -41,16 +41,16 @@

 ##### 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_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

-option( BUILD_ALL "Build all" ON                                            )

-option( BUILD_DOC "Build documentation" ${BUILD_ALL}                        )

-option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL}                )

+option( BUILD_ALL          "Build all"           OFF )

+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )

+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )

 ##### configure checks

@@ -69,24 +69,11 @@

 ##### directories

+add_subdirectory( icons )

 add_subdirectory( ${PROJECT_NAME} )

 add_subdirectory( ${PROJECT_NAME}.upd )

 tde_conditional_add_subdirectory( BUILD_DOC doc         )

 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

INSTALL

diff --git a/INSTALL b/INSTALL

index 02a4a07..ec741d7 100644

--- a/INSTALL

+++ b/INSTALL

@@ -1,6 +1,27 @@

 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.

    The `configure' shell script attempts to guess correct values for

Makefile.am

diff --git a/Makefile.am b/Makefile.am

deleted file mode 100644

index 747439f..0000000

--- a/Makefile.am

+++ /dev/null

@@ -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

Makefile.cvs

diff --git a/Makefile.cvs b/Makefile.cvs

deleted file mode 100644

index 4c0afd1..0000000

--- a/Makefile.cvs

+++ /dev/null

@@ -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:

NEWS

diff --git a/NEWS b/NEWS

deleted file mode 100644

index 0519ecb..0000000

--- a/NEWS

+++ /dev/null

@@ -1 +0,0 @@

- 

\ No newline at end of file

README

diff --git a/README b/README

index 799fea2..530f491 100644

--- a/README

+++ b/README

@@ -1,81 +1,95 @@

-NOTE: As of version 1.0 KKBSwitch has online documentation, so refer to it for 

-more information. This README file will no longer be maintained, but the 

-documentation will instead.

+KKBSwitch - a keyboard layout indicator for TDE.

-                          KKBSwitch

-                 by Leonid Zeitlin <lz@...>

-                          Version 1.0

-KKBSwitch is a keyboard layout indicator for KDE 2. It is useful when you have

-configured the XKeyboard extension of your X Server to have more than one

-keyboard group, 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 group. You still have to configure XKeyboard by 

-editing XF86Config file.

+KKBSwitch displays an icon in the system tray that indicates which

+layout is currently active and enables you to switch layouts by clicking

+the icon or by selecting from the menu.

-KKBSwitch features:

-- displays an icon in the KDE's system tray indicating the active keyboard group

-- you can switch keyboard groups by clicking the icon or selecting the

-desired group from the icon's menu

-- icons corresponding to different groups are configurable (chosen from country

-flag pixmaps that ship with KDE)

-- "Toggle mode" (see below for more).

+

+It is useful when you have configured the XKeyboard extension of your

+Xorg Server to have more than one keyboard group, for example US/ASCII

+and Russian. It 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

+group.

+

+

+Features include:

+- displays an icon in the system tray indicating the active keyboard

+  group.

+- Configurable icons for the keyboard layouts (chosen from country flag

+  pixmaps that ship with TDE).

+- The "toggle mode" to toggle between the two most recently-used

+  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.

-The most basic usage is simply to let it sit in the system tray and show you 

-which keyboard group is currently active. You can also click the KKBSwicth 

-system tray icon to switch keyboard layouts. When right-clicked, the system 

-tray icon displays a menu with the following entries:

+The most basic usage is simply to let it sit in the system tray and show

+you which keyboard group is currently active. You can also click the

+KKBSwicth system tray icon to switch keyboard layouts.

+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.

-Selecting a menu entry corresponding to a group will make that group active.

+- 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.

+

+Selecting a menu entry corresponding to a group will make that group

+active.

** Diff limit reached (max: 250 lines) **