sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implement: Option to disable emoticons in the chat (#172)

Browse Source
This commit is contained in:
doitux
2013-07-01 10:29:07 +02:00
parent f211e31acf
commit 8264a61692
5 changed files with 207 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+2 -1
View File
@@ -64,7 +64,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myConfigState = OK;
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 99;
configRev = 100;
//standard defaults
logOnOffDefault = "1";
@@ -162,6 +162,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
configList.push_back(ConfigInfo("DisableSplashScreenOnStartup", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("AccidentallyCallBlocker", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("DontHideAvatarsOfIgnored", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("DisableChatEmoticons", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("AlternateFKeysUserActionMode", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("EnableBetInputFocusSwitch", CONFIG_TYPE_INT, "0"));
src/gui/qt/chattools/chattools.cpp
+3 -1
View File
@@ -167,7 +167,9 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
if(!nickFoundOnIgnoreList) {
tempMsg = checkForEmotes(tempMsg);
if(!myConfig->readConfigInt("DisableChatEmoticons")) {
tempMsg = checkForEmotes(tempMsg);
}
if(message.indexOf(QString("/me "))==0) {
myTextBrowser->append(tempMsg.replace("/me ","<i>*"+playerName+" ")+"</i>");
src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+8 -1
View File
@@ -320,6 +320,13 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_disableChatEmoticons">
<property name="text">
<string>Disable emoticons in the chat</string>
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -327,7 +334,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>178</height>
<height>146</height>
</size>
</property>
</spacer>
src/gui/qt/settingsdialog.ui
+191 -160
View File
@@ -156,159 +156,198 @@
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_14">
<property name="text">
<string>Language:</string>
</property>
<property name="buddy">
<cstring>comboBox_switchLanguage</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_switchLanguage"/>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showRightToolbox">
<property name="text">
<string>Show right toolbox</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showFadeOutCardsAnimation">
<property name="text">
<string>Show fade-out animation for non-winning cards</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_alternateFKeysUserActionMode">
<property name="text">
<string>Reverse order of F-Keys (F1 - F4)</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showBlindButtons">
<property name="text">
<string>Show buttons for small blind and big blind</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_dontTranslatePokerStrings">
<property name="text">
<string>Don't translate poker strings like check, call, raise from game table style</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_cardsChanceMonitor">
<property name="text">
<string>Show cards chance monitor</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_antiPeekMode">
<property name="text">
<string>Show own cards only on mouse click</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showFlipCardsAnimation">
<property name="text">
<string>Show flip-card animation</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showLeftToolbox">
<property name="text">
<string>Show left toolbox</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_disableSplashscreen">
<property name="text">
<string>Disable splashscreen on startup</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Network / Internet Game</string>
<widget class="QTabWidget" name="tabWidget_3">
<property name="currentIndex">
<number>0</number>
</property>
<layout class="QGridLayout">
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_enableBetInputFocusSwitch">
<property name="text">
<string>Switch keyboard focus to bet-input-field if it's your turn</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox_showCountryFlagInAvatar">
<property name="text">
<string>Show country flag in the corner of avatar</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox_enableAccidentallyCallBlocker">
<property name="text">
<string>Activate the &quot;accidentally call after big raise&quot; blocker</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="checkBox_dontHideAvatarsOfIgnored">
<property name="text">
<string>Do not hide avatars of players which are on the ignore list</string>
</property>
</widget>
</item>
</layout>
<widget class="QWidget" name="tab_7">
<attribute name="title">
<string>Common</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_14">
<property name="text">
<string>Language:</string>
</property>
<property name="buddy">
<cstring>comboBox_switchLanguage</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_switchLanguage"/>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showRightToolbox">
<property name="text">
<string>Show right toolbox</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showFadeOutCardsAnimation">
<property name="text">
<string>Show fade-out animation for non-winning cards</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_alternateFKeysUserActionMode">
<property name="text">
<string>Reverse order of F-Keys (F1 - F4)</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showBlindButtons">
<property name="text">
<string>Show buttons for small blind and big blind</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_dontTranslatePokerStrings">
<property name="text">
<string>Don't translate poker strings like check, call, raise from game table style</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_cardsChanceMonitor">
<property name="text">
<string>Show cards chance monitor</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_antiPeekMode">
<property name="text">
<string>Show own cards only on mouse click</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showFlipCardsAnimation">
<property name="text">
<string>Show flip-card animation</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_showLeftToolbox">
<property name="text">
<string>Show left toolbox</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_disableSplashscreen">
<property name="text">
<string>Disable splashscreen on startup</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>85</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_8">
<attribute name="title">
<string>Network / Internet Game</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="6" column="1">
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>221</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox_showCountryFlagInAvatar">
<property name="text">
<string>Show country flag in the corner of avatar</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_UseLobbyChat">
<property name="text">
<string>Show lobby chat</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_enableBetInputFocusSwitch">
<property name="text">
<string>Switch keyboard focus to bet-input-field if it's your turn</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_enableAccidentallyCallBlocker">
<property name="text">
<string>Activate the &quot;accidentally call after big raise&quot; blocker</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_dontHideAvatarsOfIgnored">
<property name="text">
<string>Do not hide avatars of players which are on the ignore list</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox_disableChatEmoticons">
<property name="text">
<string>Disable emoticons in the chat</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="5" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>400</width>
<height>111</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_8">
@@ -1846,14 +1885,7 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_UseLobbyChat">
<property name="text">
<string>Show lobby chat</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -1866,7 +1898,7 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_InetGane_AutoLeaveTheTableAfterGameFinished">
<property name="text">
<string>Automatically leave the table after the game finished</string>
@@ -3984,7 +4016,6 @@ p, li { white-space: pre-wrap; }
<tabstop>comboBox_internetGameType</tabstop>
<tabstop>checkBox_UseInternetGamePassword</tabstop>
<tabstop>lineEdit_InternetGamePassword</tabstop>
<tabstop>checkBox_UseLobbyChat</tabstop>
<tabstop>treeWidget_internetGameIgnoredPlayers</tabstop>
<tabstop>pushButton_internetGameRemoveIgnoredPlayer</tabstop>
<tabstop>pushButton_HumanPlayerAvatar</tabstop>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+3
View File
@@ -292,6 +292,7 @@ void settingsDialogImpl::prepareDialog()
checkBox_disableSplashscreen->setChecked(myConfig->readConfigInt("DisableSplashScreenOnStartup"));
checkBox_enableAccidentallyCallBlocker->setChecked(myConfig->readConfigInt("AccidentallyCallBlocker"));
checkBox_dontHideAvatarsOfIgnored->setChecked(myConfig->readConfigInt("DontHideAvatarsOfIgnored"));
checkBox_disableChatEmoticons->setChecked(myConfig->readConfigInt("DisableChatEmoticons"));
//S t y l e
@@ -740,6 +741,8 @@ void settingsDialogImpl::isAccepted()
myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked());
myConfig->writeConfigInt("AccidentallyCallBlocker", checkBox_enableAccidentallyCallBlocker->isChecked());
myConfig->writeConfigInt("DontHideAvatarsOfIgnored", checkBox_dontHideAvatarsOfIgnored->isChecked());
myConfig->writeConfigInt("DisableChatEmoticons", checkBox_disableChatEmoticons->isChecked());
myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked());
myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked());