Changeset 6173

Show
Ignore:
Timestamp:
04/27/08 22:47:06 (6 months ago)
Author:
flynd
Message:

Renamed config parameter for hiding chat dialog buttons to more general name.

Location:
trunk/qt4-gui/src
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • trunk/qt4-gui/src/config/chat.cpp

    r6143 r6173  
    5959  iniFile.ReadBool("AutoPosReplyWin", myAutoPosReplyWin, true); 
    6060  iniFile.ReadBool("AutoSendThroughServer", myAutoSendThroughServer, false); 
    61   iniFile.ReadBool("NoSendClose", myShowSendClose, true); 
    62   myShowSendClose = !myShowSendClose; 
     61  iniFile.ReadBool("ShowChatDlgButtons", myShowDlgButtons, true); 
    6362  iniFile.ReadNum("ChatMessageStyle", myChatMsgStyle, 0); 
    6463  iniFile.ReadBool("ChatVerticalSpacing", myChatVertSpacing, true); 
     
    128127  iniFile.WriteBool("AutoPosReplyWin", myAutoPosReplyWin); 
    129128  iniFile.WriteBool("AutoSendThroughServer", myAutoSendThroughServer); 
    130   iniFile.WriteBool("NoSendClose", !myShowSendClose); 
     129  iniFile.WriteBool("ShowChatDlgButtons", myShowDlgButtons); 
    131130  iniFile.WriteBool("FlashTaskbar", myFlashTaskbar); 
    132131  iniFile.WriteBool("MsgWinSticky", myMsgWinSticky); 
     
    311310} 
    312311 
    313 void Config::Chat::setShowSendClose(bool showSendClose) 
    314 { 
    315   if (showSendClose == myShowSendClose) 
    316     return; 
    317  
    318   myShowSendClose = showSendClose; 
     312void Config::Chat::setShowDlgButtons(bool showDlgButtons) 
     313{ 
     314  if (showDlgButtons == myShowDlgButtons) 
     315    return; 
     316 
     317  myShowDlgButtons = showDlgButtons; 
    319318} 
    320319 
  • trunk/qt4-gui/src/config/chat.h

    r6143 r6173  
    7474  bool autoPosReplyWin() const { return myAutoPosReplyWin; } 
    7575  bool autoSendThroughServer() const { return myAutoSendThroughServer; } 
    76   bool showSendClose() const { return myShowSendClose; } 
     76  bool showDlgButtons() const { return myShowDlgButtons; } 
    7777  bool showAllEncodings() const { return myShowAllEncodings; } 
    7878  QByteArray defaultEncoding() const { return myDefaultEncoding; } 
     
    124124  void setAutoPosReplyWin(bool autoPosReplyWin); 
    125125  void setAutoSendThroughServer(bool autoSendThroughServer); 
    126   void setShowSendClose(bool showSendClose); 
     126  void setShowDlgButtons(bool showDlgButtons); 
    127127  void setShowAllEncodings(bool showAllEncodings); 
    128128  void setDefaultEncoding(QByteArray defaultEncoding); 
     
    172172  bool myAutoPosReplyWin; 
    173173  bool myAutoSendThroughServer; 
    174   bool myShowSendClose; 
     174  bool myShowDlgButtons; 
    175175  bool myShowAllEncodings; 
    176176  bool myTabbedChatting; 
  • trunk/qt4-gui/src/settings/chat.cpp

    r6162 r6173  
    534534  myAutoPosReplyWinCheck->setChecked(chatConfig->autoPosReplyWin()); 
    535535  myAutoSendThroughServerCheck->setChecked(chatConfig->autoSendThroughServer()); 
    536   myShowSendCloseCheck->setChecked(chatConfig->showSendClose()); 
     536  myShowSendCloseCheck->setChecked(chatConfig->showDlgButtons()); 
    537537  myCheckSpelling->setChecked(chatConfig->checkSpelling()); 
    538538  myMsgWinStickyCheck->setChecked(chatConfig->msgWinSticky()); 
     
    607607  chatConfig->setAutoPosReplyWin(myAutoPosReplyWinCheck->isChecked()); 
    608608  chatConfig->setAutoSendThroughServer(myAutoSendThroughServerCheck->isChecked()); 
    609   chatConfig->setShowSendClose(myShowSendCloseCheck->isChecked()); 
     609  chatConfig->setShowDlgButtons(myShowSendCloseCheck->isChecked()); 
    610610  chatConfig->setCheckSpelling(myCheckSpelling->isChecked()); 
    611611  chatConfig->setMsgWinSticky(myMsgWinStickyCheck->isChecked()); 
  • trunk/qt4-gui/src/userevents/usersendcommon.cpp

    r6160 r6173  
    224224  connect(myCloseButton, SIGNAL(clicked()), SLOT(closeDialog())); 
    225225 
    226   buttons->setVisible(Config::Chat::instance()->showSendClose()); 
     226  buttons->setVisible(Config::Chat::instance()->showDlgButtons()); 
    227227 
    228228  myViewSplitter = new QSplitter(Qt::Vertical); 
     
    431431 
    432432  setFocusProxy(myMessageEdit); 
    433   if (Config::Chat::instance()->showSendClose()) 
     433  if (Config::Chat::instance()->showDlgButtons()) 
    434434  { 
    435435    setTabOrder(myMessageEdit, mySendButton);