22 files changed, 60 insertions, 360 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 934def7..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "admin"]
-	path = admin
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 9730a56..233b58f 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,11 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEL10n )
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a9fe20..d1e7c67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,13 +7,12 @@
 ############################################
 
 
-cmake_minimum_required( VERSION 2.8.12 )
+cmake_minimum_required( VERSION 3.1 )
 
 
 #### general package setup
 
 project( tde-style-ia-ora )
-set( VERSION R14.0.11 )
 
 
 #### include essential cmake modules
@@ -29,10 +28,14 @@ include( CheckCXXSourceCompiles )
 
 #### include our cmake modules
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
 
+##### set version number ########################
+
+tde_set_project_version( )
+
+
 ##### setup install paths
 
 include( TDESetupPaths )
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/INSTALL b/INSTALL
index 02a4a07..4db5a0a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,167 +1,16 @@
 Basic Installation
 ==================
 
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
+tde-style-ia-ora 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"
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 8a2284f..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,22 +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) -f admin/Makefile.common package-messages
-	$(MAKE) -C po merge
-
-EXTRA_DIST = admin COPYING configure.in.in
-
-dist-hook:
-	cd $(top_distdir) && perl admin/am_edit -padmin
-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
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:
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index e69de29..0000000
--- a/README
+++ /dev/null
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8639b0c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+
+Mandriva Ia Ora theme for TDE.
+
+
+Graphic theme used in Mandriva distribution, for the first time in 2007.
+This served to unify the graphic appearance of Qt and GTK applications.
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to tde-style-ia-ora, you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### desktop files
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tde-style-ia-ora-desktop-files/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tde-style-ia-ora-desktop-files/)
+
+### twin
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tde-style-ia-ora-twin/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tde-style-ia-ora-twin/)
diff --git a/TODO b/TODO
deleted file mode 100644
index e69de29..0000000
--- a/TODO
+++ /dev/null
diff --git a/admin b/admin
deleted file mode 160000
-Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index ddca40b..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#MIN_CONFIG(3.2.0)
-
-AM_INIT_AUTOMAKE(ia_ora-kde, 1.0.8)
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
diff --git a/ia_ora.spec b/ia_ora.spec
deleted file mode 100644
index 4b4b608..0000000
--- a/ia_ora.spec
+++ /dev/null
@@ -1,82 +0,0 @@
-Summary:        Ia Ora theme for kde
-Name:           ia_ora
-Version:        1.0
-Release:        %mkrel 2
-License:        GPL
-Group:          Graphical desktop/Other
-URL:            http://www.mandrivalinux.com/
-BuildRequires:  tdelibs-devel
-BuildRequires:  tdebase-devel >= 3.1.94-11mdk
-Source0:        %{name}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-%description
-Mandriva Ia Ora theme
-
- 
-%package kde
-Summary: 	Mandriva theme for KDE - Widget design
-Group: 		Graphical desktop/KDE
-
-%description kde
-Mandriva theme for KDE - Widget design
-
-%package kde-twin
-Summary:	Mandriva theme for KDE - Window Decorations
-Group:		Graphical desktop/KDE
-
-%description kde-twin
-Mandriva theme for KDE - Window Decorations
-
-
-%prep
-%setup -q -n%name 
-
-%build
-make -f admin/Makefile.common cvs
-
-export TQTDIR=%qtdir
-export TDEDIR=%_prefix
-
-export LD_LIBRARY_PATH=$TQTDIR/%_lib:$TDEDIR/%_lib:$LD_LIBRARY_PATH
-export PATH=$TQTDIR/bin:$TDEDIR/bin:$PATH
-
-%configure2_5x \
-%if "%{_lib}" != "lib"
-   --enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \
-%endif
-	--with-xinerama
-%make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall_std
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files kde-twin
-%defattr(-,root,root,-)
-%_libdir/kde3/twin3_iaora.la
-%_libdir/kde3/twin3_iaora.so
-%_libdir/kde3/twin_iaora_config.la
-%_libdir/kde3/twin_iaora_config.so
-%_datadir/apps/twin/iaora.desktop
-
-
-
-%files kde
-%defattr(-,root,root,-)
-%_libdir/kde3/plugins/styles/ia_ora.la
-%_libdir/kde3/plugins/styles/ia_ora.so
-%_datadir/apps/kstyle/themes/ia_ora.themerc
-
-%changelog
-* Thu Sep 07 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-2
-- Some fixes
-
-* Mon Sep 04 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-1
-- Initial package
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 2bcf4d9..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=widget twin
diff --git a/src/twin/Makefile.am b/src/twin/Makefile.am
deleted file mode 100644
index 7c80577..0000000
--- a/src/twin/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = config
-
-KDE_CXXFLAGS = -DQT_PLUGIN
-
-INCLUDES = -I$(srcdir)/../../lib $(all_includes)
-
-twindir = $(kde_datadir)/twin/
-twin_DATA = iaora.desktop
-
-kde_module_LTLIBRARIES = twin3_iaora.la
-twin3_iaora_la_SOURCES = iaora.cpp iaoraclient.cpp iaorabutton.cpp misc.cpp
-twin3_iaora_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_iaora_la_LIBADD = $(LIB_TDEUI) -ltdecorations $(LIB_TQT) $(LIB_TDECORE) -ltdefx
-twin3_iaora_la_METASOURCES = AUTO
-
-DISTCLEANFILES = $(twin3_iaora_la_METASOURCES)
-
diff --git a/src/twin/config/Makefile.am b/src/twin/config/Makefile.am
deleted file mode 100644
index bbbebaa..0000000
--- a/src/twin/config/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES                     = $(all_includes)
-
-kde_module_LTLIBRARIES       = twin_iaora_config.la
-
-twin_iaora_config_la_SOURCES = config.cpp configdialog.ui
-twin_iaora_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin_iaora_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
-
-METASOURCES                  = AUTO
-noinst_HEADERS               = config.h
-DISTCLEANFILES               = $(METASOURCES)
-
-lnkdir                       = $(kde_datadir)/twin
-
diff --git a/src/twin/config/config.cpp b/src/twin/config/config.cpp
index 1410345..4fda2fe 100644
--- a/src/twin/config/config.cpp
+++ b/src/twin/config/config.cpp
@@ -42,6 +42,7 @@ IaOraConfig::IaOraConfig(TDEConfig* config, TQWidget* parent)
     // create the configuration object
     m_config = new TDEConfig("twiniaorarc");
     TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_iaora");
 
     // create and show the configuration dialog
     m_dialog = new ConfigDialog(parent);
diff --git a/src/twin/iaora.cpp b/src/twin/iaora.cpp
index a588888..a4477e3 100644
--- a/src/twin/iaora.cpp
+++ b/src/twin/iaora.cpp
@@ -27,6 +27,8 @@
 #include <tqimage.h>
 #include <tqapplication.h>
 #include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
@@ -41,6 +43,9 @@ namespace KWinIaOra
 
 IaOraHandler::IaOraHandler()
 {
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_iaora");
+
     memset(m_pixmaps, 0, sizeof(TQPixmap*)*NumPixmaps*2*2); // set elements to 0
     memset(m_bitmaps, 0, sizeof(TQBitmap*)*NumButtonIcons*2);
 
diff --git a/src/twin/iaora.desktop b/src/twin/iaora.desktop
index 254ae74..99e23f8 100644
--- a/src/twin/iaora.desktop
+++ b/src/twin/iaora.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
-Name=Ia ora
+Name=Ia Ora
 Encoding=UTF-8
 X-TDE-Library=twin3_iaora
diff --git a/src/widget/Makefile.am b/src/widget/Makefile.am
deleted file mode 100644
index 13146bd..0000000
--- a/src/widget/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-KDE_PLUGIN = -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-
-AM_CPPFLAGS = -DQT_PLUGIN
-
-INCLUDES = $(all_includes)
-noinst_HEADERS = ia_ora.h bitmaps.h
-kde_style_LTLIBRARIES = ia_ora.la
-ia_ora_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-ia_ora_la_LIBADD = -ltdefx $(LIB_TDECORE) $(LIB_TQT)
-ia_ora_la_SOURCES = ia_ora.cpp
-ia_ora_la_METASOURCES = AUTO
-
-# todo fix me install themerc file
-ia_ora.lo: ia_ora.h ia_ora.moc
-
-ia_ora.moc : ia_ora.h
-	    $(MOC) $(srcdir)/ia_ora.h -o ia_ora.moc
-
-BUILT_SOURCES = ia_ora.moc
-
-CLEANFILES = $(BUILT_SOURCES)
-
-ia_oradata_DATA = ia_ora.themerc
-ia_oradatadir = $(kde_datadir)/tdestyle/themes
-
-EXTRA_DIST = ia_ora.cpp ia_ora.h $(ia_oradata_DATA)
diff --git a/translations/desktop_files/tde-style-ia-ora-desktops.pot b/translations/desktop_files/tde-style-ia-ora-desktops.pot
index 7c9056b..ca137a3 100644
--- a/translations/desktop_files/tde-style-ia-ora-desktops.pot
+++ b/translations/desktop_files/tde-style-ia-ora-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 12:48+0200\n"
+"POT-Creation-Date: 2021-07-12 13:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: widget/ia_ora.themerc:2
+#: widget/ia_ora.themerc:2 twin/iaora.desktop:2
 msgid "Ia Ora"
 msgstr ""
 
@@ -25,8 +25,3 @@ msgstr ""
 #: widget/ia_ora.themerc:3
 msgid "Mandriva Widget Style"
 msgstr ""
-
-#. Name
-#: twin/iaora.desktop:2
-msgid "Ia ora"
-msgstr ""