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

gui freeze

Browse Source
This commit is contained in:
doitux
2007-03-30 12:44:16 +00:00
parent 4633a0fdea
commit a00e3cde42
11 changed files with 342 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow.ui
+51 -48
View File
@@ -819,38 +819,6 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QFrame" name="frame_Cards0" >
<property name="geometry" >
<rect>
<x>95</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status0" >
<property name="geometry" >
<rect>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_PlayerName0" >
<property name="geometry" >
<rect>
@@ -1065,6 +1033,41 @@
<bool>true</bool>
</property>
</widget>
<widget class="QFrame" name="frame_Cards0" >
<property name="geometry" >
<rect>
<x>95</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status0" >
<property name="geometry" >
<rect>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="textInteractionFlags" >
<enum>Qt::NoTextInteraction</enum>
</property>
</widget>
</widget>
</widget>
</item>
<item>
@@ -1790,22 +1793,6 @@
<height>185</height>
</size>
</property>
<widget class="QLabel" name="label_5" >
<property name="geometry" >
<rect>
<x>89</x>
<y>60</y>
<width>90</width>
<height>124</height>
</rect>
</property>
<property name="pixmap" >
<pixmap resource="resources.qrc" >:/guiv2/resources/guiv2/cardholder_03.png</pixmap>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_6" >
<property name="geometry" >
<rect>
@@ -2490,6 +2477,22 @@
</item>
</layout>
</widget>
<widget class="QLabel" name="label_5" >
<property name="geometry" >
<rect>
<x>89</x>
<y>60</y>
<width>90</width>
<height>124</height>
</rect>
</property>
<property name="pixmap" >
<pixmap resource="resources.qrc" >:/guiv2/resources/guiv2/cardholder_03.png</pixmap>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="textLabel_handLabel" >
<property name="geometry" >
<rect>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+8 -2
View File
@@ -54,7 +54,7 @@ const int maxQuantityPlayersConst = 7;
using namespace std;
mainWindowImpl::mainWindowImpl(QMainWindow *parent)
: QMainWindow(parent), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE)
: QMainWindow(parent), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(1), breakAfterActualHand(FALSE)
{
int i;
@@ -124,6 +124,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
pixmapLabel_card0a->setObjectName(QString::fromUtf8("pixmapLabel_card0a"));
pixmapLabel_card0a->setScaledContents(true);
pixmapLabel_card0a->setGeometry(QRect(0, 0, 80, 111));
// pixmapLabel_card0a->setFocusPolicy(Qt::NoFocus);
pixmapLabel_card0b = new MyCardsPixmapLabel(frame_Cards0);
pixmapLabel_card0b->setObjectName(QString::fromUtf8("pixmapLabel_card0b"));
@@ -2156,10 +2157,15 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
ctrlPressed = TRUE;
// QTimer::SingleShot
} //CTRL
// if (event->key() == 65) { paintStartSplash();
if (event->key() == 65) { pixmapLabel_card0a->setUpdatesEnabled(FALSE); }
// if (event->key() == 66) { label_logo->hide(); }
}
// bool mainWindowImpl::event ( QEvent * event ) {
// if(event->type() == QEvent::MouseMove) { event->setAccepted ( FALSE ); }
// }
void mainWindowImpl::switchLeftToolBox() {
if (groupBox_LeftToolBox->isHidden()) { groupBox_LeftToolBox->show(); }
src/gui/qt/mainwindow/mainwindowimpl.h
+2
View File
@@ -180,6 +180,8 @@ public slots:
void breakButtonClicked();
void keyPressEvent ( QKeyEvent*);
// bool event ( QEvent * );
void switchLeftToolBox();
void switchRightToolBox();
void switchFullscreen();
src/gui/qt/mainwindow/mycardspixmaplabel.cpp
+11 -1
View File
@@ -65,8 +65,9 @@ void MyCardsPixmapLabel::nextFadeOutFrame() {
update();
}
else {
fadeOutTimer->stop();
fadeOutAction = FALSE;
// fadeOutAction = FALSE;
}
}
@@ -177,3 +178,12 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
}
// bool MyCardsPixmapLabel::event ( QEvent * event ) {
//
// if(event->type() == QEvent::MouseMove) { event->ignore(); }
// QLabel::event(event);
// }
src/gui/qt/mainwindow/mycardspixmaplabel.h
+1
View File
@@ -46,6 +46,7 @@ public slots:
void nextFadeOutFrame();
void nextFlipCardsFrame();
// bool event ( QEvent * );
private: