[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/kmail
From:       Laurent Montel <montel () kde ! org>
Date:       2009-09-28 21:40:27
Message-ID: 1254174027.649334.32346.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029070 by mlaurent:

Readd actions


 M  +6 -7      kmreaderwin.cpp  
 M  +1 -1      kmreaderwin.h  


--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.cpp #1029069:1029070
@@ -545,9 +545,9 @@
   mAtmUpdate = false;
 #ifndef USE_AKONADI_VIEWER
   createWidgets();
-  createActions();
   initHtmlWidget();
 #else
+  createActions();
   QVBoxLayout * vlay = new QVBoxLayout( this );
   vlay->setMargin( 0 );
   mViewer = new Viewer( this/*TODO*/,KGlobal::config(),mMainWindow,mActionCollection );
@@ -576,7 +576,7 @@
 
   setMsg( 0, false );
 }
-#ifndef USE_AKONADI_VIEWER
+
 void KMReaderWin::createActions()
 {
   KActionCollection *ac = mActionCollection;
@@ -585,7 +585,7 @@
   }
 
   KToggleAction *raction = 0;
-
+#ifndef USE_AKONADI_VIEWER
   // header style
   KActionMenu *headerMenu  = new KActionMenu(i18nc("View->", "&Headers"), this);
   ac->addAction("view_headers", headerMenu );
@@ -672,7 +672,6 @@
   raction->setHelpText( i18n("Do not show attachments in the message viewer") );
   group->addAction( raction );
   attachmentMenu->addAction( raction );
-
   // Set Encoding submenu
   mSelectEncodingAction  = new KSelectAction(KIcon("character-set"), i18n("&Set Encoding"), this);
   mSelectEncodingAction->setToolBarMode( KSelectAction::MenuMode );
@@ -683,7 +682,7 @@
   encodings.prepend( i18n( "Auto" ) );
   mSelectEncodingAction->setItems( encodings );
   mSelectEncodingAction->setCurrentItem( 0 );
-
+#endif
   //
   // Message Menu
   //
@@ -764,7 +763,7 @@
   ac->addAction( "toggle_fixedfont", mToggleFixFontAction );
   connect( mToggleFixFontAction, SIGNAL(triggered(bool)), SLOT(slotToggleFixedFont()) );
   mToggleFixFontAction->setShortcut( QKeySequence( Qt::Key_X ) );
-
+#ifndef USE_AKONADI_VIEWER
   // Show message structure viewer
   mToggleMimePartTreeAction = new KToggleAction( i18n( "Show Message Structure" ), this );
   ac->addAction( "toggle_mimeparttree", mToggleMimePartTreeAction );
@@ -797,8 +796,8 @@
   ac->addAction( "scroll_down_more", mScrollDownMoreAction );
   connect( mScrollDownMoreAction, SIGNAL( triggered( bool ) ),
            this, SLOT( slotScrollNext() ) );
-}
 #endif
+}
 
 void KMReaderWin::setUseFixedFont( bool useFixedFont )
 {
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.h #1029069:1029070
@@ -578,10 +578,10 @@
   void toggleFullAddressList();
 
 private:
+  void createActions();
 #ifndef USE_AKONADI_VIEWER
   void adjustLayout();
   void createWidgets();
-  void createActions();
   void saveSplitterSizes() const;
   KToggleAction * actionForHeaderStyle( const KMail::HeaderStyle *,
                                        const KMail::HeaderStrategy * );
[prev in list] [next in list] [prev in thread] [next in thread]