diff --git a/pokerth_game.pro b/pokerth_game.pro
index e55395c7..a576ac5a 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -231,6 +231,7 @@ HEADERS += src/engine/game.h \
src/gui/qt/manualblindsorderdialog.ui \
src/gui/qt/serverlistdialog.ui \
src/gui/qt/internetgamelogindialog.ui \
+ src/gui/qt/logfiledialog.ui \
src/gui/qt/changecontentdialog.ui
}
@@ -507,7 +508,7 @@ unix:!mac {
LIBS += -ltinyxml
LIBS += $$BOOST_LIBS
LIBS += -lgsasl -lidn
- LIBS += -lssl -lcrypto -lgcrypt -lgpg-error
+ LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf
}
TARGETDEPS += ./lib/libpokerth_lib.a \
./lib/libpokerth_db.a \
@@ -615,6 +616,7 @@ gui_800x480 {
src/gui/qt/gui_800x480/serverlistdialog_800x480.ui \
src/gui/qt/gui_800x480/internetgamelogindialog_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
}
@@ -632,6 +634,3 @@ maemo{
android_test{
DEFINES += ANDROID
}
-
-FORMS += \
- src/gui/qt/logfiledialog.ui
diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro
index 7b06edbc..4b1be2bf 100644
--- a/pokerth_protocol.pro
+++ b/pokerth_protocol.pro
@@ -106,6 +106,7 @@ win32 {
DEFINES += _WIN32_WINNT=0x0501
}
unix : !mac {
+ INCLUDEPATH += $${PREFIX}/include
system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
system(protoc pokerth.proto --java_out=tests/src)
}
diff --git a/src/gui/qt/gui_800x480/logfiledialog_800x480.ui b/src/gui/qt/gui_800x480/logfiledialog_800x480.ui
new file mode 100644
index 00000000..31452b7a
--- /dev/null
+++ b/src/gui/qt/gui_800x480/logfiledialog_800x480.ui
@@ -0,0 +1,220 @@
+
+
+ LogFileDialog
+
+
+
+ 0
+ 0
+ 618
+ 392
+
+
+
+ Dialog
+
+
+ -
+
+
-
+
+
+ Export as HTML
+
+
+
+ :/gfx/text-html.png:/gfx/text-html.png
+
+
+
+ -
+
+
+ Export as txt
+
+
+
+ :/gfx/text-plain.png:/gfx/text-plain.png
+
+
+
+ -
+
+
+ Save as ...
+
+
+
+ :/gfx/filesave.png:/gfx/filesave.png
+
+
+
+ -
+
+
+ Delete
+
+
+
+ :/gfx/editdelete.png:/gfx/editdelete.png
+
+
+
+
+
+ -
+
+
-
+
+
+ Preview:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Game:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 16777215
+
+
+
+ true
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ 5
+
+
+ false
+
+
+ true
+
+
+
+ Log File
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Analyse Logfile ...
+
+
+
+ :/gfx/view-statistics.png:/gfx/view-statistics.png
+
+
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ LogFileDialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ LogFileDialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/gui/qt/logfiledialog/logfiledialog.cpp b/src/gui/qt/logfiledialog/logfiledialog.cpp
index 432ade26..d7798284 100644
--- a/src/gui/qt/logfiledialog/logfiledialog.cpp
+++ b/src/gui/qt/logfiledialog/logfiledialog.cpp
@@ -17,7 +17,12 @@
*****************************************************************************/
#include "logfiledialog.h"
+#ifdef GUI_800x480
+#include "ui_logfiledialog_800x480.h"
+#else
#include "ui_logfiledialog.h"
+#endif
+
#include
#include "guilog.h"
#include "configfile.h"
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 48b8bbf9..5b769745 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -72,7 +72,6 @@ int main( int argc, char **argv )
/////// can be removed for non-qt-guis ////////////
QtSingleApplication a( argc, argv );
- Q_INIT_RESOURCE(pokerth);
if (a.sendMessage("Wake up!")) {
return 0;
@@ -139,8 +138,8 @@ int main( int argc, char **argv )
qRegisterMetaType("DenyGameInvitationReason");
///////////////////////////////////////////////////
- startWindowImpl mainWin(myConfig,myLog);
- a.setActivationWindow(&mainWin, true);
+ startWindowImpl mainWin(myConfig,myLog);
+ a.setActivationWindow(&mainWin, true);
int retVal = a.exec();