wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and simplify forwarding inline by default option.

Browse Source 
Kolab issue 1530.

svn path=/branches/kdepim/proko2/kdepim/; revision=660368
wilder-work
Volker Krause 19 years ago
parent 7bebda7508
commit 3aa25ebfa8
8 changed files with 8 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kmail_part.cpp
  2. 25
      kmmainwidget.cpp
  3. 5
      kmmainwidget.h
  4. 2
      kmmainwin.cpp
  5. 7
      kmmainwin.rc
  6. 25
      kmreadermainwin.cpp
  7. 5
      kmreadermainwin.h
  8. 7
      kmreadermainwin.rc

1
kmail_part.cpp
Unescape View File

@ -220,7 +220,6 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
kdDebug(5006) << "KMailPart::guiActivateEvent" << endl;
KParts::ReadOnlyPart::guiActivateEvent(e);
mainWidget->initializeFilterActions();
mainWidget->setupForwardingActionsList();
}
void KMailPart::exit()

25
kmmainwidget.cpp
Unescape View File

@ -2300,12 +2300,9 @@ void KMMainWidget::setupActions()
"mail_forward", actionCollection(),
"message_forward" );
connect( mForwardActionMenu, SIGNAL(activated()), this,
SLOT(slotForwardAttachedMsg()) );
mForwardInlineAction = new KAction( i18n("&Inline..."),
"mail_forward", 0, this,
SLOT(slotForwardInlineMsg()),
SLOT(slotForwardMsg()),
actionCollection(),
"message_forward_inline" );
@ -2325,7 +2322,7 @@ void KMMainWidget::setupActions()
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
connect( mForwardActionMenu, SIGNAL(activated()), this,
SLOT(slotForwardInlineMsg()) );
SLOT(slotForwardMsg()) );
} else {
mForwardActionMenu->insert( mForwardAttachedAction );
@ -2777,24 +2774,6 @@ void KMMainWidget::setupActions()
updateMessageActions();
}
void KMMainWidget::setupForwardingActionsList()
{
QPtrList<KAction> mForwardActionList;
if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
mGUIClient->unplugActionList( "forward_action_list" );
mForwardActionList.append( mForwardInlineAction );
mForwardActionList.append( mForwardAttachedAction );
mForwardActionList.append( mRedirectAction );
mGUIClient->plugActionList( "forward_action_list", mForwardActionList );
} else {
mGUIClient->unplugActionList( "forward_action_list" );
mForwardActionList.append( mForwardAttachedAction );
mForwardActionList.append( mForwardInlineAction );
mForwardActionList.append( mRedirectAction );
mGUIClient->plugActionList( "forward_action_list", mForwardActionList );
}
}
//-----------------------------------------------------------------------------
void KMMainWidget::slotEditNotifications()
{

5
kmmainwidget.h
Unescape View File

@ -144,11 +144,6 @@ public:
void modifyFolder( KMFolderTreeItem* folderItem );
/**
* Sets up action list for forward menu.
*/
void setupForwardingActionsList();
public slots:
void slotMoveMsgToFolder( KMFolder *dest);
void slotTrashMsg(); // move to trash

2
kmmainwin.cpp
Unescape View File

@ -55,8 +55,6 @@ KMMainWin::KMMainWin(QWidget *)
// Don't use conserveMemory() because this renders dynamic plugging
// of actions unusable!
mKMMainWidget->setupForwardingActionsList();
applyMainWindowSettings(KMKernel::config(), "Main Window");
connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ),

7
kmmainwin.rc
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui version="83" name="kmmainwin" >
<kpartgui version="84" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
@ -95,10 +95,7 @@
<Action name="reply_author" />
<Action name="reply_list" />
<Action name="noquotereply" />
<Menu name="menubar_message_forward">
<text>&amp;Forward</text>
<ActionList name="forward_action_list"/>
</Menu>
<Action name="message_forward" />
<Action name="bounce" />
<Action name="send_again" />
<Separator/>

25
kmreadermainwin.cpp
Unescape View File

@ -210,12 +210,10 @@ void KMReaderMainWin::setupAccel()
mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
"mail_forward", actionCollection(),
"message_forward" );
connect( mForwardActionMenu, SIGNAL( activated() ), this,
SLOT( slotForwardAttachedMsg() ) );
mForwardInlineAction = new KAction( i18n("&Inline..."),
"mail_forward", SHIFT+Key_F, this,
SLOT(slotForwardInlineMsg()),
SLOT(slotForwardMsg()),
actionCollection(),
"message_forward_inline" );
@ -235,7 +233,7 @@ void KMReaderMainWin::setupAccel()
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
connect( mForwardActionMenu, SIGNAL(activated()), this,
SLOT(slotForwardInlineMsg()) );
SLOT(slotForwardMsg()) );
} else {
mForwardActionMenu->insert( mForwardAttachedAction );
mForwardActionMenu->insert( mForwardInlineAction );
@ -293,29 +291,10 @@ void KMReaderMainWin::setupAccel()
"kmail_copy" );
createGUI( "kmreadermainwin.rc" );
setupForwardingActionsList();
//menuBar()->hide();
//toolBar( "mainToolBar" )->hide();
}
void KMReaderMainWin::setupForwardingActionsList()
{
QPtrList<KAction> mForwardActionList;
if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
unplugActionList( "forward_action_list" );
mForwardActionList.append( mForwardInlineAction );
mForwardActionList.append( mForwardAttachedAction );
mForwardActionList.append( mRedirectAction );
plugActionList( "forward_action_list", mForwardActionList );
} else {
unplugActionList( "forward_action_list" );
mForwardActionList.append( mForwardAttachedAction );
mForwardActionList.append( mForwardInlineAction );
mForwardActionList.append( mRedirectAction );
plugActionList( "forward_action_list", mForwardActionList );
}
}
void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const QPoint& aPoint)
{
KPopupMenu * menu = new KPopupMenu;

5
kmreadermainwin.h
Unescape View File

@ -29,11 +29,6 @@ public:
// take ownership of and show @param msg
void showMsg( const QString & encoding, KMMessage *msg );
/**
* Sets up action list for forward menu.
*/
void setupForwardingActionsList();
private slots:
void slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const QPoint& aPoint);

7
kmreadermainwin.rc
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui version="6" name="kmreadermainwin" >
<kpartgui version="7" name="kmreadermainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
@ -35,10 +35,7 @@
<Action name="reply_author" />
<Action name="reply_list" />
<Action name="noquotereply" />
<Menu name="menubar_message_forward">
<text>&amp;Forward</text>
<ActionList name="forward_action_list"/>
</Menu>
<Action name="message_forward" />
</Menu>
<Menu noMerge="1" name="settings">
<text>&amp;Settings</text>

Write Preview
Loading…
Cancel
Save