Changeset 6173
- Timestamp:
- 04/27/08 22:47:06 (6 months ago)
- Location:
- trunk/qt4-gui/src
- Files:
-
- 4 modified
-
config/chat.cpp (modified) (3 diffs)
-
config/chat.h (modified) (3 diffs)
-
settings/chat.cpp (modified) (2 diffs)
-
userevents/usersendcommon.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/qt4-gui/src/config/chat.cpp
r6143 r6173 59 59 iniFile.ReadBool("AutoPosReplyWin", myAutoPosReplyWin, true); 60 60 iniFile.ReadBool("AutoSendThroughServer", myAutoSendThroughServer, false); 61 iniFile.ReadBool("NoSendClose", myShowSendClose, true); 62 myShowSendClose = !myShowSendClose; 61 iniFile.ReadBool("ShowChatDlgButtons", myShowDlgButtons, true); 63 62 iniFile.ReadNum("ChatMessageStyle", myChatMsgStyle, 0); 64 63 iniFile.ReadBool("ChatVerticalSpacing", myChatVertSpacing, true); … … 128 127 iniFile.WriteBool("AutoPosReplyWin", myAutoPosReplyWin); 129 128 iniFile.WriteBool("AutoSendThroughServer", myAutoSendThroughServer); 130 iniFile.WriteBool(" NoSendClose", !myShowSendClose);129 iniFile.WriteBool("ShowChatDlgButtons", myShowDlgButtons); 131 130 iniFile.WriteBool("FlashTaskbar", myFlashTaskbar); 132 131 iniFile.WriteBool("MsgWinSticky", myMsgWinSticky); … … 311 310 } 312 311 313 void Config::Chat::setShow SendClose(bool showSendClose)314 { 315 if (show SendClose == myShowSendClose)316 return; 317 318 myShow SendClose = showSendClose;312 void Config::Chat::setShowDlgButtons(bool showDlgButtons) 313 { 314 if (showDlgButtons == myShowDlgButtons) 315 return; 316 317 myShowDlgButtons = showDlgButtons; 319 318 } 320 319 -
trunk/qt4-gui/src/config/chat.h
r6143 r6173 74 74 bool autoPosReplyWin() const { return myAutoPosReplyWin; } 75 75 bool autoSendThroughServer() const { return myAutoSendThroughServer; } 76 bool show SendClose() const { return myShowSendClose; }76 bool showDlgButtons() const { return myShowDlgButtons; } 77 77 bool showAllEncodings() const { return myShowAllEncodings; } 78 78 QByteArray defaultEncoding() const { return myDefaultEncoding; } … … 124 124 void setAutoPosReplyWin(bool autoPosReplyWin); 125 125 void setAutoSendThroughServer(bool autoSendThroughServer); 126 void setShow SendClose(bool showSendClose);126 void setShowDlgButtons(bool showDlgButtons); 127 127 void setShowAllEncodings(bool showAllEncodings); 128 128 void setDefaultEncoding(QByteArray defaultEncoding); … … 172 172 bool myAutoPosReplyWin; 173 173 bool myAutoSendThroughServer; 174 bool myShow SendClose;174 bool myShowDlgButtons; 175 175 bool myShowAllEncodings; 176 176 bool myTabbedChatting; -
trunk/qt4-gui/src/settings/chat.cpp
r6162 r6173 534 534 myAutoPosReplyWinCheck->setChecked(chatConfig->autoPosReplyWin()); 535 535 myAutoSendThroughServerCheck->setChecked(chatConfig->autoSendThroughServer()); 536 myShowSendCloseCheck->setChecked(chatConfig->show SendClose());536 myShowSendCloseCheck->setChecked(chatConfig->showDlgButtons()); 537 537 myCheckSpelling->setChecked(chatConfig->checkSpelling()); 538 538 myMsgWinStickyCheck->setChecked(chatConfig->msgWinSticky()); … … 607 607 chatConfig->setAutoPosReplyWin(myAutoPosReplyWinCheck->isChecked()); 608 608 chatConfig->setAutoSendThroughServer(myAutoSendThroughServerCheck->isChecked()); 609 chatConfig->setShow SendClose(myShowSendCloseCheck->isChecked());609 chatConfig->setShowDlgButtons(myShowSendCloseCheck->isChecked()); 610 610 chatConfig->setCheckSpelling(myCheckSpelling->isChecked()); 611 611 chatConfig->setMsgWinSticky(myMsgWinStickyCheck->isChecked()); -
trunk/qt4-gui/src/userevents/usersendcommon.cpp
r6160 r6173 224 224 connect(myCloseButton, SIGNAL(clicked()), SLOT(closeDialog())); 225 225 226 buttons->setVisible(Config::Chat::instance()->show SendClose());226 buttons->setVisible(Config::Chat::instance()->showDlgButtons()); 227 227 228 228 myViewSplitter = new QSplitter(Qt::Vertical); … … 431 431 432 432 setFocusProxy(myMessageEdit); 433 if (Config::Chat::instance()->show SendClose())433 if (Config::Chat::instance()->showDlgButtons()) 434 434 { 435 435 setTabOrder(myMessageEdit, mySendButton);
