KDE

[Friedrich W. H. Kossebau]

SVN commit 1178758 by kossebau:

Moving Okteta, the hex editor, from kdeutils to kdesdk

As agreed in discussion on kde-core-devel: http://lists.kde.org/?l=kde-core-devel&m=128501857422609&w=2

Dear master(s) of translation, could you please also move the translations?

CCMAIL: release-team at kde.org, kde-utils-devel at kde.org, alex.richardson at gmx.de, mattr at kde.org



 M  +4 -0      kdesdk/CMakeLists.txt  
 M  +1 -0      kdesdk/README  
 M  +3 -0      kdesdk/doc/CMakeLists.txt  
 A             kdesdk/doc/okteta (directory)  
 A             kdesdk/okteta (directory)  
 M  +1 -4      kdesdk/okteta/kasten/controllers/view/print/printtool.cpp  
 M  +0 -3      kdeutils/CMakeLists.txt  
 M  +0 -2      kdeutils/Mainpage.dox  
 M  +0 -3      kdeutils/README  
 M  +0 -3      kdeutils/doc/CMakeLists.txt  
 D             kdeutils/doc/okteta (directory)  
 D             kdeutils/okteta (directory)  


--- trunk/KDE/kdesdk/CMakeLists.txt #1178757:1178758
@@ -33,6 +33,9 @@
 macro_optional_find_package(HUNSPELL)
 macro_log_feature(HUNSPELL_FOUND "HUNSPELL" "Library used for stemming" "http://hunspell.sourceforge.net/" FALSE "" "Required to build Lokalize.")
 
+macro_optional_find_package( QCA2 )
+macro_log_feature( QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed for most of the algorithms of the checksum tool in Okteta." )
+
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR})
 
@@ -56,6 +59,7 @@
 macro_optional_add_subdirectory(kpartloader)
 macro_optional_add_subdirectory(strigi-analyzer)
 macro_optional_add_subdirectory(kioslave)
+macro_optional_add_subdirectory(okteta)
 
 check_c_source_compiles("
 #include <stdlib.h>
--- trunk/KDE/kdesdk/README #1178757:1178758
@@ -14,6 +14,7 @@
 * kstartperf, startup time measurement for KDE apps
 * KUIViewer, display user interface (.ui) files from Qt Designer
 * lokalize, computer-aided i18n translation
+* okteta, hex editor
 * poxml, translates DocBook XML files using gettext po files
 * swappo, reads PO file and reverses direction of translations
 * umbrello, GUI for diagramming Unified Modelling Language (UML)
--- trunk/KDE/kdesdk/doc/CMakeLists.txt #1178757:1178758
@@ -21,6 +21,9 @@
 if(BUILD_lokalize)
   add_subdirectory(lokalize)
 endif()
+if(BUILD_okteta)
+  add_subdirectory(okteta)
+endif()
 if(BUILD_poxml)
   add_subdirectory(poxml)
 endif()
--- trunk/KDE/kdesdk/okteta/kasten/controllers/view/print/printtool.cpp #1178743:1178758
@@ -32,13 +32,10 @@
 #include <bytearraydocument.h>
 // Okteta core
 #include <abstractbytearraymodel.h>
-// KDE Utils
-#include <kdeutils-version.h>
 // KDE
 #include <KLocale>
 #include <KMessageBox>
 #include <kdeprintdialog.h>
-#include <kdeversion.h>
 // Qt
 #include <QtGui/QApplication>
 #include <QtGui/QPrintDialog>
@@ -86,7 +83,7 @@
     if( printDialog->exec() )
     {
         QString creator = QString::fromLatin1( "Print Plugin for Okteta " ); // no i18n(), keep space at end as separator
-        creator += KDEUTILS_VERSION_STRING; // TODO: change to OKTETA_VERSION_STRING
+//         creator += KDEUTILS_VERSION_STRING; // TODO: change to OKTETA_VERSION_STRING
         printer.setCreator( creator );
 
         FramesToPaperPrinter framesPrinter;
--- trunk/KDE/kdeutils/CMakeLists.txt #1178757:1178758
@@ -24,8 +24,6 @@
 endif(X11_FOUND)
 macro_optional_find_package( GMP )
 macro_log_feature( GMP_FOUND "GMP" "The GNU Multiple Precision Arithmetic Library" "http://gmplib.org/" FALSE "" "Required for building KCalc.")
-macro_optional_find_package( QCA2 )
-macro_log_feature( QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed for most of the algorithms of the checksum tool in Okteta." )
 macro_log_feature( QT_QTXMLPATTERNS_FOUND "QtXmlPatterns" "Qt support for XPath, XQuery, XSLT and XML Schema validation" "http://doc.trolltech.com/latest/qtxmlpatterns.html" FALSE "" "Required to build kremotecontrol." )
 
 # --- programs ---
@@ -50,7 +48,6 @@
 macro_optional_add_subdirectory( kgpg )
 macro_optional_add_subdirectory( ktimer )
 macro_optional_add_subdirectory( kwallet )
-macro_optional_add_subdirectory( okteta )
 macro_optional_add_subdirectory( sweeper )
 
 if( X11_FOUND AND QIMAGEBLITZ_FOUND)
--- trunk/KDE/kdeutils/Mainpage.dox #1178757:1178758
@@ -22,8 +22,6 @@
   (<a href="http://utils.kde.org/projects/ktimer">Homepage</a>) - execute programs after some time
 - <a href="./kwallet/html/index.html">KDE Wallet Manager</a>
   (<a href="http://utils.kde.org/projects/kwalletmanager">Homepage</a>) - KDE wallet management tool
-- <a href="./okteta/html/index.html">Okteta</a>
-  (<a href="http://utils.kde.org/projects/okteta">Homepage</a>) - Hex editor
 - <a href="./printer-applet/html/index.html">Printer Applet</a>
   (<a href="http://utils.kde.org/projects/printer-applet">Homepage</a>) - Applet to view current print jobs and configure new printers.
 - <a href="./superkaramba/html/index.html">SuperKaramba</a>
--- trunk/KDE/kdeutils/README #1178757:1178758
@@ -39,9 +39,6 @@
 * kwallet
     KDE wallet management tool
 
-* okteta
-    binary file editor
-
 * printer-applet
     a system tray utility that shows current print jobs, shows printer
     warnings and errors and shows when printers that have been plugged
--- trunk/KDE/kdeutils/doc/CMakeLists.txt #1178757:1178758
@@ -16,9 +16,6 @@
 if(BUILD_kwallet)
   add_subdirectory(kwallet)
 endif()
-if(BUILD_okteta)
-  add_subdirectory(okteta)
-endif()
 if(BUILD_printer-applet)
   add_subdirectory(printer-applet)
 endif()