Show
Ignore:
Timestamp:
04/10/08 02:50:04 (8 months ago)
Author:
flynd
Message:

Added option to not change status until away message dialog is closed. This closes #1421.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt4-gui/src/core/systemmenu.cpp

    r6054 r6139  
    445445{ 
    446446  unsigned long status = action->data().toUInt(); 
    447  
    448   if (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE) 
    449     AwayMsgDlg::showAwayMsgDlg(status, true); 
    450  
    451   LicqGui::instance()->changeStatus(status, myStatusInvisibleAction->isChecked()); 
     447  bool withMsg = (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE); 
     448  bool changeNow = !Config::General::instance()->delayStatusChange(); 
     449 
     450  if (withMsg) 
     451    AwayMsgDlg::showAwayMsgDlg(status, true, 0, myStatusInvisibleAction->isChecked(), !changeNow); 
     452 
     453  if (changeNow || !withMsg) 
     454    LicqGui::instance()->changeStatus(status, myStatusInvisibleAction->isChecked()); 
    452455} 
    453456 
    … …  
    697700{ 
    698701  int status = action->data().toInt(); 
    699   if (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE) 
    700     AwayMsgDlg::showAwayMsgDlg(status, true); 
    701   LicqGui::instance()->changeStatus(status, myPpid, myStatusInvisibleAction->isChecked()); 
     702  bool withMsg = (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE); 
     703  bool changeNow = !Config::General::instance()->delayStatusChange(); 
     704 
     705  if (withMsg) 
     706    AwayMsgDlg::showAwayMsgDlg(status, true, myPpid, myStatusInvisibleAction->isChecked(), !changeNow); 
     707 
     708  if (changeNow || !withMsg) 
     709    LicqGui::instance()->changeStatus(status, myPpid, myStatusInvisibleAction->isChecked()); 
    702710} 
    703711