From 55f92ecb7c523723045fbbd3f543bd026e0529c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 11 Feb 2013 02:39:04 -0600 Subject: [PATCH] Fix unintended rename --- kmail/kmreaderwin.cpp | 14 +++++++------- kmail/kmreaderwin.h | 6 +++--- kmail/pics/CMakeLists.txt | 4 ++-- kmail/pics/Makefile.am | 4 ++-- kmail/urlhandlermanager.cpp | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index f75137ee..b3220b1f 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -440,7 +440,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, mSavedRelativePosition( 0 ), mDecrytMessageOverwrite( false ), mShowSignatureDetails( false ), - mShowAttachmentQuictdelist( true ), + mShowAttachmentQuicklist( true ), mShowRawToltecMail( false ) { mExternalWindow = (aParent == mainWindow ); @@ -2872,12 +2872,12 @@ void KMReaderWin::injectAttachments() TQString visibility; TQString urlHandle; TQString imgSrc; - if( !showAttachmentQuictdelist() ) { - urlHandle.append( "kmail:showAttachmentQuictdelist" ); - imgSrc.append( "attachmentQuictdelistClosed.png" ); + if( !showAttachmentQuicklist() ) { + urlHandle.append( "kmail:showAttachmentQuicklist" ); + imgSrc.append( "attachmentQuicklistClosed.png" ); } else { - urlHandle.append( "kmail:hideAttachmentQuictdelist" ); - imgSrc.append( "attachmentQuictdelistOpened.png" ); + urlHandle.append( "kmail:hideAttachmentQuicklist" ); + imgSrc.append( "attachmentQuicklistOpened.png" ); } TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); @@ -2919,7 +2919,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor if ( !subHtml.isEmpty() ) { TQString visibility; - if ( !showAttachmentQuictdelist() ) { + if ( !showAttachmentQuicklist() ) { visibility.append( "display:none;" ); } diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index d89d184b..6251a484 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -319,10 +319,10 @@ public: void setShowSignatureDetails( bool showDetails = true ) { mShowSignatureDetails = showDetails; } /* show or hide the list that points to the attachments */ - bool showAttachmentQuictdelist() const { return mShowAttachmentQuictdelist; } + bool showAttachmentQuicklist() const { return mShowAttachmentQuicklist; } /* show or hide the list that points to the attachments */ - void setShowAttachmentQuictdelist( bool showAttachmentQuictdelist = true ) { mShowAttachmentQuictdelist = showAttachmentQuictdelist; } + void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; } // This controls whether a Toltec invitation is shown in its raw form or as a replacement text. // This can be toggled with the "kmail:showRawToltecMail" link. @@ -609,7 +609,7 @@ private: int mLevelQuote; bool mDecrytMessageOverwrite; bool mShowSignatureDetails; - bool mShowAttachmentQuictdelist; + bool mShowAttachmentQuicklist; bool mShowRawToltecMail; bool mExternalWindow; }; diff --git a/kmail/pics/CMakeLists.txt b/kmail/pics/CMakeLists.txt index 0e515b83..ea728f8b 100644 --- a/kmail/pics/CMakeLists.txt +++ b/kmail/pics/CMakeLists.txt @@ -25,6 +25,6 @@ install( FILES enterprise_left.png enterprise_right.png enterprise_s_left.png enterprise_sbar.png enterprise_s_right.png enterprise_sp_right.png enterprise_top_left.png enterprise_top.png enterprise_top_right.png - enterprise_sw.png enterprise_w.png attachmentQuictdelistClosed.png - attachmentQuictdelistOpened.png + enterprise_sw.png enterprise_w.png attachmentQuicklistClosed.png + attachmentQuicklistOpened.png DESTINATION ${DATA_INSTALL_DIR}/kmail/pics ) diff --git a/kmail/pics/Makefile.am b/kmail/pics/Makefile.am index 4b420013..8c185ddb 100644 --- a/kmail/pics/Makefile.am +++ b/kmail/pics/Makefile.am @@ -27,8 +27,8 @@ pics_DATA = kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgread.png \ enterprise_top_right.png \ enterprise_sw.png \ enterprise_w.png \ - attachmentQuictdelistClosed.png \ - attachmentQuictdelistOpened.png + attachmentQuicklistClosed.png \ + attachmentQuicklistOpened.png picsdir = $(kde_datadir)/kmail/pics diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 7ce10ce1..1a72cb27 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -444,16 +444,16 @@ namespace { return true; } - if ( url.path() == "showAttachmentQuictdelist" ) { + if ( url.path() == "showAttachmentQuicklist" ) { w->saveRelativePosition(); - w->setShowAttachmentQuictdelist( true ); + w->setShowAttachmentQuicklist( true ); w->update( true ); return true; } - if ( url.path() == "hideAttachmentQuictdelist" ) { + if ( url.path() == "hideAttachmentQuicklist" ) { w->saveRelativePosition(); - w->setShowAttachmentQuictdelist( false ); + w->setShowAttachmentQuicklist( false ); w->update( true ); return true; } @@ -490,9 +490,9 @@ namespace { return i18n("Show signature details."); if ( url.path() == "hideSignatureDetails" ) return i18n("Hide signature details."); - if ( url.path() == "hideAttachmentQuictdelist" ) + if ( url.path() == "hideAttachmentQuicklist" ) return i18n( "Hide attachment list" ); - if ( url.path() == "showAttachmentQuictdelist" ) + if ( url.path() == "showAttachmentQuicklist" ) return i18n( "Show attachment list" ); } return TQString() ;