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

Reformatting code using Kernighan & Ritchie style, tabs, tab width=4.

Browse Source 
Command line: astyle --style=kr --indent=force-tab=4 --lineend=linux -n -r <file names>
This commit is contained in:
lotodore
2011-02-11 20:02:08 +00:00
parent 29dca1846e
commit 02518c67b2
232 changed files with 22743 additions and 21044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
+20 -16
View File
@@ -23,64 +23,68 @@
manualBlindsOrderDialogImpl::manualBlindsOrderDialogImpl(QWidget *parent, ConfigFile *c)
: QDialog(parent), myConfig(c), settingsCorrect(TRUE)
: QDialog(parent), myConfig(c), settingsCorrect(TRUE)
{
#ifdef __APPLE__
setWindowModality(Qt::ApplicationModal);
setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
#endif
setupUi(this);
connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) );
connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( removeBlindFromList() ) );
}
void manualBlindsOrderDialogImpl::exec() {
void manualBlindsOrderDialogImpl::exec()
{
QDialog::exec();
}
void manualBlindsOrderDialogImpl::addBlindValueToList() {
void manualBlindsOrderDialogImpl::addBlindValueToList()
{
if(listWidget_blinds->count() == 30) {
if(listWidget_blinds->count() == 30) {
QMessageBox::warning(this, tr("Manual Blinds Order"),
tr("You cannot set more than 30 manual blinds."),
QMessageBox::Close); }
else {
tr("You cannot set more than 30 manual blinds."),
QMessageBox::Close);
} else {
listWidget_blinds->addItem(QString::number(spinBox_input->value(),10));
sortBlindsList();
}
}
void manualBlindsOrderDialogImpl::removeBlindFromList() {
void manualBlindsOrderDialogImpl::removeBlindFromList()
{
listWidget_blinds->takeItem(listWidget_blinds->currentRow());
sortBlindsList();
}
void manualBlindsOrderDialogImpl::sortBlindsList() {
void manualBlindsOrderDialogImpl::sortBlindsList()
{
int i;
QList<int> tempIntList;
QStringList tempStringList;
bool ok = TRUE;
for(i=0; i<listWidget_blinds->count(); i++) {
// std::cout << listWidget_blinds->item(i)->text().toInt(&ok,10) << "\n";
tempIntList << listWidget_blinds->item(i)->text().toInt(&ok,10);
tempIntList << listWidget_blinds->item(i)->text().toInt(&ok,10);
}
qStableSort(tempIntList.begin(), tempIntList.end());
//
//
for(i=0; i<tempIntList.count(); i++) {
//
//
// std::cout << tempIntList[i] << "\n";
tempStringList << QString::number(tempIntList[i],10);
}
//
//
listWidget_blinds->clear();
listWidget_blinds->addItems(tempStringList);
}
src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h
+11 -8
View File
@@ -27,23 +27,26 @@
class ConfigFile;
class manualBlindsOrderDialogImpl: public QDialog, public Ui::manualBlindsOrderDialog {
Q_OBJECT
class manualBlindsOrderDialogImpl: public QDialog, public Ui::manualBlindsOrderDialog
{
Q_OBJECT
public:
manualBlindsOrderDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
manualBlindsOrderDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
void exec();
public slots:
bool getSettingsCorrect() const { return settingsCorrect;}
bool getSettingsCorrect() const {
return settingsCorrect;
}
void addBlindValueToList();
void removeBlindFromList();
void sortBlindsList();
private:
ConfigFile* myConfig;
bool settingsCorrect;
src/gui/qt/settingsdialog/myavatarbutton.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
//
// C++ Implementation: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -15,7 +15,7 @@
using namespace std;
MyAvatarButton::MyAvatarButton(QGroupBox* parent)
: QPushButton(parent)
: QPushButton(parent)
{
}
src/gui/qt/settingsdialog/myavatarbutton.h
+10 -6
View File
@@ -1,7 +1,7 @@
//
// C++ Interface: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -18,13 +18,17 @@
class MyAvatarButton : public QPushButton
{
public:
MyAvatarButton(QGroupBox*);
MyAvatarButton(QGroupBox*);
~MyAvatarButton();
~MyAvatarButton();
void setMyLink(QString theValue) {
myLink = theValue;
}
QString getMyLink() const {
return myLink;
}
void setMyLink(QString theValue){ myLink = theValue;}
QString getMyLink() const{ return myLink;}
private:
src/gui/qt/settingsdialog/myhpavatarbutton.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
//
// C++ Implementation: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -15,7 +15,7 @@
using namespace std;
MyHPAvatarButton::MyHPAvatarButton(QWidget* parent)
: QPushButton(parent)
: QPushButton(parent)
{
}
src/gui/qt/settingsdialog/myhpavatarbutton.h
+10 -6
View File
@@ -1,7 +1,7 @@
//
// C++ Interface: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -18,13 +18,17 @@
class MyHPAvatarButton : public QPushButton
{
public:
MyHPAvatarButton(QWidget*);
MyHPAvatarButton(QWidget*);
~MyHPAvatarButton();
~MyHPAvatarButton();
void setMyLink(QString theValue) {
myLink = theValue;
}
QString getMyLink() const {
return myLink;
}
void setMyLink(QString theValue){ myLink = theValue;}
QString getMyLink() const{ return myLink;}
private:
src/gui/qt/settingsdialog/mystylelistitem.cpp
+4 -4
View File
@@ -1,7 +1,7 @@
//
// C++ Implementation: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -12,16 +12,16 @@
#include "mystylelistitem.h"
MyStyleListItem::MyStyleListItem(QStringList s, QTreeWidget *w)
: QTreeWidgetItem(w, s, QTreeWidgetItem::UserType)
: QTreeWidgetItem(w, s, QTreeWidgetItem::UserType)
{
}
MyStyleListItem::~MyStyleListItem()
MyStyleListItem::~MyStyleListItem()
{
}
bool MyStyleListItem::operator<( const QTreeWidgetItem &other ) const
{
return text(0).toLower() < other.text(0).toLower();
return text(0).toLower() < other.text(0).toLower();
}
src/gui/qt/settingsdialog/mystylelistitem.h
+6 -5
View File
@@ -10,12 +10,13 @@
#include <QtGui>
#include <QtCore>
class MyStyleListItem : public QTreeWidgetItem {
class MyStyleListItem : public QTreeWidgetItem
{
public:
MyStyleListItem(QStringList, QTreeWidget *);
~MyStyleListItem();
virtual bool operator<( const QTreeWidgetItem &) const;
MyStyleListItem(QStringList, QTreeWidget *);
~MyStyleListItem();
virtual bool operator<( const QTreeWidgetItem &) const;
};
#endif // MYSTYLELISTITEM_H
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
//
// C++ Implementation: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -14,7 +14,7 @@
using namespace std;
MyAvatarListItem::MyAvatarListItem(QListWidget* parent)
: QListWidgetItem(parent, QListWidgetItem::UserType)
: QListWidgetItem(parent, QListWidgetItem::UserType)
{
}
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h
+10 -6
View File
@@ -1,7 +1,7 @@
//
// C++ Interface: mycardspixmaplabel
//
// Description:
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
@@ -18,13 +18,17 @@
class MyAvatarListItem : public QListWidgetItem
{
public:
MyAvatarListItem(QListWidget*);
MyAvatarListItem(QListWidget*);
~MyAvatarListItem();
~MyAvatarListItem();
void setMyLink(QString theValue) {
myLink = theValue;
}
QString getMyLink() const {
return myLink;
}
void setMyLink(QString theValue){ myLink = theValue;}
QString getMyLink() const{ return myLink;}
private:
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+70 -52
View File
@@ -24,14 +24,14 @@
selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
: QDialog(parent), myConfig(c), settingsCorrect(TRUE), avatarDir("")
: QDialog(parent), myConfig(c), settingsCorrect(TRUE), avatarDir("")
{
#ifdef __APPLE__
setWindowModality(Qt::ApplicationModal);
setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
#endif
setupUi(this);
myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
pushButton_OpenAvatarFile->setIcon(QIcon(QPixmap(myAppDataPath+"gfx/gui/misc/fileopen16.png")));
@@ -39,7 +39,7 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
// listWidget->setViewMode(QListView::IconMode);
// listWidget->setIconSize(QSize(50,50));
// listWidget->setLayoutDirection(Qt::LeftToRight);
listWidget->setViewMode(QListView::IconMode);
listWidget->setViewMode(QListView::IconMode);
listWidget->setIconSize(QSize(50, 50));
// listWidget->setFlow(QListView::TopToBottom);
// listWidget->setWrapping(true);
@@ -47,7 +47,7 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
listWidget->setDragEnabled(FALSE);
listWidget->setResizeMode(QListView::Adjust);
// int i;
// for (i=0; i<30; i++) {
// MyAvatarListItem *myItem = new MyAvatarListItem(listWidget);
@@ -60,7 +60,7 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/95df673e5ee4d02f0f95d5c7ff091cfb.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/490ed3a748f6f4d6c261436198f2368f.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/e3e1ae15f7d808fce16c26c049e2cbe9.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/237c518f2bb6ac99f6eb1012e18460b9.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/237c518f2bb6ac99f6eb1012e18460b9.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/9f49fc3d6062ddc08dc6bbd9ef9b399d.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/bed234c6672d512bdb4c2768f0b3f90c.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/d6f8a45e9243b7e7e4e2c8e41df1c9f5.png";
@@ -76,7 +76,7 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/6ecea83d9fac6b4cae97e2fccd09a5f6.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/74672ebfa2ab02968386c4e441a08668.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/e54e67ebd5265cf549362a2cda5a999c.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/da34195981d255656f39c05481de3b6a.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/da34195981d255656f39c05481de3b6a.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/6ad16e2c3e4b8e4e6da47032d4372f4b.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/c018b15b8164a303b9395b1e89c51004.png";
peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/0c24b06358f7b308d6b47c59ebace73d.png";
@@ -147,8 +147,8 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
miscAvatarList << myAppDataPath +"gfx/avatars/default/misc/eb7612a2b515bd826babec8f649b44cf.png";
miscAvatarList << myAppDataPath +"gfx/avatars/default/misc/08ced517579b3d258c947aec6c0a0dd4.png";
// peopleAvatarList << myAppDataPath +"gfx/avatars/default/misc/
connect(groupBox, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox1(bool)));
@@ -158,11 +158,12 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
connect( pushButton_OpenAvatarFile, SIGNAL( clicked() ), this, SLOT( setExternalAvatar() ) );
connect( listWidget, SIGNAL( doubleClicked(QModelIndex) ), this, SLOT( isAccepted() ) );
connect( comboBox_avatarViewCategorie, SIGNAL( currentIndexChanged(int) ), this, SLOT( refreshAvatarView() ) );
}
void selectAvatarDialogImpl::exec() {
void selectAvatarDialogImpl::exec()
{
//clear
lineEdit->setText("");
@@ -171,24 +172,29 @@ void selectAvatarDialogImpl::exec() {
QDialog::exec();
}
void selectAvatarDialogImpl::refreshAvatarView() {
void selectAvatarDialogImpl::refreshAvatarView()
{
listWidget->clear();
int i;
QStringList currentViewList;
switch(comboBox_avatarViewCategorie->currentIndex()) {
case 0: { currentViewList = peopleAvatarList; }
case 0: {
currentViewList = peopleAvatarList;
}
break;
case 1: { currentViewList = miscAvatarList; }
case 1: {
currentViewList = miscAvatarList;
}
break;
}
for (i=0; i<currentViewList.size(); i++) {
MyAvatarListItem *myItem = new MyAvatarListItem(listWidget);
myItem->setIcon(QIcon(QPixmap(currentViewList.at(i)).scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)));
myItem->setMyLink(currentViewList.at(i));
@@ -197,82 +203,94 @@ void selectAvatarDialogImpl::refreshAvatarView() {
}
}
void selectAvatarDialogImpl::toggleGroupBox1(bool /*toggleState*/) { if(groupBox->isChecked()) groupBox_2->setChecked(FALSE); }
void selectAvatarDialogImpl::toggleGroupBox1(bool /*toggleState*/)
{
if(groupBox->isChecked()) groupBox_2->setChecked(FALSE);
}
void selectAvatarDialogImpl::toggleGroupBox2(bool /*toggleState*/) { if(groupBox_2->isChecked()) groupBox->setChecked(FALSE); }
void selectAvatarDialogImpl::toggleGroupBox2(bool /*toggleState*/)
{
if(groupBox_2->isChecked()) groupBox->setChecked(FALSE);
}
QString selectAvatarDialogImpl::getAvatarLink() {
QString selectAvatarDialogImpl::getAvatarLink()
{
QList<QListWidgetItem *> myItemList = listWidget->selectedItems();
if(groupBox->isChecked()) {
if(myItemList.size() == 1) {
return static_cast<MyAvatarListItem*>(listWidget->currentItem())->getMyLink();
}
else return QString("");
} else return QString("");
}
QFile lineEditFile(lineEdit->text());
if(groupBox_2->isChecked() && lineEditFile.exists() ) return externalAvatar;
else return QString("");
}
void selectAvatarDialogImpl::isAccepted() {
void selectAvatarDialogImpl::isAccepted()
{
QList<QListWidgetItem *> myItemList = listWidget->selectedItems();
settingsCorrect = TRUE;
settingsCorrect = TRUE;
if(groupBox->isChecked()) {
if(groupBox->isChecked()) {
if(myItemList.size() == 0) {
QMessageBox::warning(this, tr("Avatar File Error"),
tr("Please select an avatar from the list!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
}
else settingsCorrect = TRUE;;
tr("Please select an avatar from the list!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
} else settingsCorrect = TRUE;;
}
if(groupBox_2->isChecked()) {
QFile lineEditFile(lineEdit->text());
if(lineEditFile.exists()) {
if(lineEditFile.exists()) {
if(lineEditFile.size() <= 30720 ) {
externalAvatar = lineEdit->text();
settingsCorrect = TRUE;
}
else { QMessageBox::warning(this, tr("Avatar File Error"),
tr("The file size of the chosen picture is too big. (max. 30KB)\n"
"Please choose a smaller picture!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
} else {
QMessageBox::warning(this, tr("Avatar File Error"),
tr("The file size of the chosen picture is too big. (max. 30KB)\n"
"Please choose a smaller picture!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
externalAvatar = "";
}
}
else { QMessageBox::warning(this, tr("Avatar File Error"),
tr("The entered avatar picture doesn't exist.\n"
"Please enter an valid picture!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
}
} else {
QMessageBox::warning(this, tr("Avatar File Error"),
tr("The entered avatar picture doesn't exist.\n"
"Please enter an valid picture!"),
QMessageBox::Ok);
settingsCorrect = FALSE;
externalAvatar = "";
}
}
//Wenn alles richtig eingegeben wurde --> Dialog schließen
if(settingsCorrect) { this->hide(); }
if(settingsCorrect) {
this->hide();
}
}
void selectAvatarDialogImpl::isRejected() { settingsCorrect = FALSE; }
void selectAvatarDialogImpl::isRejected()
{
settingsCorrect = FALSE;
}
void selectAvatarDialogImpl::setExternalAvatar()
{
void selectAvatarDialogImpl::setExternalAvatar() {
if (avatarDir == "") avatarDir = QDir::homePath();
QString fileName = QFileDialog::getOpenFileName(this, tr("Select external avatar picture"), avatarDir, tr("Images (*.png *.jpg *.gif)"));
if (!fileName.isEmpty()) {
lineEdit->setText(fileName);
if (!fileName.isEmpty()) {
lineEdit->setText(fileName);
avatarDir = fileName;
}
}
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
+12 -9
View File
@@ -28,30 +28,33 @@
class ConfigFile;
class selectAvatarDialogImpl;
class selectAvatarDialogImpl: public QDialog, public Ui::selectAvatarDialog {
Q_OBJECT
class selectAvatarDialogImpl: public QDialog, public Ui::selectAvatarDialog
{
Q_OBJECT
public:
selectAvatarDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
selectAvatarDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
void exec();
public slots:
void toggleGroupBox1(bool);
void toggleGroupBox2(bool);
void isAccepted();
void isRejected();
QString getAvatarLink();
void setExternalAvatar();
bool getSettingsCorrect() const { return settingsCorrect;}
bool getSettingsCorrect() const {
return settingsCorrect;
}
void refreshAvatarView();
private:
ConfigFile* myConfig;
bool settingsCorrect;
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+1033 -1013
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/settingsdialog/settingsdialogimpl.h
+32 -21
View File
@@ -36,25 +36,34 @@ class selectAvatarDialogImpl;
class manualBlindsOrderDialogImpl;
class MyStyleListItem;
class settingsDialogImpl: public QDialog, public Ui::settingsDialog {
Q_OBJECT
class settingsDialogImpl: public QDialog, public Ui::settingsDialog
{
Q_OBJECT
public:
settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0, selectAvatarDialogImpl *s = 0);
settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0, selectAvatarDialogImpl *s = 0);
~settingsDialogImpl();
~settingsDialogImpl();
void prepareDialog();
void prepareDialog();
void exec();
void setPlayerNickIsChanged(bool theValue){ playerNickIsChanged = theValue;}
bool getPlayerNickIsChanged() const{ return playerNickIsChanged;}
void setPlayerNickIsChanged(bool theValue) {
playerNickIsChanged = theValue;
}
bool getPlayerNickIsChanged() const {
return playerNickIsChanged;
}
bool getSettingsCorrect() const{ return settingsCorrect;}
bool getSettingsCorrect() const {
return settingsCorrect;
}
public slots:
void isAccepted();
void playerNickChanged() { setPlayerNickIsChanged(TRUE); };
void playerNickChanged() {
setPlayerNickIsChanged(TRUE);
};
void setFlipsidePicFileName();
void setLogDir();
void setAvatarFile0();
@@ -71,10 +80,12 @@ public slots:
void callManualBlindsOrderDialog();
void callNetManualBlindsOrderDialog();
void callSelectAvatarDialog() { mySelectAvatarDialogImpl->exec(); }
void callSelectAvatarDialog() {
mySelectAvatarDialogImpl->exec();
}
void clearInternetGamePassword(bool);
// void checkProperNetFirstSmallBlind(int);
// void checkProperFirstSmallBlind(int);
void setFirstSmallBlindMargin() ;
@@ -93,15 +104,15 @@ public slots:
void showCurrentCardDeckStylePreview();
void addCardDeckStyle();
void removeCardDeckStyle();
void removePlayerFromIgnoredPlayersList();
void refreshLogFileList();
void deleteLogFile();
void exportLogToHtml();
void exportLogToTxt();
void saveLogFileAs();
void removePlayerFromIgnoredPlayersList();
void refreshLogFileList();
void deleteLogFile();
void exportLogToHtml();
void exportLogToTxt();
void saveLogFileAs();
private:
bool playerNickIsChanged;
bool settingsCorrect;
@@ -117,10 +128,10 @@ private:
std::list<int> myNetManualBlindsList;
std::list<std::string> myGameTableStylesList;
std::list<std::string> myCardDeckStylesList;
ConfigFile* myConfig;
selectAvatarDialogImpl *mySelectAvatarDialogImpl;
manualBlindsOrderDialogImpl *myManualBlindsOrderDialog;
selectAvatarDialogImpl *mySelectAvatarDialogImpl;
manualBlindsOrderDialogImpl *myManualBlindsOrderDialog;
QString myAppDataPath;