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

android qt5 fixes

Browse Source
This commit is contained in:
doitux
2013-08-28 14:25:10 +02:00
parent 20840a2af0
commit f1f1aba703
2 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+56 -14
View File
@@ -134,7 +134,7 @@
<string>&amp;Leave Game</string> <string>&amp;Leave Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/go-previous-view.png</normaloff>:/gfx/go-previous-view.png</iconset> <normaloff>:/gfx/go-previous-view.png</normaloff>:/gfx/go-previous-view.png</iconset>
</property> </property>
</widget> </widget>
@@ -196,7 +196,7 @@
<string>&amp;Start Game</string> <string>&amp;Start Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset> <normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
</property> </property>
</widget> </widget>
@@ -232,7 +232,7 @@
<string>&amp;Kick Player</string> <string>&amp;Kick Player</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/list-remove.png</normaloff>:/gfx/list-remove.png</iconset> <normaloff>:/gfx/list-remove.png</normaloff>:/gfx/list-remove.png</iconset>
</property> </property>
</widget> </widget>
@@ -330,7 +330,7 @@
<string>Join &amp;any game</string> <string>Join &amp;any game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/transform-rotate.png</normaloff>:/gfx/transform-rotate.png</iconset> <normaloff>:/gfx/transform-rotate.png</normaloff>:/gfx/transform-rotate.png</iconset>
</property> </property>
</widget> </widget>
@@ -369,7 +369,7 @@
<string>&amp;Create Game</string> <string>&amp;Create Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/list_add.png</normaloff>:/gfx/list_add.png</iconset> <normaloff>:/gfx/list_add.png</normaloff>:/gfx/list_add.png</iconset>
</property> </property>
</widget> </widget>
@@ -395,7 +395,7 @@
<string>&amp;Join Game</string> <string>&amp;Join Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset> <normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property> </property>
</widget> </widget>
@@ -459,19 +459,32 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject {font: bold 16px}</string> <string notr="true">QObject {font: bold 14px}</string>
</property> </property>
<property name="title"> <property name="title">
<string>Game Info</string> <string>Game Info</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout_7">
<property name="spacing"> <property name="verticalSpacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget_playerSpectators">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Players</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget_connectedPlayers"> <widget class="QTreeWidget" name="treeWidget_connectedPlayers">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -503,6 +516,9 @@
<property name="indentation"> <property name="indentation">
<number>15</number> <number>15</number>
</property> </property>
<property name="headerHidden">
<bool>true</bool>
</property>
<column> <column>
<property name="text"> <property name="text">
<string>Connected Players</string> <string>Connected Players</string>
@@ -510,7 +526,33 @@
</column> </column>
</widget> </widget>
</item> </item>
<item> </layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>Spectators</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget_connectedSpectators">
<property name="headerHidden">
<bool>true</bool>
</property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QScrollArea" name="scrollArea_gameInfos"> <widget class="QScrollArea" name="scrollArea_gameInfos">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
@@ -780,7 +822,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents"> <widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents">
@@ -797,7 +839,7 @@
<string>Fill up with computer opponents</string> <string>Fill up with computer opponents</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth_android.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset> <normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
</property> </property>
</widget> </widget>
@@ -1129,7 +1171,7 @@ p, li { white-space: pre-wrap; }
<tabstop>pushButton_Leave</tabstop> <tabstop>pushButton_Leave</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../resources/pokerth_android.qrc"/> <include location="../resources/pokerth.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>
src/gui/qt/sound/androidaudio.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ void AndroidAudio::createEngine()
Q_ASSERT(SL_RESULT_SUCCESS == result); Q_ASSERT(SL_RESULT_SUCCESS == result);
// realize the engine // realize the engine
result = (*mEngineObject)->Realize(mEngineObject, SL_BOOLEAN_false); result = (*mEngineObject)->Realize(mEngineObject, SL_BOOLEAN_FALSE);
Q_ASSERT(SL_RESULT_SUCCESS == result); Q_ASSERT(SL_RESULT_SUCCESS == result);
// get the engine interface, which is needed in order to create other objects // get the engine interface, which is needed in order to create other objects
@@ -96,7 +96,7 @@ void AndroidAudio::createEngine()
Q_ASSERT(SL_RESULT_SUCCESS == result); Q_ASSERT(SL_RESULT_SUCCESS == result);
// realize the output mix // realize the output mix
result = (*mOutputMixObject)->Realize(mOutputMixObject, SL_BOOLEAN_false); result = (*mOutputMixObject)->Realize(mOutputMixObject, SL_BOOLEAN_FALSE);
Q_ASSERT(SL_RESULT_SUCCESS == result); Q_ASSERT(SL_RESULT_SUCCESS == result);
qDebug() << "Created Android Audio Engine"; qDebug() << "Created Android Audio Engine";
@@ -171,7 +171,7 @@ void AndroidAudio::startSoundPlayer()
//Create the sound player //Create the sound player
const SLuint32 lSoundPlayerIIDCount = 2; const SLuint32 lSoundPlayerIIDCount = 2;
const SLInterfaceID lSoundPlayerIIDs[] = { SL_IID_PLAY, SL_IID_BUFFERQUEUE }; const SLInterfaceID lSoundPlayerIIDs[] = { SL_IID_PLAY, SL_IID_BUFFERQUEUE };
const SLboolean lSoundPlayerReqs[] = { SL_BOOLEAN_true, SL_BOOLEAN_true }; const SLboolean lSoundPlayerReqs[] = { SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE };
// qDebug() << "Configured Sound Player"; // qDebug() << "Configured Sound Player";
@@ -180,7 +180,7 @@ void AndroidAudio::startSoundPlayer()
// qDebug() << "Created Sound Player"; // qDebug() << "Created Sound Player";
lRes = (*mPlayerObject)->Realize(mPlayerObject, SL_BOOLEAN_false); lRes = (*mPlayerObject)->Realize(mPlayerObject, SL_BOOLEAN_FALSE);
Q_ASSERT(SL_RESULT_SUCCESS == lRes); Q_ASSERT(SL_RESULT_SUCCESS == lRes);
qDebug() << "Realised Sound Player"; qDebug() << "Realised Sound Player";