summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrPage.cpp12
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp32
-rw-r--r--kpresenter/KPrTransEffectDia.cpp20
3 files changed, 32 insertions, 32 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index fc57515d..43469219 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -2330,12 +2330,12 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con
{
o = it.toLast();
while ( o ) {
- if ( o != m_doc->footer() ||
- o != m_doc->header() ||
- ( m_bHasFooter && o == m_doc->footer() ) ||
+ if ( o != m_doc->footer() ||
+ o != m_doc->header() ||
+ ( m_bHasFooter && o == m_doc->footer() ) ||
( m_bHasHeader && o == m_doc->header() ) )
{
- if ( ( o->isSelected() || i > 0 ) &&
+ if ( ( o->isSelected() || i > 0 ) &&
o->contains( pos ) && !( o->isProtect() && withoutProtected ) )
return o;
}
@@ -2420,10 +2420,10 @@ KCommand *KPrPage::alignVertical(VerticalAlignmentType _type )
KPrTextObject *obj = dynamic_cast<KPrTextObject *>(it.current());
if ( obj && !obj->isProtectContent())
{
- KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("ChangeQt::Vertical Alignment"),
+ KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("Change Vertical Alignment"),
obj, obj->verticalAlignment(),_type, m_doc);
if ( !macro )
- macro = new KMacroCommand( i18n("ChangeQt::Vertical Alignment"));
+ macro = new KMacroCommand( i18n("Change Vertical Alignment"));
macro->addCommand( cmd );
cmd->execute();
}
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 51a4964e..d7d0b668 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -50,7 +50,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
int pgnum = m_view->getCurrPgNum() - 1;
KPrPage *page = m_view->kPresenterDoc()->pageList().at( pgnum );
m_effect = page->getPageEffect();
- m_effectSpeed = page->getPageEffectSpeed();
+ m_effectSpeed = page->getPageEffectSpeed();
m_soundEffect = page->getPageSoundEffect();
m_soundFileName = page->getPageSoundFileName();
m_slideTime = page->getPageTimer();
@@ -81,20 +81,20 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
// fill effect combo
m_dialog->effectCombo->insertItem( i18n( "No Effect" ) );
- m_dialog->effectCombo->insertItem( i18n( "CloseQt::Horizontal" ) );
- m_dialog->effectCombo->insertItem( i18n( "CloseQt::Vertical" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Close Horizontal" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Close Vertical" ) );
m_dialog->effectCombo->insertItem( i18n( "Close From All Directions" ) );
- m_dialog->effectCombo->insertItem( i18n( "OpenQt::Horizontal" ) );
- m_dialog->effectCombo->insertItem( i18n( "OpenQt::Vertical" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Open Horizontal" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Open Vertical" ) );
m_dialog->effectCombo->insertItem( i18n( "Open From All Directions" ) );
- m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 1" ) );
- m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 2" ) );
- m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 1" ) );
- m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 2" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 1" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 2" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 1" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 2" ) );
m_dialog->effectCombo->insertItem( i18n( "Surround 1" ) );
m_dialog->effectCombo->insertItem( i18n( "Fly Away 1" ) );
- m_dialog->effectCombo->insertItem( i18n( "Blinds::Horizontal" ) );
- m_dialog->effectCombo->insertItem( i18n( "Blinds::Vertical" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Blinds Horizontal" ) );
+ m_dialog->effectCombo->insertItem( i18n( "Blinds Vertical" ) );
m_dialog->effectCombo->insertItem( i18n( "Box In" ) );
m_dialog->effectCombo->insertItem( i18n( "Box Out" ) );
m_dialog->effectCombo->insertItem( i18n( "Checkerboard Across" ) );
@@ -130,7 +130,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
m_dialog->effectCombo->setCurrentItem( m_dialog->effectCombo->count()-1 );
connect( m_dialog->effectCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) );
-
+
// setup speed combo
m_dialog->speedCombo->insertItem( i18n("Slow") );
m_dialog->speedCombo->insertItem( i18n("Medium") );
@@ -164,7 +164,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotUser1() ) );
-
+
setMainWidget( m_dialog );
}
@@ -188,7 +188,7 @@ void KPrSlideTransitionDia::preview()
effect = PEF_RANDOM;
EffectSpeed effectSpeed = static_cast<EffectSpeed>( m_dialog->speedCombo->currentItem() );
-
+
if ( m_pageEffect )
{
m_pageEffectTimer.stop();
@@ -330,7 +330,7 @@ void KPrSlideTransitionDia::apply( bool global )
bool soundEffect = m_dialog->soundCheckBox->isChecked();
TQString soundFileName = m_dialog->soundRequester->url();
int slideTime = m_dialog->automaticTransitionInput->value();
-
+
if ( effect != m_effect ||
effectSpeed != m_effectSpeed ||
soundEffect != m_soundEffect ||
@@ -338,7 +338,7 @@ void KPrSlideTransitionDia::apply( bool global )
slideTime != m_slideTime )
{
KPrTransEffectCmd::PageEffectSettings newSettings;
-
+
newSettings.pageEffect = effect;
newSettings.effectSpeed = effectSpeed;
newSettings.soundEffect = soundEffect;
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index b1118cd8..0a276a5a 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -185,20 +185,20 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
effectList = new TQListBox( leftpart );
effectList->insertItem( i18n( "No Effect" ) );
- effectList->insertItem( i18n( "CloseQt::Horizontal" ) );
- effectList->insertItem( i18n( "CloseQt::Vertical" ) );
+ effectList->insertItem( i18n( "Close Horizontal" ) );
+ effectList->insertItem( i18n( "Close Vertical" ) );
effectList->insertItem( i18n( "Close From All Directions" ) );
- effectList->insertItem( i18n( "OpenQt::Horizontal" ) );
- effectList->insertItem( i18n( "OpenQt::Vertical" ) );
+ effectList->insertItem( i18n( "Open Horizontal" ) );
+ effectList->insertItem( i18n( "Open Vertical" ) );
effectList->insertItem( i18n( "Open From All Directions" ) );
- effectList->insertItem( i18n( "InterlockingQt::Horizontal 1" ) );
- effectList->insertItem( i18n( "InterlockingQt::Horizontal 2" ) );
- effectList->insertItem( i18n( "InterlockingQt::Vertical 1" ) );
- effectList->insertItem( i18n( "InterlockingQt::Vertical 2" ) );
+ effectList->insertItem( i18n( "Interlocking Horizontal 1" ) );
+ effectList->insertItem( i18n( "Interlocking Horizontal 2" ) );
+ effectList->insertItem( i18n( "Interlocking Vertical 1" ) );
+ effectList->insertItem( i18n( "Interlocking Vertical 2" ) );
effectList->insertItem( i18n( "Surround 1" ) );
effectList->insertItem( i18n( "Fly Away 1" ) );
- effectList->insertItem( i18n( "Blinds::Horizontal" ) );
- effectList->insertItem( i18n( "Blinds::Vertical" ) );
+ effectList->insertItem( i18n( "Blinds Horizontal" ) );
+ effectList->insertItem( i18n( "Blinds Vertical" ) );
effectList->insertItem( i18n( "Box In" ) );
effectList->insertItem( i18n( "Box Out" ) );
effectList->insertItem( i18n( "Checkerboard Across" ) );
generated by cgit v1.2.1 (git 2.18.0) at 2025-03-11 10:28:17 +0000