@ -37,7 +37,7 @@
//system includes
//system includes
# include <stdlib.h>
# include <stdlib.h>
// QT includes
// TQt includes
# include <tqpopupmenu.h>
# include <tqpopupmenu.h>
# include <tqsplitter.h>
# include <tqsplitter.h>
# include <tqguardedptr.h>
# include <tqguardedptr.h>
@ -46,7 +46,7 @@
# include <tqlabel.h>
# include <tqlabel.h>
# include <tqvbox.h>
# include <tqvbox.h>
// K DE includes
// T DE includes
# include <tdeaboutdata.h>
# include <tdeaboutdata.h>
# include <tdeaccel.h>
# include <tdeaccel.h>
# include <tdeaction.h>
# include <tdeaction.h>
@ -191,7 +191,7 @@ void BibleTime::initActions() {
action - > plugAccel ( accel ( ) ) ;
action - > plugAccel ( accel ( ) ) ;
# endif
# endif
//delete help action if K DE created it
//delete help action if T DE created it
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ConfigureToolbars ) ) ) {
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ConfigureToolbars ) ) ) {
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( actionCollection ( ) - > action (
( actionCollection ( ) - > action (
@ -405,7 +405,7 @@ void BibleTime::initActions() {
refreshProfileMenus ( ) ;
refreshProfileMenus ( ) ;
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : HelpContents ) ) ) { //delete help action if K DE created it
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : HelpContents ) ) ) { //delete help action if T DE created it
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : HelpContents ) ) ) ;
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : HelpContents ) ) ) ;
}
}
@ -436,14 +436,14 @@ void BibleTime::initActions() {
action - > plugAccel ( accel ( ) ) ;
action - > plugAccel ( accel ( ) ) ;
# endif
# endif
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : WhatsThis ) ) ) { //delete "What's this" action if K DE created it already
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : WhatsThis ) ) ) { //delete "What's this" action if T DE created it already
TDEAction * action = actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : WhatsThis ) ) ;
TDEAction * action = actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : WhatsThis ) ) ;
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( action ) ;
( action ) ;
}
}
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ReportBug ) ) ) { //delete Report Bug action if K DE created it
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ReportBug ) ) ) { //delete Report Bug action if T DE created it
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ReportBug ) ) ) ;
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : ReportBug ) ) ) ;
}
}
@ -466,15 +466,15 @@ void BibleTime::initActions() {
action - > plugAccel ( accel ( ) ) ;
action - > plugAccel ( accel ( ) ) ;
# endif
# endif
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutApp ) ) ) { //delete About KDE action if K DE created it
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutApp ) ) ) { //delete About TDE action if T DE created it
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutApp ) ) ) ;
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutApp ) ) ) ;
}
}
action = KStdAction : : aboutApp ( m_helpMenu , TQ_SLOT ( aboutApplication ( ) ) , actionCollection ( ) ) ;
action = KStdAction : : aboutApp ( m_helpMenu , TQ_SLOT ( aboutApplication ( ) ) , actionCollection ( ) ) ;
action - > setToolTip ( CResMgr : : mainMenu : : help : : aboutBibleTime : : tooltip ) ;
action - > setToolTip ( CResMgr : : mainMenu : : help : : aboutBibleTime : : tooltip ) ;
//delete About KDE action if K DE created it already
//delete About TDE action if T DE created it already
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutKDE ) ) ) { //delete About KDE action if K DE created it
if ( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutKDE ) ) ) { //delete About TDE action if T DE created it
actionCollection ( ) - > remove
actionCollection ( ) - > remove
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutKDE ) ) ) ;
( actionCollection ( ) - > action ( KStdAction : : stdName ( KStdAction : : AboutKDE ) ) ) ;
}
}
@ -580,8 +580,8 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
Q_ASSERT ( p ) ;
Q_ASSERT ( p ) ;
if ( ! p ) return ;
if ( ! p ) return ;
if ( m_initialized ) { //on startup K DE sets the main geometry
if ( m_initialized ) { //on startup T DE sets the main geometry
//see polish(), where m_initialized is set and the K DE methods are called for window resize
//see polish(), where m_initialized is set and the T DE methods are called for window resize
//first Main Window state
//first Main Window state
m_windowFullscreen_action - > setChecked ( p - > fullscreen ( ) ) ; //set the fullscreen button state
m_windowFullscreen_action - > setChecked ( p - > fullscreen ( ) ) ; //set the fullscreen button state