summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeL10n.txt3
-rw-r--r--CMakeLists.txt3
m---------admin0
-rw-r--r--akregator/src/mk4storage/mk4confwidgetbase.ui10
-rw-r--r--certmanager/certificatewizard.ui6
-rw-r--r--karm/csvexportdialog_base.ui4
-rw-r--r--kgantt/kgantt/itemedit.ui6
-rw-r--r--kgantt/kgantt/itemedit2.ui6
-rw-r--r--kmail/customtemplates_base.ui8
-rw-r--r--kmail/kmsender.cpp3
-rw-r--r--kmail/templatesconfiguration_base.ui4
-rw-r--r--korganizer/koeditoralarms_base.ui8
-rw-r--r--korganizer/korgac/alarmdialog.cpp14
-rw-r--r--korganizer/plugins/printing/journal/calprintjournalconfig_base.ui7
-rw-r--r--korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui7
-rw-r--r--korganizer/printing/calprintdayconfig_base.ui5
-rw-r--r--korganizer/printing/calprinttodoconfig_base.ui5
-rw-r--r--korganizer/printing/calprintweetdeconfig_base.ui5
-rw-r--r--korn/kornaccountcfg.ui6
-rw-r--r--korn/kornboxcfg.ui6
-rw-r--r--tderesources/blogging/resourcebloggingsettings.ui19
21 files changed, 59 insertions, 76 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 f0dad360..e799e6c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8.12 )
+cmake_minimum_required( VERSION 3.1 )
##### general package setup #####################
@@ -33,7 +33,6 @@ enable_testing( )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
diff --git a/admin b/admin
-Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63
+Subproject a7f75ac0ff587d5b8694a1b78557597161f8104
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index c5c837a5..896f26f4 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -170,9 +170,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/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/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/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/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/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/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index cc0bb283..b38e6a79 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -544,7 +544,21 @@ void AlarmDialog::wakeUp()
}
if ( activeReminders )
+ {
+ DCOPRef screensaver("kdesktop", "KScreensaverIface");
+ DCOPReply reply = screensaver.call("isBlanked");
+ bool res = true;
+ if (reply.isValid()) {
+ reply.get(res);
+ }
show();
+ if (res)
+ {
+ // Lower the dialog if the screensaver is active or its status unknown.
+ // This prevents reminders to show on a locked screen.
+ lower();
+ }
+ }
setTimer();
showDetails();
emit reminderCount( activeCount() );
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..58a269a6 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -446,10 +446,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/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>