diff options
41 files changed, 181 insertions, 222 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index d1857d32..af2a7034 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 de0d8fa6..0330dbb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,14 +9,13 @@ # ################################################# -cmake_minimum_required( VERSION 2.8.12 ) +cmake_minimum_required( VERSION 3.1 ) ##### general package setup ##################### project( tdepim ) set( PACKAGE tdepim ) -set( VERSION R14.0.11 ) ##### include essential cmake modules ########### @@ -33,10 +32,14 @@ enable_testing( ) ##### 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/ConfigureChecks.cmake b/ConfigureChecks.cmake index 2f158cd9..67500f42 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -67,92 +67,90 @@ if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) ) endif( ) -if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT ) +if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT) AND NOT HAVE_GPGME_0_4_BRANCH ) - if( NOT HAVE_GPGME_0_4_BRANCH ) - message( STATUS "checking for 'gpgme'" ) - endif( ) + message( STATUS "checking for 'gpgme'" ) - # find gpgme-config - find_program( GPGME_EXECUTABLE NAMES gpgme-config ) - if( NOT GPGME_EXECUTABLE ) - tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" ) - endif( ) + # check for gpgme + pkg_search_module( GPGME gpgme ) + if( NOT GPGME_FOUND ) - # find gpg-error-config - find_program( GPG_ERR_EXECUTABLE NAMES gpg-error-config ) - if( NOT GPG_ERR_EXECUTABLE ) - tde_message_fatal( "gpg-error-config was NOT found.\n gpg-error library is installed?" ) - endif( ) + # find gpgme-config + find_program( GPGME_EXECUTABLE NAMES gpgme-config ) + if( NOT GPGME_EXECUTABLE ) + tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" ) + endif( ) - macro( __run_gpgme_config __type __var ) - execute_process( - COMMAND ${GPGME_EXECUTABLE} --${__type} - OUTPUT_VARIABLE ${__var} - RESULT_VARIABLE __result - OUTPUT_STRIP_TRAILING_WHITESPACE ) - if( _result ) - tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" ) + macro( __run_gpgme_config __type __var ) + execute_process( + COMMAND ${GPGME_EXECUTABLE} --${__type} + OUTPUT_VARIABLE ${__var} + RESULT_VARIABLE __result + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( _result ) + tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" ) + endif( ) + endmacro( ) + + __run_gpgme_config( version GPGME_VERSION ) + __run_gpgme_config( cflags GPGME_INCLUDE_DIRS ) + __run_gpgme_config( libs GPGME_LIBRARIES ) + + if( GPGME_INCLUDE_DIRS ) + string( REGEX REPLACE "(^| +)-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) endif( ) - endmacro( ) - - macro( __run_gpgerr_config __type __var ) - execute_process( - COMMAND ${GPG_ERR_EXECUTABLE} --${__type} - OUTPUT_VARIABLE ${__var} - RESULT_VARIABLE __result - OUTPUT_STRIP_TRAILING_WHITESPACE ) - if( _result ) - tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" ) + if( GPGME_LIBRARIES ) + string( REGEX REPLACE "(^| +)-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) endif( ) - endmacro( ) - __run_gpgme_config( version GPGME_VERSION ) - __run_gpgme_config( cflags GPGME_INCLUDE_DIRS ) - __run_gpgme_config( libs GPGME_LIBRARIES ) + endif() - __run_gpgerr_config( version GPGERR_VERSION ) - __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS ) - __run_gpgerr_config( libs GPGERR_LIBRARIES ) + # check for gpg-error + pkg_search_module( GPGERR gpg-error ) + if( NOT GPGERR_FOUND ) - # cleanup - if( GPGME_INCLUDE_DIRS ) - string( REGEX REPLACE "(^| )-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) - endif( ) - if( GPGME_LIBRARIES ) - string( REGEX REPLACE "(^| )-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) - endif( ) - if( GPGERR_INCLUDE_DIRS ) - string( REGEX REPLACE "(^| )-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" ) - endif( ) - if( GPGERR_LIBRARIES ) - string( REGEX REPLACE "(^| )-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" ) - endif( ) - set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS} ${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) - set( GPGME_LIBRARIES "${GPGME_LIBRARIES} ${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) - string( REGEX REPLACE " ;" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) - string( REGEX REPLACE " ;" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) - set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) - set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" FORCE ) + # find gpg-error-config + find_program( GPG_ERR_EXECUTABLE NAMES gpgrt-config gpg-error-config ) + if( NOT GPG_ERR_EXECUTABLE ) + tde_message_fatal( "gpgrt-config or gpg-error-config was NOT found.\n gpg-error library is installed?" ) + endif( ) - # assuming that all newer system have gpgme >= 0.4 - set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" ) + macro( __run_gpgerr_config __type __var ) + execute_process( + COMMAND ${GPG_ERR_EXECUTABLE} --${__type} + OUTPUT_VARIABLE ${__var} + RESULT_VARIABLE __result + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( _result ) + tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" ) + endif( ) + endmacro( ) + + __run_gpgerr_config( version GPGERR_VERSION ) + __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS ) + __run_gpgerr_config( libs GPGERR_LIBRARIES ) + + if( GPGERR_INCLUDE_DIRS ) + string( REGEX REPLACE "(^| +)-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" ) + endif( ) + if( GPGERR_LIBRARIES ) + string( REGEX REPLACE "(^| +)-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" ) + endif( ) - # NOTE: assume we have largefile support (need for gpgme) - # FIXME: to be sure, we must check it - add_definitions( -D_FILE_OFFSET_BITS=64 ) + endif() - if( NOT HAVE_GPGME_0_4_BRANCH ) - message( STATUS " found 'gpgme', version ${GPGME_VERSION}" ) - endif( ) + # assuming that all newer system have gpgme >= 0.4 + set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS};${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) + set( GPGME_LIBRARIES "${GPGME_LIBRARIES};${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) + set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" ) + message( STATUS " found 'gpgme', version ${GPGME_VERSION}" ) # check for various GPGME features tde_save( CMAKE_CXX_FLAGS ) tde_save( CMAKE_REQUIRED_INCLUDES ) tde_save( CMAKE_REQUIRED_LIBRARIES ) string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) - # See FIXME above regarding -D_FILE_OFFSET_BITS=64 - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64") + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}") set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}") set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}") diff --git a/admin b/admin -Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8 +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index c5c837a5..9eea1d7d 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -104,9 +104,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -132,9 +129,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -170,9 +164,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index cb544807..6eddb9cb 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -552,10 +552,8 @@ If you want to change anything, press Back and make your changes; otherwise, pre </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook index 7ca07262..b48c7150 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -1053,7 +1053,7 @@ of key words can be modified.</para> <quote>read receipt</quote>. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can - learn what happened to his message. Common disposition + learn what happened to their message. Common disposition types include <quote>displayed</quote> (&ie; read), <quote>deleted</quote> and <quote>dispatched</quote> (⪚ forwarded). @@ -1099,7 +1099,7 @@ of key words can be modified.</para> notification. This is only <emphasis>slightly</emphasis> better than always sending &mdn;s. The author will still know that - the messages has been acted upon, he just cannot + the messages has been acted upon, they just cannot tell whether it was deleted or read &etc; </para> </listitem> @@ -1145,7 +1145,7 @@ of key words can be modified.</para> message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in - his sent messages for which this &mdn; was + their sent messages for which this &mdn; was generated. </para> </listitem> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index 999bd6d9..8609f2e6 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -344,7 +344,7 @@ choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel>Suggest automatic display</guilabel> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client -and on his settings.</para> +and on their settings.</para> <para>You can also attach public keys to the message by using the appropriate options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu. <application>PGP</application> @@ -2014,7 +2014,7 @@ defined for the current identity to the message. Now you can send the message.</ that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the -key's fingerprint against the one he received in a secure way from you; have a look +key's fingerprint against the one they received in a secure way from you; have a look at the <application>PGP</application> documentation for further details.</para> </sect2> diff --git a/doc/knode/introduction.docbook b/doc/knode/introduction.docbook index db14ec3a..91cda142 100644 --- a/doc/knode/introduction.docbook +++ b/doc/knode/introduction.docbook @@ -37,7 +37,7 @@ is not answered in this manual.</para> Usenet</link> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news -articles: imagine a car driver who masters his car perfectly but does +articles: imagine a car driver who masters a car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote>traffic rules</quote> of the diff --git a/doc/knode/journey.docbook b/doc/knode/journey.docbook index 54dc82a3..15a4905f 100644 --- a/doc/knode/journey.docbook +++ b/doc/knode/journey.docbook @@ -158,7 +158,7 @@ newsgroup. It stands for: (R)ead (T)he (F)...ing <para>Wait, what is <acronym>BTW</acronym> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of -acronyms there is table at he end of this section containing the +acronyms there is table at the end of this section containing the most-often-used acronyms.</para> <para>This table does not try to be complete and is based on a list by @@ -519,7 +519,7 @@ head and think of a face.</para> <title>PLONK!</title> <para>This PLONK! looks like some comic-sound, does it not? And that is -exactly what it is used for. The one who reads it knows he was just +exactly what it is used for. The one who reads it knows they were just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the diff --git a/doc/knode/using-morefeatures.docbook b/doc/knode/using-morefeatures.docbook index 28d3142c..62e769ab 100644 --- a/doc/knode/using-morefeatures.docbook +++ b/doc/knode/using-morefeatures.docbook @@ -688,7 +688,7 @@ examples.</para> Test; to do this choose the <guilabel>From</guilabel> header line from the first drop-down list, choose <guilabel>is exactly the same as</guilabel> from the second -drop-down list, and enter his name in the text field. +drop-down list, and enter their name in the text field. But, before doing this you should have a look at the <glossterm>header</glossterm> of one of Theodor's articles and see what is in the <quote>From</quote> line.</para> diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook index 13fdb815..7829e674 100644 --- a/doc/kontact/index.docbook +++ b/doc/kontact/index.docbook @@ -972,7 +972,7 @@ The settings stored in the profile include typical Look&Feel related options <para> Two default profiles are provided by Kontact: "&kontact; Style", which contains the default &kontact; settings, and "Outlook Style", adapting &kontact; to Microsoft Outlook Look&Feel. -The user can adapt existing profiles, create new profiles from his current settings, and import and export profiles. +The user can adapt existing profiles, create new profiles from their current settings, and import and export profiles. </para> <para> diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index 39e0eee7..b9dcf212 100644 --- a/doc/korganizer/index.docbook +++ b/doc/korganizer/index.docbook @@ -403,7 +403,7 @@ want to use another resource, especially if you use a supported groupware server. Please ask the server administrator for the information required to configure the groupware resource, including free/busy information publishing and retrieving. Access to free/busy information allows an event organizer to -take the attendee's calendar in consideration when adding him to the event's +take the attendee's calendar in consideration when adding them to the event's attendee list.</para> <note><para>Besides calendar storage, groupware servers typically offer contacts, @@ -694,7 +694,7 @@ and do not reload the file at regular intervals.</para> the same remote file at the same time, because the remote file resource does not offer a conflict resolution mechanism. For instance, if someone else changes (and saves) the remote file, after you loaded it, and a some time later you save -the file, his changes will be lost. +the file, their changes will be lost. </para></warning> </listitem> @@ -1734,7 +1734,7 @@ requested from the attendee.</para></listitem> <varlistentry> <term><guibutton>Select Addressee</guibutton></term> <listitem><para>If the attendee(s) are in your Address Book, you do not have to -remember or type his email address to add it to the attendee list. Just click +remember or type their email address to add it to the attendee list. Just click the <guibutton>Select Addressee...</guibutton> button and choose the attendee(s) from the list. Please note that this is the standard &kde; address book, which is also used by &kmail; and can also be called as a separate application @@ -1821,7 +1821,7 @@ by dragging it with the mouse, or resize it by moving the edges of the highlight area with the mouse.</para> <para>The free/busy information is only available if the -attendee publishes his free/busy schedule, and if &korganizer; is correctly +attendee publishes their free/busy schedule, and if &korganizer; is correctly configured to retrieve it. For more information about configuring &korganizer; to publish and retrieve free/busy information, please check the <xref linkend="config" />. Double-clicking on an attendee entry in the list diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 65d0fd90..361ff510 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -407,10 +407,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kdateedit.h</includehint> -</includehints> </UI> diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 8ebfc02b..12677e2d 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -606,7 +606,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index 4e990183..0d308deb 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -323,7 +323,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 7dcf8ce2..3f5d3fa5 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -3770,7 +3770,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "receipt</b>. The message author requests a disposition " "notification to be sent and the receiver's mail program " "generates a reply from which the author can learn what " - "happened to his message. Common disposition types include " + "happened to their message. Common disposition types include " "<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> " "(e.g. forwarded).</p>" "<p>The following options are available to control KMail's " @@ -3785,7 +3785,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "<li><em>Deny</em>: Always sends a <b>denied</b> notification. This " "is only <em>slightly</em> better than always sending MDNs. " "The author will still know that the messages has been acted " - "upon, he just cannot tell whether it was deleted or read etc.</li>" + "upon, they just cannot tell whether it was deleted or read etc.</li>" "<li><em>Always send</em>: Always sends the requested " "disposition notification. That means that the author of the " "message gets to know when the message was acted upon and, " diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 4b877aec..82d477b5 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -359,11 +359,9 @@ <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kkeybutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kmfawidgets.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">templatesinsertcommand.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kmfawidgets.h</includehint> - <includehint>templatesinsertcommand.h</includehint> -</includehints> </UI> diff --git a/kmail/kmail.antispamrc-HOWTO b/kmail/kmail.antispamrc-HOWTO index 9edcabb0..a107d81c 100644 --- a/kmail/kmail.antispamrc-HOWTO +++ b/kmail/kmail.antispamrc-HOWTO @@ -49,7 +49,7 @@ General options - Priority: Specifies the priority of the filter. This value is used to place faster filters before the slower ones in the selection list. If the - user chooses the top item, he gets the fastest filter. Provider sided + user chooses the top item, they get the fastest filter. Provider sided "filters" (which produce headers tough) like the GMX filter have a prio at about 70, they are very fast as they don't consume time on the client side. Since CRM114 is almost as fast it gets 65 ;-). diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index da4671bf..d34c731b 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -541,8 +541,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, "and should see the alarms for the events or tasks in this folder. " "The setting applies to Calendar and Task folders only " "(for tasks, this setting is only used for alarms).\n\n" - "Example use cases: if the boss shares a folder with his secretary, " - "only the boss should be marked as busy for his meetings, so he should " + "Example use cases: if the boss shares a folder with their secretary, " + "only the boss should be marked as busy for their meetings, so they should " "select \"Admins\", since the secretary has no admin rights on the folder.\n" "On the other hand if a working group shares a Calendar for " "group meetings, all readers of the folders should be marked " diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 8f883c58..c868c582 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -1386,7 +1386,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt() } mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref; if (mMsgView) { - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); mMsgView->update( true ); } } @@ -2084,7 +2084,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if (mMsgView) { mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); } mHeaders->setFolder( mFolder, forceJumpToUnread ); updateMessageActions(); @@ -2140,7 +2140,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } // reset HTML override to the folder setting mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtOverride(false); mMsgView->setDecryptMessageOverwrite( false ); mMsgView->setShowSignatureDetails( false ); } diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 6694ba3f..06f6c771 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -50,7 +50,7 @@ #include "kmreadermainwin.h" -KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, +KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name ) : KMail::SecondaryWindow( name ? name : "readerwindow#" ), mMsg( 0 ) @@ -59,7 +59,7 @@ KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, //mReaderWin->setShowCompleteMessage( true ); mReaderWin->setAutoDelete( true ); mReaderWin->setHtmlOverride( htmlOverride ); - mReaderWin->setHtmlLoadExtOverride( htmlLoadExtOverride ); + mReaderWin->setHtmlLoadExtDefault( htmlLoadExtDefault ); mReaderWin->setDecryptMessageOverwrite( true ); mReaderWin->setShowSignatureDetails( false ); initKMReaderMainWin(); diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index 2101fcb5..976f1066 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -26,7 +26,7 @@ class KMReaderMainWin : public KMail::SecondaryWindow public: - KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 ); + KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name = 0 ); KMReaderMainWin( char *name = 0 ); KMReaderMainWin(KMMessagePart* aMsgPart, bool aHTML, const TQString& aFileName, const TQString& pname, diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 1bd31129..512f7ca8 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -462,6 +462,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, readConfig(); mHtmlOverride = false; + mHtmlLoadExtDefault = false; mHtmlLoadExtOverride = false; mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; @@ -895,7 +896,6 @@ void KMReaderWin::readConfig(void) mToggleFixFontAction->setChecked( mUseFixedFont ); mHtmlMail = reader.readBoolEntry( "htmlMail", false ); - mHtmlLoadExternal = reader.readBoolEntry( "htmlLoadExternal", false ); setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ), HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) ); @@ -1401,8 +1401,6 @@ void KMReaderWin::updateReaderWin() { if (!mMsgDisplay) return; - mViewer->setOnlyLocalReferences(!htmlLoadExternal()); - htmlWriter()->reset(); KMFolder* folder = 0; @@ -1565,6 +1563,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) // - this can only be done *after* calling parseObjectTree() KMMsgEncryptionState encryptionState = mRootNode->overallEncryptionState(); KMMsgSignatureState signatureState = mRootNode->overallSignatureState(); + mViewer->setOnlyLocalReferences(!htmlLoadExternal()); // Don't crash when switching message while GPG passphrase entry dialog is shown #53185 if (aMsg != message()) { displayMessage(); @@ -2472,11 +2471,14 @@ void KMReaderWin::setHtmlOverride(bool override) //----------------------------------------------------------------------------- -void KMReaderWin::setHtmlLoadExtOverride(bool override) +void KMReaderWin::setHtmlLoadExtDefault(bool loadExtDefault) +{ + mHtmlLoadExtDefault = loadExtDefault; +} + +void KMReaderWin::setHtmlLoadExtOverride(bool loadExtOverride) { - mHtmlLoadExtOverride = override; - //if (message()) - // message()->setDecodeHTML(htmlMail()); + mHtmlLoadExtOverride = loadExtOverride; } @@ -2490,8 +2492,19 @@ bool KMReaderWin::htmlMail() //----------------------------------------------------------------------------- bool KMReaderWin::htmlLoadExternal() { - return ((mHtmlLoadExternal && !mHtmlLoadExtOverride) || - (!mHtmlLoadExternal && mHtmlLoadExtOverride)); + if (!mRootNode) + { + return mHtmlLoadExtOverride; + } + + // when displaying an encrypted message, only load external resources on explicit request + if (mRootNode->overallEncryptionState() != KMMsgNotEncrypted) + { + return mHtmlLoadExtOverride; + } + + return ((mHtmlLoadExtDefault && !mHtmlLoadExtOverride) || + (!mHtmlLoadExtDefault && mHtmlLoadExtOverride)); } diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 239c0fc0..a3da9762 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -199,9 +199,22 @@ public: bool htmlOverride() const { return mHtmlOverride; } void setHtmlOverride( bool override ); - /** Override default load external references setting */ + /** Get the load external references override setting */ bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; } - void setHtmlLoadExtOverride( bool override ); + + /** Default behavior for loading external references. + * Use this for specifying the external reference loading behavior as + * specified in the user settings. + * @see setHtmlLoadExtOverride + */ + void setHtmlLoadExtDefault(bool loadExtDefault); + + /** Override default load external references setting + * @warning This must only be called when the user has explicitly + * been asked to retrieve external references! + * @see setHtmlLoadExtDefault + */ + void setHtmlLoadExtOverride(bool loadExtOverride); /** Is html mail to be supported? Takes into account override */ bool htmlMail(); @@ -540,7 +553,7 @@ private: TQString renderAttachments( partNode *node, const TQColor &bgColor ); private: - bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride; + bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride; int mAtmCurrent; TQString mAtmCurrentName; KMMessage *mMessage; diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 9a8ae5be..e63add04 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -483,6 +483,9 @@ void KMSender::doSendMsg() msgTransport = mCurrentMsg->headerField("X-KMail-Transport"); } if ( msgTransport.isEmpty() ) { + msgTransport = GlobalSettings::self()->defaultTransport(); + } + if ( msgTransport.isEmpty() ) { const TQStringList sl = KMTransportInfo::availableTransports(); if (!sl.empty()) msgTransport = sl.front(); } diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 14be08e9..2034ebe4 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index 683c7e86..1023dea7 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -329,8 +329,6 @@ <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">templatesinsertcommand.h</include> </includes> -<includehints> - <includehint>templatesinsertcommand.h</includehint> -</includehints> </UI> diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index 702ce90d..e0afff0a 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -143,9 +143,6 @@ <property name="text"> <string>None</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -154,9 +151,6 @@ <property name="text"> <string>SSL</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -165,9 +159,6 @@ <property name="text"> <string>TLS</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index d0f43c94..a44124b5 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -234,9 +234,6 @@ <property name="text"> <string>Show all except selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>1</number> </property> @@ -251,9 +248,6 @@ <property name="text"> <string>Show only selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>0</number> </property> @@ -268,9 +262,6 @@ <property name="text"> <string>Change...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -281,9 +272,6 @@ <property name="text"> <string>Hide to-dos not assigned to me</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>This option hides all to-dos from your list which are assigned to someone else.<br> Only to-dos which have least one attendee will be checked. If you are not in the list of attendees the to-do will be hidden.</string> diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index a5f89cc1..b7a61b60 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -662,11 +662,9 @@ <includes> <include location="global" impldecl="in declaration">addresseelineedit.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">libtdepim/addresseelineedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>libtdepim/addresseelineedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 6868729b..7239719e 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -194,8 +194,7 @@ <tabstop>mToDate</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdateedit.h</includehint> - <includehint>kdateedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> +</includes> </UI> diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index a3d4fb69..13922223 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -169,8 +169,7 @@ <tabstop>mToDate</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdateedit.h</includehint> - <includehint>kdateedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> +</includes> </UI> diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index b9c070eb..a13bc130 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -248,10 +248,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 106ffd7d..031c45dd 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -245,9 +245,6 @@ <property name="text"> <string>Due date</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -446,10 +443,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/printing/calprintweetdeconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui index 0be844ab..079bd164 100644 --- a/korganizer/printing/calprintweetdeconfig_base.ui +++ b/korganizer/printing/calprintweetdeconfig_base.ui @@ -291,10 +291,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 74c525b7..be877365 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -239,10 +239,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index c70fef90..1ae40345 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1680,11 +1680,9 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>keditlistbox.h</includehint> -</includehints> </UI> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 58bf236e..de7da39b 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) if ( mCalendar ) { KCal::Event *oldEvent = mCalendar->event( event->uid() ); if ( oldEvent ) { - kdWarning() << "Already got his event, replace it..." << endl; + kdWarning() << "Already got the event, replace it..." << endl; mCalendar->deleteEvent( oldEvent ); } kdDebug() << "ADD EVENT" << endl; diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 704b3d58..a37369aa 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -299,9 +299,6 @@ <property name="text"> <string>Save as &Distribution List...</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> </widget> <widget class="TQPushButton" row="3" column="0"> <property name="name"> diff --git a/tderesources/blogging/resourcebloggingsettings.ui b/tderesources/blogging/resourcebloggingsettings.ui index 7d7e0227..ce5b7a25 100644 --- a/tderesources/blogging/resourcebloggingsettings.ui +++ b/tderesources/blogging/resourcebloggingsettings.ui @@ -314,17 +314,10 @@ <tabstop>mCloseCategory</tabstop> </tabstops> <layoutdefaults spacing="5" margin="5"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> |