Remove unnecessary backup translations.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 40ef275cbb)

.gitmodules

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

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_create_template( "kbfxconfigapp" )

CMakeLists.txt

@@ -9,7 +9,7 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
 
 
 ##### general package setup #####################
@@ -31,10 +31,14 @@ include( FindPkgConfig )
 
 ##### 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 )
@@ -65,7 +69,7 @@ ELSE (APPLICATION_APPLICATION_STABLE "")
 	SET(GENTOO_VERSION "${APPLICATION_MAIN_VERSION}_pre${LIB_SUB_RELEASE}")
 ENDIF (APPLICATION_STABLE)
 
-SET(VERSION ${APPLICATION_VERSION})
+SET(PACKAGE_VERSION ${APPLICATION_VERSION})
 
 SET(STRIGI_VERSION "0.3.11")
 SET(GENTOO_KEYWORDS "x86 ~ppc ~amd64")
@@ -91,9 +95,9 @@ add_definitions(
   -DHAVE_CONFIG_H
 )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS} -DTQT_THREAD_SUPPORT" )
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS} -DQT_THREAD_SUPPORT" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### source directories ########################

ConfigureChecks.cmake

@@ -9,27 +9,27 @@
 #
 #################################################
 
+
+# required stuff
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+find_package( TQt )
+find_package( TDE )
+
+
 ##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
 
 if( WITH_GCC_VISIBILITY )
-  if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
-  endif( NOT UNIX )
-  set( __KDE_HAVE_GCC_VISIBILITY 1 )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+  tde_setup_gcc_visibility( )
 endif( )
 
 
-if( BUILD_TRANSLATIONS AND NOT DEFINED MSGFMT_EXECUTABLE )
-  find_program( MSGFMT_EXECUTABLE msgfmt )
-  if( NOT MSGFMT_EXECUTABLE )
-    tde_message_fatal( "msgfmt program is required, but was not found on your system" )
-  endif( )
-endif( )
-
 check_type_size( "int" SIZEOF_INT BUILTIN_TYPES_ONLY )
 check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
 
@@ -50,10 +50,6 @@ ELSE (USE_STRIGI)
 	MESSAGE(STATUS "Strigi support is: OFF!")
 ENDIF (USE_STRIGI)
 
-# common required stuff
-find_package( TQt )
-find_package( TDE )
-
 
 #### Find menudrake if needed #####################
 
@@ -64,4 +60,4 @@ IF (HAVE_MANDRAKE AND USE_MENUDRAKE)
 ELSE (HAVE_MANDRAKE AND USE_MENUDRAKE)
 	SET(MANDRAKE "")
 	MESSAGE(STATUS "Will use 'kmenuedit'!")
-ENDIF (HAVE_MANDRAKE AND USE_MENUDRAKE)
+ENDIF (HAVE_MANDRAKE AND USE_MENUDRAKE)

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

configdialog/CMakeLists.txt

@@ -36,7 +36,7 @@ tde_add_executable( kbfxconfigapp AUTOMOC
           kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui
           kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui
           kbfxconfigdlglayout.ui
-  LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared tdeio-shared tdehtml-shared
+  LINK ${TQT_LIBRARIES} kbfxdata-shared kbfxcommon-shared tdecore-shared tdeui-shared DCOP-shared tdeio-shared tdehtml-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

configdialog/kbfxconfigapp.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          KBFX Configuration Utility
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    TDE Menu button and menu alternative for the Trinity Desktop Environment
-Keywords:       TDE Qt
-Author:         PhobosK <phobosk@mail.kbfx.net>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://www.kbfx.net/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

configdialog/kbfxconfigdlgabout.ui

@@ -718,10 +718,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!!</string>
     <function specifier="non virtual" returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgbutton.ui

@@ -1255,21 +1255,10 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="4" margin="0"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kbfxpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxpixmaplabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgfonts-old.ui

@@ -1162,32 +1162,9 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxfontchooser.h</include>
+    <include location="global" impldecl="in implementation">kcolorcombo.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlglayout.ui

@@ -1075,10 +1075,8 @@
     <function access="private" returnType="bool">KbfxMessage()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgmain.ui

@@ -223,9 +223,6 @@
                     <property name="text">
                         <string>&amp;Help</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+H</string>
-                    </property>
                     <property name="autoDefault">
                         <bool>false</bool>
                     </property>
@@ -254,9 +251,6 @@
                     <property name="text">
                         <string>&amp;Default</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+D</string>
-                    </property>
                     <property name="autoDefault">
                         <bool>false</bool>
                     </property>
@@ -302,9 +296,6 @@
                     <property name="text">
                         <string>&amp;Apply</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+A</string>
-                    </property>
                     <property name="autoDefault">
                         <bool>false</bool>
                     </property>
@@ -333,9 +324,6 @@
                     <property name="text">
                         <string>E&amp;xit</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+X</string>
-                    </property>
                     <property name="autoDefault">
                         <bool>false</bool>
                     </property>
@@ -664,7 +652,7 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="10" margin="10"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgplugins.ui

@@ -222,9 +222,6 @@
                     <property name="text">
                         <string>&amp;Configure Plugin</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+C</string>
-                    </property>
                     <property name="toolTip" stdset="0">
                         <string>Configure the selected plugin</string>
                     </property>
@@ -250,9 +247,6 @@
                     <property name="text">
                         <string>&amp;Plugin Information</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+P</string>
-                    </property>
                     <property name="toolTip" stdset="0">
                         <string>Information about the selected plugin</string>
                     </property>
@@ -382,9 +376,9 @@
     <function access="private">KbfxSaveSelectedPlugins()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdeactionselector.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">tdeactionselector.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgstyle.ui

@@ -499,7 +499,7 @@
     <slot>ChangeForm()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgthemes.ui

@@ -1022,11 +1022,8 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>

configdialog/kbfxconfigdlgtooltip.ui

@@ -707,13 +707,8 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>

configdialog/kbfxthemeinfo.ui

@@ -588,16 +588,7 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>

doc/en/index.docbook

@@ -2441,16 +2441,3 @@ rpm -i kbfx-0.4.9.3-20070117.i386.rpm
 </appendix>
 &documentation.index;
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
-

images/CMakeLists.txt

@@ -1,5 +1,3 @@
-IF (NOT USE_KDE4)
-	KDE3_INSTALL_ICONS(hicolor)
-ELSE (NOT USE_KDE4)
-	KDE4_INSTALL_ICONS(hicolor)
-ENDIF (NOT USE_KDE4)
+##### install icons
+
+tde_install_icons( )

plugins/applications/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata-shared
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/plasmoids/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata-shared
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/recentstuff/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata-shared
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/settings/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata-shared
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/strigi/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings
+  LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata-shared kbfxplasmadatasettings-shared
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

src/CMakeLists.txt

@@ -41,7 +41,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdecore-shared tdeui-shared tdeio-shared kbfxcommon kbfxdata
+  LINK tdecore-shared tdeui-shared tdeio-shared kbfxcommon-shared kbfxdata-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )