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

some changes for better integration on the mac-plattform

Browse Source
This commit is contained in:
eflist
2007-06-24 23:01:16 +00:00
parent 787e5f2188
commit 7c8d65ca1c
6 changed files with 150 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow.ui
+37 -13
View File
@@ -6068,15 +6068,9 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>30</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuView" >
<property name="title" >
<string>View</string>
</property>
<addaction name="actionFullScreen" />
</widget>
<widget class="QMenu" name="menuSpiel" >
<property name="title" >
<string>Game</string>
@@ -6088,6 +6082,12 @@
<addaction name="actionAboutPokerth" />
<addaction name="actionQuit" />
</widget>
<widget class="QMenu" name="menuView" >
<property name="title" >
<string>View</string>
</property>
<addaction name="actionFullScreen" />
</widget>
<addaction name="menuSpiel" />
<addaction name="menuView" />
</widget>
@@ -6133,21 +6133,45 @@
<string>Fullscreen</string>
</property>
<property name="shortcut" >
<string>F</string>
<string>Ctrl-F</string>
</property>
</action>
<action name="actionShowHideChat" >
<property name="text" >
<string>Show/Hide Chat-Window</string>
</property>
<property name="shortcut" >
<string>Ctrl-C</string>
</property>
</action>
<action name="actionShowHideHelp" >
<property name="text" >
<string>Show/Hide Help Window</string>
</property>
<property name="shortcut" >
<string>Ctrl-H</string>
</property>
</action>
<action name="actionShowHideLog" >
<property name="text" >
<string>Show/Hide Log Window</string>
</property>
<property name="shortcut" >
<string>Ctrl-L</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
<class>MySetLabel</class>
<extends>QLabel</extends>
<header>mysetlabel.h</header>
</customwidget>
<customwidget>
<class>MyRightTabWidget</class>
<extends>QTabWidget</extends>
<header>myrighttabwidget.h</header>
</customwidget>
<customwidget>
<class>MySetLabel</class>
<extends>QLabel</extends>
<header>mysetlabel.h</header>
</customwidget>
<customwidget>
<class>MyLeftTabWidget</class>
<extends>QTabWidget</extends>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+36 -8
View File
@@ -569,6 +569,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect( actionCreate_network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) );
connect( actionQuit, SIGNAL( triggered() ), this, SLOT( quitPokerTH() ) );
connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) );
connect( actionShowHideChat, SIGNAL( triggered() ), this, SLOT( switchChatWindow() ) );
connect( actionShowHideHelp, SIGNAL( triggered() ), this, SLOT( switchHelpWindow() ) );
connect( actionShowHideLog, SIGNAL( triggered() ), this, SLOT( switchLogWindow() ) );
connect( pushButton_BetRaise, SIGNAL( clicked() ), this, SLOT( myBetRaise() ) );
connect( pushButton_FoldAllin, SIGNAL( clicked() ), this, SLOT( myFoldAllin() ) );
@@ -2562,8 +2565,6 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
if (event->key() == Qt::Key_F1) { pushButton_FoldAllin->click(); }
if (event->key() == Qt::Key_F2) { pushButton_CallCheckSet->click(); }
if (event->key() == Qt::Key_F3) { pushButton_BetRaise->click(); }
if (event->key() == Qt::Key_F10) { switchLeftToolBox(); }
if (event->key() == Qt::Key_F11) { switchRightToolBox(); }
if (event->key() == Qt::Key_S) { setLabelArray[0]->startTimeOutAnimation(myConfig->readConfigInt("NetTimeOutPlayerAction"),TRUE); } //s
if (event->key() == 16777249) {
pushButton_break->click();
@@ -2579,16 +2580,43 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
// if(event->type() == QEvent::MouseMove) { event->setAccepted ( FALSE ); }
// }
void mainWindowImpl::switchLeftToolBox() {
void mainWindowImpl::switchChatWindow() {
if (groupBox_LeftToolBox->isHidden()) { groupBox_LeftToolBox->show(); }
else { groupBox_LeftToolBox->hide(); }
int tab = 1;
if (groupBox_LeftToolBox->isHidden()) {
tabWidget_Left->setCurrentIndex(tab);
groupBox_LeftToolBox->show();
} else {
if (tabWidget_Left->currentIndex() == tab) {
groupBox_LeftToolBox->hide();
} else {
tabWidget_Left->setCurrentIndex(tab);
}
}
}
void mainWindowImpl::switchRightToolBox() {
void mainWindowImpl::switchHelpWindow() {
if (groupBox_RightToolBox->isHidden()) { groupBox_RightToolBox->show(); }
else { groupBox_RightToolBox->hide(); }
int tab = 0;
if (groupBox_LeftToolBox->isHidden()) {
tabWidget_Left->setCurrentIndex(tab);
groupBox_LeftToolBox->show();
} else {
if (tabWidget_Left->currentIndex() == tab) {
groupBox_LeftToolBox->hide();
} else {
tabWidget_Left->setCurrentIndex(tab);
}
}
}
void mainWindowImpl::switchLogWindow() {
if (groupBox_RightToolBox->isHidden()) {
groupBox_RightToolBox->show();
} else {
groupBox_RightToolBox->hide();
}
}
void mainWindowImpl::switchFullscreen() {
src/gui/qt/mainwindow/mainwindowimpl.h
+3 -2
View File
@@ -250,8 +250,9 @@ public slots:
void keyPressEvent ( QKeyEvent*);
// bool event ( QEvent * );
void switchLeftToolBox();
void switchRightToolBox();
void switchChatWindow();
void switchHelpWindow();
void switchLogWindow();
void switchFullscreen();
void paintStartSplash();
src/gui/qt/sound/sdlplayer.h
+8 -3
View File
@@ -14,12 +14,17 @@
#ifndef SDLPLAYER_H
#define SDLPLAYER_H
#ifdef _WIN32
#ifdef _WIN32
#include <SDL.h>
#include <SDL_mixer.h>
#else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
#ifdef __APPLE__
#include <SDL.h>
#include <SDL_mixer.h>
#else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
#endif
#endif
#include <string>