summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt18
-rw-r--r--README2
m---------cmake0
-rw-r--r--kded/vfolder_menu.cpp6
-rw-r--r--kdoctools/ConfigureChecks.cmake30
-rw-r--r--tdecmshell/main.cpp4
-rw-r--r--tdecore/knotifyclient.cpp2
-rw-r--r--tdecore/tdeglobalsettings.cpp64
-rw-r--r--tdecore/tdeversion.h4
-rw-r--r--tdeio/tdeio/kservice.cpp10
-rw-r--r--tdelfeditor/CMakeLists.txt102
-rw-r--r--tdeprint/kmmanager.cpp1
-rw-r--r--tdeprint/kmmanager.h3
-rw-r--r--tdeprint/management/kmjobviewer.cpp9
-rw-r--r--tdeprint/management/kmjobviewer.h1
-rw-r--r--tdeui/tdeshortcutdialog.cpp23
-rw-r--r--tdeui/tdeshortcutdialog.h1
17 files changed, 116 insertions, 164 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b95cfa6..2137158c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required( VERSION 2.8 )
project( tdelibs )
set( PACKAGE tdelibs )
-set( VERSION R14.0.7 )
+set( VERSION R14.0.9 )
##### include essential cmake modules ###########
@@ -951,7 +951,7 @@ if( WITH_SSL )
check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL )
endif( )
check_library_exists( crypto EVP_EncryptInit_ex "" HAVE_LIBCRYPTO )
- if( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVEL_LIBSSL) AND HAVE_LIBCRYPTO )
+ if( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVE_LIBSSL) AND HAVE_LIBCRYPTO )
set( SSL_FOUND 1 CACHE INTERNAL "" FORCE )
find_file( OPENSSLV_H openssl/opensslv.h )
file( STRINGS "${OPENSSLV_H}" SSL_VERSION REGEX "#[ \t]*define[ \t]*OPENSSL_VERSION_TEXT" )
@@ -959,7 +959,7 @@ if( WITH_SSL )
SSL_VERSION "${SSL_VERSION}" )
set( SSL_VERSION "${SSL_VERSION}" CACHE INTERNAL "" FORCE )
message( STATUS "Found OpenSSL: version ${SSL_VERSION}" )
- endif( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVEL_LIBSSL) AND HAVE_LIBCRYPTO )
+ endif( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVE_LIBSSL) AND HAVE_LIBCRYPTO )
endif( NOT SSL_FOUND )
if( NOT SSL_FOUND )
tde_message_fatal( "SSL support is requested, but openssl not found on your system" )
@@ -1187,16 +1187,22 @@ configure_file( tdelibs.pc.cmake tdelibs.pc @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdelibs.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
+##### read source metadata ######################
+
+set( TDE_VERSION "${TDE_RELEASE_NUM}" )
+tde_read_src_metadata()
+
+
##### subdirectories ############################
+if( WITH_ELFICON )
+ add_subdirectory( tdelfeditor )
+endif( WITH_ELFICON )
add_subdirectory( dcop )
add_subdirectory( libltdl )
add_subdirectory( kglib )
add_subdirectory( tdefx )
add_subdirectory( tdecore )
-if( WITH_ELFICON )
- add_subdirectory( tdelfeditor )
-endif( WITH_ELFICON )
add_subdirectory( tdeunittest )
add_subdirectory( tdeui )
add_subdirectory( tdesu )
diff --git a/README b/README
index fce8c305..ed3b57d5 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ In this file:
About tdelibs
-------------
-This is version R14.0.8 [DEVELOPMENT] of the Trinity Desktop Environment (TDE) libraries.
+This is version R14.0.9 [DEVELOPMENT] of the Trinity Desktop Environment (TDE) libraries.
This package includes libraries that are central to the development and
execution of a KDE program, as well as internationalization files for these
diff --git a/cmake b/cmake
-Subproject f0659a0437dbe9f6943c7429dd6651d165dfa1c
+Subproject 81c6a60fac93e6610b2ea8599b6d2636df4fcd9
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index 408c6af9..2e04965e 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -775,8 +775,8 @@ VFolderMenu::locateMenuFile(const TQString &fileName)
TQString result;
//TQString xdgMenuPrefix = TQString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
- // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
- TQString xdgMenuPrefix = "kde-";
+ // hardcode xdgMenuPrefix to "tde-" string until proper upstream fix
+ TQString xdgMenuPrefix = "tde-";
if (!xdgMenuPrefix.isEmpty())
{
TQFileInfo fileInfo(fileName);
@@ -1032,7 +1032,7 @@ VFolderMenu::processKDELegacyDirs()
kdDebug(7021) << "processKDELegacyDirs()" << endl;
TQDict<KService> items;
- TQString prefix = "kde-";
+ TQString prefix = "tde-";
TQStringList relFiles;
TQRegExp files("\\.(desktop|kdelnk)$");
diff --git a/kdoctools/ConfigureChecks.cmake b/kdoctools/ConfigureChecks.cmake
index 43281182..c98843e2 100644
--- a/kdoctools/ConfigureChecks.cmake
+++ b/kdoctools/ConfigureChecks.cmake
@@ -38,23 +38,31 @@ if( NOT TDE_RELEASE_ENTITIES )
if( TDE_SCM_MODULE_DATETIME )
set( TDE_RELEASE_DATE "${TDE_SCM_MODULE_DATETIME}" )
else( )
+ if( ${CMAKE_SYSTEM_NAME} MATCHES "BSD" )
+ set( GNU_FIND_EXECUTABLE "gfind" )
+ else( )
+ set( GNU_FIND_EXECUTABLE "find" )
+ endif( )
execute_process(
- COMMAND find ${TDEVERSION_FILE} -printf "%Tm/%Te/%TY"
+ COMMAND ${GNU_FIND_EXECUTABLE} ${TDEVERSION_FILE} -printf "%Tm/%Te/%TY"
OUTPUT_VARIABLE TDE_RELEASE_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif( )
endif( )
- execute_process(
- COMMAND date +2010-%Y -d "${TDE_RELEASE_DATE}"
- OUTPUT_VARIABLE TDE_RELEASE_COPYRIGHT
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- execute_process(
- COMMAND date +%B\ %e,\ %Y -d "${TDE_RELEASE_DATE}"
- OUTPUT_VARIABLE TDE_RELEASE_DATE
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
+
+ string( REGEX REPLACE "^([0-9]+)/([0-9]+)*/([0-9]+).*" "2010-\\3"
+ TDE_RELEASE_COPYRIGHT "${TDE_RELEASE_DATE}" )
+
+ string( REGEX REPLACE "^([0-9]+)/([0-9]+)*/([0-9]+).*" "\\1"
+ _release_month_num "${TDE_RELEASE_DATE}" )
+ math( EXPR _release_month_index "${_release_month_num}-1" )
+ set( _month_names "January;February;March;April;May;June;July;August;September;October;November;December" )
+ list( GET _month_names ${_release_month_index} _release_month_name )
+ string( REGEX REPLACE
+ "^([0-9]+)/([0-9]+)*/([0-9]+).*"
+ "${_release_month_name} \\2, \\3"
+ TDE_RELEASE_DATE "${TDE_RELEASE_DATE}" )
# update entities
message( STATUS "Updating ${ENTITIES_FILE}
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 20ef629d..a99c4b54 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -103,8 +103,8 @@ static KService::Ptr locateModule(const TQCString& module)
}
// avoid finding random non-TDE applications
- if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
- return locateModule( "kde-" + module );
+ if ( module.left( 4 ) != "tde-" && service->library().isEmpty() )
+ return locateModule( "tde-" + module );
if(!TDECModuleLoader::testModule( module ))
{
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index b6f70bd2..b1989fbf 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -363,7 +363,7 @@ bool KNotifyClient::Instance::useSystemBell() const
// is available, we have a default-instance with kapp as TDEInstance.
// We make sure to always have that default-instance in the stack, because
// the stack might have gotten cleared in the destructor.
-// We can't use QStack::setAutoDelete( true ), because no instance besides
+// We can't use QPtrStack::setAutoDelete( true ), because no instance besides
// our default instance is owned by us.
KNotifyClient::Instance * KNotifyClient::Instance::currentInstance()
{
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 4941a9ed..79cd4586 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -141,36 +141,68 @@ static void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *do
// Use sane values in case some paths are missing
if (desktop->isEmpty())
{
- *desktop = TQDir::homeDirPath() + "/" + i18n("Desktop") + "/";
- }
+ *desktop = TQDir::homeDirPath() + "/" + "Desktop" + "/";
+ if (!TQDir(*desktop).exists())
+ {
+ *desktop = TQDir::homeDirPath() + "/" + i18n("Desktop") + "/";
+ }
+ }
if (documents->isEmpty())
{
- *documents = TQDir::homeDirPath() + "/" + i18n("Documents") + "/";
- }
+ *documents = TQDir::homeDirPath() + "/" + "Documents" + "/";
+ if (!TQDir(*documents).exists())
+ {
+ *documents = TQDir::homeDirPath() + "/" + i18n("Documents") + "/";
+ }
+ }
if (download->isEmpty())
{
- *download = TQDir::homeDirPath() + "/" + i18n("Downloads") + "/";
- }
+ *download = TQDir::homeDirPath() + "/" + "Downloads" + "/";
+ if (!TQDir(*download).exists())
+ {
+ *download = TQDir::homeDirPath() + "/" + i18n("Downloads") + "/";
+ }
+ }
if (music->isEmpty())
{
- *music = TQDir::homeDirPath() + "/" + i18n("Music") + "/";
- }
+ *music = TQDir::homeDirPath() + "/" + "Music" + "/";
+ if (!TQDir(*music).exists())
+ {
+ *music = TQDir::homeDirPath() + "/" + i18n("Music") + "/";
+ }
+ }
if (pictures->isEmpty())
{
- *pictures = TQDir::homeDirPath() + "/" + i18n("Pictures") + "/";
- }
+ *pictures = TQDir::homeDirPath() + "/" + "Pictures" + "/";
+ if (!TQDir(*pictures).exists())
+ {
+ *pictures = TQDir::homeDirPath() + "/" + i18n("Pictures") + "/";
+ }
+ }
if (publicShare->isEmpty())
{
- *publicShare = TQDir::homeDirPath() + "/" + i18n("Public") + "/";
- }
+ *publicShare = TQDir::homeDirPath() + "/" + "Public" + "/";
+ if (!TQDir(*publicShare).exists())
+ {
+ *publicShare = TQDir::homeDirPath() + "/" + i18n("Public") + "/";
+ }
+ }
if (templates->isEmpty())
{
- *templates = TQDir::homeDirPath() + "/" + i18n("Templates") + "/";
- }
+ *templates = TQDir::homeDirPath() + "/" + "Templates" + "/";
+ if (!TQDir(*templates).exists())
+ {
+ *templates = TQDir::homeDirPath() + "/" + i18n("Templates") + "/";
+ }
+ }
if (videos->isEmpty())
{
- *videos = TQDir::homeDirPath() + "/" + i18n("Videos") + "/";
- }
+ *videos = TQDir::homeDirPath() + "/" + "Videos" + "/";
+ if (!TQDir(*videos).exists())
+ {
+ *videos = TQDir::homeDirPath() + "/" + i18n("Videos") + "/";
+ }
+ }
}
static void checkAndCreateXdgFolder(const TQString &folder, const TQString &path, TDEConfig *config)
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
index 6d7716ef..c0d83b67 100644
--- a/tdecore/tdeversion.h
+++ b/tdecore/tdeversion.h
@@ -32,10 +32,10 @@
A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL.
A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL.
*/
-#define TDE_VERSION_STRING "R14.0.8 [DEVELOPMENT]"
+#define TDE_VERSION_STRING "R14.0.9 [DEVELOPMENT]"
#define TDE_VERSION_MAJOR 14
#define TDE_VERSION_MINOR 0
-#define TDE_VERSION_RELEASE 8
+#define TDE_VERSION_RELEASE 9
#define TDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
#define TDE_VERSION \
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index f0c114e7..c92236ac 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -680,8 +680,8 @@ KService::Ptr KService::serviceByDesktopPath( const TQString& _name )
KService::Ptr KService::serviceByDesktopName( const TQString& _name )
{
KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() );
- if (!s && !_name.startsWith("kde-"))
- s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() );
+ if (!s && !_name.startsWith("tde-"))
+ s = KServiceFactory::self()->findServiceByDesktopName( "tde-"+_name.lower() );
return KService::Ptr( s );
}
@@ -866,7 +866,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
{
TQString base = suggestedName;
if (!showInMenu)
- base.prepend("kde-");
+ base.prepend("tde-");
TQString result;
for(int i = 1; true; i++)
@@ -891,7 +891,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
}
else
{
- TQString file = result.mid(4); // Strip "kde-"
+ TQString file = result.mid(4); // Strip "tde-"
if (!locate("apps", ".hidden/"+file).isEmpty())
continue;
}
@@ -907,7 +907,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
}
else
{
- TQString file = result.mid(4); // Strip "kde-"
+ TQString file = result.mid(4); // Strip "tde-"
return ::locateLocal("apps", ".hidden/"+file);
}
}
diff --git a/tdelfeditor/CMakeLists.txt b/tdelfeditor/CMakeLists.txt
index 07cd731d..7d71943f 100644
--- a/tdelfeditor/CMakeLists.txt
+++ b/tdelfeditor/CMakeLists.txt
@@ -32,104 +32,4 @@ tde_add_executable( tdelfeditor
LINK ${TQT_LIBRARIES} ${LIBR_LIBRARIES} tdecore-shared
)
-
-##### embed scm data into important libraries ####
-
-# read source metadata
-tde_read_src_metadata()
-tde_curdatetime( scm_embed_metadata_datetime )
-
-if( NOT "${TDE_SCM_MODULE_NAME}" STREQUAL "" )
- if( NOT "${TDE_SCM_MODULE_REVISION}" STREQUAL "" )
- get_target_property( scm_embed_metadata_version DCOP-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"DCOP-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libDCOP_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/dcop/libDCOP.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/dcop/libDCOP.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS DCOP-shared
- COMMENT "Storing SCM metadata in dcop/libDCOP.so"
- )
-
- get_target_property( scm_embed_metadata_version tdecore-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdecore-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdecore_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdecore/libtdecore.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdecore-shared
- COMMENT "Storing SCM metadata in tdecore/libtdecore.so"
- )
-
- #get_target_property( scm_embed_metadata_version tdeio-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdeio-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdeio_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeio/libtdeio.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdeio-shared
- COMMENT "Storing SCM metadata in tdeui/libtdeio.so"
- )
-
- #get_target_property( scm_embed_metadata_version tdeui-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdeui-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdeui_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeui/libtdeui.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdeui-shared
- COMMENT "Storing SCM metadata in tdeui/libtdeui.so"
- )
-
- #get_target_property( scm_embed_metadata_version tdeutils-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdeutils-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdeutils_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeutils/libtdeutils.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdeutils-shared
- COMMENT "Storing SCM metadata in tdeutils/libtdeutils.so"
- )
-
- #get_target_property( scm_embed_metadata_version tdeprint-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdeprint-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdeprint_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdeprint/libtdeprint.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdeprint-shared
- COMMENT "Storing SCM metadata in tdeprint/libtdeprint.so"
- )
-
- #get_target_property( scm_embed_metadata_version tdehtml-shared VERSION )
- set( ELF_EMBEDDING_METADATA "\"tdehtml-shared\" \"\" \"\" \"\" \"\" \"Trinity Desktop Environment\" \"\" \"${scm_embed_metadata_version}\" \"${scm_embed_metadata_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"\"" )
- separate_arguments( ELF_EMBEDDING_METADATA )
- add_custom_target(
- # embed name and metadata
- update_libtdehtml_metadata ALL
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -m ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so.${scm_embed_metadata_version} ${ELF_EMBEDDING_METADATA} || true
- COMMAND ${CMAKE_BINARY_DIR}/tdelfeditor/tdelfeditor -e ${CMAKE_BINARY_DIR}/tdehtml/libtdehtml.so.${scm_embed_metadata_version} || true
- DEPENDS tdelfeditor
- DEPENDS tdehtml-shared
- COMMENT "Storing SCM metadata in tdehtml/libtdehtml.so"
- )
- endif( )
-endif( )
+set( TDELFEDITOR_EXECUTABLE tdelfeditor CACHE INTERNAL "tdelfeditor target" )
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index d43239fd..19fdbc7c 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -272,6 +272,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload)
if (defprinter)
setSoftDefault(defprinter);
}
+ emit printerListUpdated();
}
return &m_fprinters;
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index 9c5820f3..d90a02d2 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -142,7 +142,8 @@ public:
void checkUpdatePossible();
signals:
- void updatePossible( bool );
+ void updatePossible(bool);
+ void printerListUpdated();
protected:
// the real printer listing job is done here
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 7e149ed4..70a6c6e8 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -104,6 +104,8 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
conf->setGroup( "Jobs" );
resize( conf->readSizeEntry( "Size", &defSize ) );
}
+
+ connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated()));
}
KMJobViewer::~KMJobViewer()
@@ -335,7 +337,7 @@ void KMJobViewer::initActions()
TDEConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("Jobs");
- m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",true));
+ m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false));
connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool)));
statusbar->addWidget( m_stickybox, 1, false );
statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true);
@@ -532,6 +534,11 @@ void KMJobViewer::slotRightClicked(TQListViewItem*,const TQPoint& p,int)
if (m_pop) m_pop->popup(p);
}
+void KMJobViewer::slotPrinterListUpdated()
+{
+ loadPrinters();
+}
+
void KMJobViewer::loadPrinters()
{
m_printers.clear();
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 5bfda846..f9e6ffb8 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -87,6 +87,7 @@ protected slots:
void slotConfigure();
void slotDropped( TQDropEvent*, TQListViewItem* );
void slotKeepWindowChange(bool);
+ void slotPrinterListUpdated();
protected:
void init();
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 35a7706c..4d95970b 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -82,7 +82,6 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort
m_bQtShortcut = bQtShortcut;
- m_bGrab = false;
m_iSeq = 0;
m_iKey = 0;
m_ptxtCurrent = 0;
@@ -291,22 +290,20 @@ bool TDEShortcutDialog::x11Event( XEvent *pEvent )
x11KeyReleaseEvent( pEvent );
return true;
case XFocusIn:
- if (!m_bGrab) {
- //kdDebug(125) << "FocusIn and Grab!" << endl;
- grabKeyboard();
- m_bGrab = true;
+ {
+ XFocusInEvent *fie = (XFocusInEvent*)pEvent;
+ if (fie->mode != NotifyGrab && fie->mode != NotifyUngrab) {
+ grabKeyboard();
+ }
}
- //else
- // kdDebug(125) << "FocusIn" << endl;
break;
case XFocusOut:
- if (m_bGrab) {
- //kdDebug(125) << "FocusOut and Ungrab!" << endl;
- releaseKeyboard();
- m_bGrab = false;
+ {
+ XFocusOutEvent *foe = (XFocusOutEvent*)pEvent;
+ if (foe->mode != NotifyGrab && foe->mode != NotifyUngrab) {
+ releaseKeyboard();
+ }
}
- //else
- // kdDebug(125) << "FocusOut" << endl;
break;
default:
//kdDebug(125) << "x11Event->type = " << pEvent->type << endl;
diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index c0b8fa49..afad6fda 100644
--- a/tdeui/tdeshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -53,7 +53,6 @@ private:
bool m_bQtShortcut;
TDEShortcut m_shortcut;
- bool m_bGrab;
KPushButton* m_ptxtCurrent;
uint m_iSeq;
uint m_iKey;