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

some android corrections

Browse Source
This commit is contained in:
doitux
2012-11-05 14:15:55 +01:00
parent 10be5b5fe6
commit 59df9c0968
5 changed files with 231 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+3 -4
View File
@@ -231,6 +231,7 @@ HEADERS += src/engine/game.h \
src/gui/qt/manualblindsorderdialog.ui \ src/gui/qt/manualblindsorderdialog.ui \
src/gui/qt/serverlistdialog.ui \ src/gui/qt/serverlistdialog.ui \
src/gui/qt/internetgamelogindialog.ui \ src/gui/qt/internetgamelogindialog.ui \
src/gui/qt/logfiledialog.ui \
src/gui/qt/changecontentdialog.ui src/gui/qt/changecontentdialog.ui
} }
@@ -507,7 +508,7 @@ unix:!mac {
LIBS += -ltinyxml LIBS += -ltinyxml
LIBS += $$BOOST_LIBS LIBS += $$BOOST_LIBS
LIBS += -lgsasl -lidn LIBS += -lgsasl -lidn
LIBS += -lssl -lcrypto -lgcrypt -lgpg-error LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf
} }
TARGETDEPS += ./lib/libpokerth_lib.a \ TARGETDEPS += ./lib/libpokerth_lib.a \
./lib/libpokerth_db.a \ ./lib/libpokerth_db.a \
@@ -615,6 +616,7 @@ gui_800x480 {
src/gui/qt/gui_800x480/serverlistdialog_800x480.ui \ src/gui/qt/gui_800x480/serverlistdialog_800x480.ui \
src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui \ src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui \
src/gui/qt/gui_800x480/changecontentdialog_800x480.ui \ src/gui/qt/gui_800x480/changecontentdialog_800x480.ui \
src/gui/qt/gui_800x480/logfiledialog_800x480.ui \
src/gui/qt/gui_800x480/tabs_800x480.ui src/gui/qt/gui_800x480/tabs_800x480.ui
} }
@@ -632,6 +634,3 @@ maemo{
android_test{ android_test{
DEFINES += ANDROID DEFINES += ANDROID
} }
FORMS += \
src/gui/qt/logfiledialog.ui
pokerth_protocol.pro
+1
View File
@@ -106,6 +106,7 @@ win32 {
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
} }
unix : !mac { unix : !mac {
INCLUDEPATH += $${PREFIX}/include
system(protoc pokerth.proto --cpp_out=src/third_party/protobuf) system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
system(protoc pokerth.proto --java_out=tests/src) system(protoc pokerth.proto --java_out=tests/src)
} }
src/gui/qt/gui_800x480/logfiledialog_800x480.ui
+220
View File
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LogFileDialog</class>
<widget class="QDialog" name="LogFileDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>618</width>
<height>392</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QPushButton" name="pushButton_exportLogHtml">
<property name="text">
<string>Export as HTML</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/text-html.png</normaloff>:/gfx/text-html.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_exportLogTxt">
<property name="text">
<string>Export as txt</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/text-plain.png</normaloff>:/gfx/text-plain.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_saveLogAs">
<property name="text">
<string>Save as ...</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/filesave.png</normaloff>:/gfx/filesave.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_deleteLog">
<property name="text">
<string>Delete</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/editdelete.png</normaloff>:/gfx/editdelete.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_37">
<property name="text">
<string>Preview:</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_logPreview">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Game:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeWidget" name="treeWidget_logFiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="indentation">
<number>5</number>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<column>
<property name="text">
<string>Log File</string>
</property>
</column>
</widget>
</item>
</layout>
</item>
<item row="3" 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="QPushButton" name="pushButton_analyseLogfile">
<property name="text">
<string>Analyse Logfile ...</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/view-statistics.png</normaloff>:/gfx/view-statistics.png</iconset>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="resources/pokerth.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>LogFileDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>LogFileDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/gui/qt/logfiledialog/logfiledialog.cpp
+5
View File
@@ -17,7 +17,12 @@
*****************************************************************************/ *****************************************************************************/
#include "logfiledialog.h" #include "logfiledialog.h"
#ifdef GUI_800x480
#include "ui_logfiledialog_800x480.h"
#else
#include "ui_logfiledialog.h" #include "ui_logfiledialog.h"
#endif
#include <QtCore> #include <QtCore>
#include "guilog.h" #include "guilog.h"
#include "configfile.h" #include "configfile.h"
src/pokerth.cpp
+2 -3
View File
@@ -72,7 +72,6 @@ int main( int argc, char **argv )
/////// can be removed for non-qt-guis //////////// /////// can be removed for non-qt-guis ////////////
QtSingleApplication a( argc, argv ); QtSingleApplication a( argc, argv );
Q_INIT_RESOURCE(pokerth);
if (a.sendMessage("Wake up!")) { if (a.sendMessage("Wake up!")) {
return 0; return 0;
@@ -139,8 +138,8 @@ int main( int argc, char **argv )
qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason"); qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
startWindowImpl mainWin(myConfig,myLog); startWindowImpl mainWin(myConfig,myLog);
a.setActivationWindow(&mainWin, true); a.setActivationWindow(&mainWin, true);
int retVal = a.exec(); int retVal = a.exec();