some mac hints

This commit is contained in:
doitux
2007-04-30 23:14:30 +00:00
parent a857719dff
commit b9e1df25fc
7 changed files with 515 additions and 81 deletions
+2
View File
@@ -1,4 +1,5 @@
<ui version="4.0" >
<author>Felix Hammer</author>
<class>aboutPokerth</class>
<widget class="QDialog" name="aboutPokerth" >
<property name="geometry" >
@@ -512,6 +513,7 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
<includes/>
<resources/>
<connections>
<connection>
+19 -5
View File
@@ -53,6 +53,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
{
int i;
this->setStyle(new QPlastiqueStyle);
//for statistic development
for(i=0; i<15; i++) {
statisticArray[i] = 0;
@@ -475,8 +477,13 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
//Statusbar
if(myConfig->readConfigInt("ShowStatusbarMessages")) {
statusBar()->showMessage(tr("Ctrl+N to start a new game"));
}
#ifdef __APPLE__
statusBar()->showMessage(tr("Cmd+N to start a new game"));
#else
statusBar()->showMessage(tr("Ctrl+N to start a new game"));
#endif
}
//Dialoge
myJoinNetworkGameDialog = new joinNetworkGameDialogImpl(this);
@@ -2112,11 +2119,18 @@ void mainWindowImpl::breakButtonClicked() {
void mainWindowImpl::paintStartSplash() {
StartSplash *mySplash = new StartSplash(this);
mySplash->setGeometry(this->pos().x()+237,this->pos().y()+210,400,250);
// mySplash->setWindowFlags(Qt::SplashScreen);
mySplash->show();
#ifdef __APPLE__
int offset = 305;
#else
int offset = 237;
#endif
mySplash->setGeometry(this->pos().x()+offset,this->pos().y()+210,400,250);
// mySplash->setWindowFlags(Qt::SplashScreen);
mySplash->show();
}
void mainWindowImpl::networkError(int errorID, int osErrorID) {
switch (errorID) {
@@ -49,6 +49,32 @@ void StartSplash::paintEvent(QPaintEvent * event) {
QPainter painter(this);
#ifdef _WIN32
QFont welcomeFont;
welcomeFont.setFamily("Times New Roman");
welcomeFont.setPixelSize(42);
#else
#ifdef __APPLE__
QFont welcomeFont;
welcomeFont.setFamily("Andy MT Bold");
welcomeFont.setPixelSize(42);
#else
QFont welcomeFont;
welcomeFont.setFamily("Century Schoolbook L");
welcomeFont.setPixelSize(35);
#endif
#endif
#ifdef __APPLE__
QFont haveFont;
haveFont.setFamily("Andy MT Bold");
haveFont.setPixelSize(36);
#else
QFont haveFont;
haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36);
#endif
/*
#ifdef _WIN32
QFont welcomeFont;
welcomeFont.setFamily("Times New Roman");
@@ -60,7 +86,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
#endif
QFont haveFont;
haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36);
haveFont.setPixelSize(36);*/
QPixmap logo(":/graphics/resources/graphics/logoChip3D.png");
Binary file not shown.
+77 -64
View File
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>591</width>
<height>434</height>
<width>603</width>
<height>439</height>
</rect>
</property>
<property name="windowTitle" >
@@ -1029,7 +1029,66 @@ p, li { white-space: pre-wrap; }
<property name="spacing" >
<number>6</number>
</property>
<item row="3" column="0" colspan="2" >
<item row="4" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_29" >
<property name="text" >
<string>Log File Directory: </string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_logDir" />
</item>
<item>
<widget class="QPushButton" name="pushButton_openLogDir" >
<property name="minimumSize" >
<size>
<width>27</width>
<height>23</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>27</width>
<height>23</height>
</size>
</property>
<property name="icon" >
<iconset resource="resources.qrc" >:/graphics/resources/graphics/fileopen16.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@@ -1076,61 +1135,22 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_29" >
<property name="text" >
<string>Log File Directory: </string>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_logDir" />
</item>
<item>
<widget class="QPushButton" name="pushButton_openLogDir" >
<property name="minimumSize" >
<property name="sizeHint" >
<size>
<width>27</width>
<height>23</height>
<width>40</width>
<height>20</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>27</width>
<height>23</height>
</size>
</property>
<property name="icon" >
<iconset resource="resources.qrc" >:/graphics/resources/graphics/fileopen16.png</iconset>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
<item row="0" column="0" colspan="2" >
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
@@ -1143,17 +1163,17 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
@@ -1164,13 +1184,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QListWidget" name="listWidget" >
<property name="minimumSize" >
+4
View File
@@ -63,7 +63,11 @@ int main( int argc, char **argv )
/////// can be removed for non-qt-guis ////////////
QApplication a( argc, argv );
#ifdef __APPLE__
a.setStyle(new QPlastiqueStyle);
#else
a.setStyle(new QPlastiqueStyle);
#endif
Q_INIT_RESOURCE(resources);
QString locale = QLocale::system().name();