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

case insensitive sorting for style lists

Browse Source
This commit is contained in:
doitux
2009-06-05 19:36:07 +00:00
parent b88555ecd5
commit c3f1654497
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+14 -17
View File
@@ -4,18 +4,19 @@ TEMPLATE = app
CODECFORSRC = UTF-8
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
# CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
# ####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
# QTPLUGIN += qjpeg qgif
#QTPLUGIN += qjpeg qgif
UI_DIR = uics
MOC_DIR = mocs
OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6
DEFINES += PREFIX=\"$${PREFIX}\"
TARGET = pokerth
#PRECOMPILED_HEADER = src/pch_game.h
# PRECOMPILED_HEADER = src/pch_game.h
RESOURCES = src/gui/qt/resources/pokerth.qrc
INCLUDEPATH += . \
src \
@@ -118,8 +119,8 @@ HEADERS += src/game.h \
src/net/genericsocket.h \
src/net/netpacket.h \
src/net/resolverthread.h \
src/net/senderhelper.h \
src/net/serveraccepthelper.h \
src/net/senderhelper.h \
src/net/serveraccepthelper.h \
src/net/serverlobbythread.h \
src/net/socket_helper.h \
src/net/socket_msg.h \
@@ -189,7 +190,8 @@ HEADERS += src/game.h \
src/gui/qt/serverlistdialog/serverlistdialogimpl.h \
src/gui/qt/gametable/mymenubar.h \
src/gui/qt/gametable/mytimeoutlabel.h \
src/gui/qt/gametable/mynamelabel.h
src/gui/qt/gametable/mynamelabel.h \
src/gui/qt/settingsdialog/mystylelistitem.h
FORMS += src/gui/qt/gametable.ui \
src/gui/qt/aboutpokerth.ui \
src/gui/qt/connecttoserverdialog.ui \
@@ -253,7 +255,8 @@ SOURCES += src/pokerth.cpp \
src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp \
src/gui/qt/gametable/mymenubar.cpp \
src/gui/qt/gametable/mytimeoutlabel.cpp \
src/gui/qt/gametable/mynamelabel.cpp
src/gui/qt/gametable/mynamelabel.cpp \
src/gui/qt/settingsdialog/mystylelistitem.cpp
TRANSLATIONS = ts/pokerth_bg.ts \
ts/pokerth_de.ts \
ts/pokerth_dk.ts \
@@ -345,16 +348,10 @@ win32 {
-lwldap32
RC_FILE = pokerth.rc
}
!win32 {
DEPENDPATH += src/net/linux/ src/core/linux
}
unix {
# workaround for problems with boost_filesystem exceptions
QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
}
!win32:DEPENDPATH += src/net/linux/ \
src/core/linux
unix:# workaround for problems with boost_filesystem exceptions
QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
unix:!mac {
# #### My release static build options
# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp
-2
View File
@@ -11,7 +11,6 @@
//
#include "myavatarlistitem.h"
using namespace std;
MyAvatarListItem::MyAvatarListItem(QListWidget* parent)
@@ -20,7 +19,6 @@ MyAvatarListItem::MyAvatarListItem(QListWidget* parent)
}
MyAvatarListItem::~MyAvatarListItem()
{
}
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+12 -11
View File
@@ -19,6 +19,7 @@
***************************************************************************/
#include "settingsdialogimpl.h"
#include "myavatarlistitem.h"
#include "mystylelistitem.h"
#include "gametablestylereader.h"
#include "carddeckstylereader.h"
@@ -60,8 +61,8 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
comboBox_switchLanguage->addItem(tr("Italian"),"it");
comboBox_switchLanguage->addItem(tr("Norwegian"),"no");
comboBox_switchLanguage->addItem(tr("Polish"),"pl");
comboBox_switchLanguage->addItem(tr("Portuguese (Brazilian)"),"ptbr");
comboBox_switchLanguage->addItem(tr("Portuguese (Portuguese)"),"ptpt");
comboBox_switchLanguage->addItem(tr("Portuguese (Brazilian)"),"ptbr");
comboBox_switchLanguage->addItem(tr("Portuguese (Portuguese)"),"ptpt");
comboBox_switchLanguage->addItem(tr("Russian"),"ru");
comboBox_switchLanguage->addItem(tr("Slovak"),"sk");
comboBox_switchLanguage->addItem(tr("Spanish"),"es");
@@ -243,7 +244,7 @@ void settingsDialogImpl::exec() {
GameTableStyleReader defaultTableStyle(myConfig, this);
defaultTableStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
if(defaultTableStyle.getLoadedSuccessfull()) {
QListWidgetItem *defaultTableItem = new QListWidgetItem(defaultTableStyle.getStyleDescription(),listWidget_gameTableStyles);
MyStyleListItem *defaultTableItem = new MyStyleListItem(defaultTableStyle.getStyleDescription(),listWidget_gameTableStyles);
defaultTableItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
defaultTableItem->setData(16, POKERTH_DISTRIBUTED_STYLE);
defaultTableItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
@@ -252,7 +253,7 @@ void settingsDialogImpl::exec() {
GameTableStyleReader danuxi1TableStyle(myConfig, this);
danuxi1TableStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/danuxi1/danuxi1tablestyle.xml");
if(danuxi1TableStyle.getLoadedSuccessfull()) {
QListWidgetItem *danuxi1TableItem = new QListWidgetItem(danuxi1TableStyle.getStyleDescription(),listWidget_gameTableStyles);
MyStyleListItem *danuxi1TableItem = new MyStyleListItem(danuxi1TableStyle.getStyleDescription(),listWidget_gameTableStyles);
danuxi1TableItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/danuxi1/danuxi1tablestyle.xml");
danuxi1TableItem->setData(16, POKERTH_DISTRIBUTED_STYLE);
danuxi1TableItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/danuxi1/danuxi1tablestyle.xml");
@@ -265,7 +266,7 @@ void settingsDialogImpl::exec() {
GameTableStyleReader nextStyle(myConfig, this);
nextStyle.readStyleFile(QString::fromUtf8(it1->c_str()));
if(!nextStyle.getFallBack() && nextStyle.getLoadedSuccessfull()) {
QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription());
MyStyleListItem *nextItem = new MyStyleListItem(nextStyle.getStyleDescription());
nextItem->setData(15,QString::fromUtf8(it1->c_str()));
nextItem->setData(16, ADDITIONAL_STYLE);
nextItem->setData(Qt::ToolTipRole,QString::fromUtf8(it1->c_str()));
@@ -281,7 +282,7 @@ void settingsDialogImpl::exec() {
int i;
bool currentGameTableFound(FALSE);
for(i=0; i < listWidget_gameTableStyles->count(); i++) {
QListWidgetItem *item = listWidget_gameTableStyles->item(i);
QListWidgetItem *item = listWidget_gameTableStyles->item(i);
if(item->data(15) == currentGameTableStyle.getCurrentFileName()) {
item->setIcon(QIcon(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"/gfx/gui/misc/rating.png"));
listWidget_gameTableStyles->setCurrentItem(item);
@@ -316,7 +317,7 @@ void settingsDialogImpl::exec() {
CardDeckStyleReader defaultCardStyle(myConfig, this);
defaultCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
if(defaultCardStyle.getLoadedSuccessfull()) {
QListWidgetItem *defaultCardItem = new QListWidgetItem(defaultCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
MyStyleListItem *defaultCardItem = new MyStyleListItem(defaultCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
defaultCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
defaultCardItem->setData(16, POKERTH_DISTRIBUTED_STYLE);
defaultCardItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
@@ -325,7 +326,7 @@ void settingsDialogImpl::exec() {
CardDeckStyleReader default4cCardStyle(myConfig, this);
default4cCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
if(default4cCardStyle.getLoadedSuccessfull()) {
QListWidgetItem *default4cCardItem = new QListWidgetItem(default4cCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
MyStyleListItem *default4cCardItem = new MyStyleListItem(default4cCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
default4cCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
default4cCardItem->setData(16, POKERTH_DISTRIBUTED_STYLE);
default4cCardItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
@@ -338,7 +339,7 @@ void settingsDialogImpl::exec() {
CardDeckStyleReader nextStyle(myConfig, this);
nextStyle.readStyleFile(QString::fromUtf8(it2->c_str()));
if(!nextStyle.getFallBack() && nextStyle.getLoadedSuccessfull()) {
QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription());
MyStyleListItem *nextItem = new MyStyleListItem(nextStyle.getStyleDescription());
nextItem->setData(15,QString::fromUtf8(it2->c_str()));
nextItem->setData(16, ADDITIONAL_STYLE);
nextItem->setData(Qt::ToolTipRole,QString::fromUtf8(it2->c_str()));
@@ -985,7 +986,7 @@ void settingsDialogImpl::addGameTableStyle()
GameTableStyleReader newStyle(myConfig, this);
newStyle.readStyleFile(fileName);
if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) {
QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription());
MyStyleListItem *newItem = new MyStyleListItem(newStyle.getStyleDescription());
newItem->setData(15,fileName);
newItem->setData(16, ADDITIONAL_STYLE);
newItem->setData(Qt::ToolTipRole,fileName);
@@ -1090,7 +1091,7 @@ void settingsDialogImpl::addCardDeckStyle()
CardDeckStyleReader newStyle(myConfig, this);
newStyle.readStyleFile(fileName);
if(!newStyle.getFallBack() && newStyle.getLoadedSuccessfull()) {
QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription());
MyStyleListItem *newItem = new MyStyleListItem(newStyle.getStyleDescription());
newItem->setData(15,fileName);
newItem->setData(16, ADDITIONAL_STYLE);
newItem->setData(Qt::ToolTipRole,fileName);
src/gui/qt/settingsdialog/settingsdialogimpl.h
+1
View File
@@ -34,6 +34,7 @@
class ConfigFile;
class selectAvatarDialogImpl;
class manualBlindsOrderDialogImpl;
class MyStyleListItem;
class settingsDialogImpl: public QDialog, public Ui::settingsDialog {
Q_OBJECT