aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into experimental

Browse source
This commit is contained in:
unknown 2011-09-23 15:06:39 +02:00
commit 4643c51fe6
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/cockatrice.pro
View file

@ -5,9 +5,13 @@ INCLUDEPATH += . src ../common
MOC_DIR = build
OBJECTS_DIR = build
RESOURCES = cockatrice.qrc
QT += network script svg multimedia
CONFIG += mobility
MOBILITY = multimedia
QT += network script svg
linux-g++ {
CONFIG += mobility
MOBILITY = multimedia
} else {
QT += multimedia
}
HEADERS += src/abstractcounter.h \
src/counter_general.h \

1
cockatrice/src/userlist.cpp
View file

@ -24,6 +24,7 @@ BanDialog::BanDialog(QWidget *parent)
durationEdit = new QSpinBox;
durationEdit->setMinimum(0);
durationEdit->setValue(5);
durationEdit->setMaximum(99999999);
QLabel *reasonLabel = new QLabel(tr("Please enter the reason for the ban.\nThis is only saved for moderators and cannot be seen by the banned person."));
reasonEdit = new QPlainTextEdit;