diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc
index 963557d0..63401fcb 100644
--- a/src/gui/qt/resources/pokerth.qrc
+++ b/src/gui/qt/resources/pokerth.qrc
@@ -53,6 +53,7 @@
emblem-important-64.png
dialog-information.png
view-statistics.png
+ document-revert.png
cflags/ad.png
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index a5766258..ae301a92 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -120,6 +120,15 @@
:/gfx/utilities-log-viewer.png:/gfx/utilities-log-viewer.png
+ -
+
+ Factory Settings
+
+
+
+ :/gfx/document-revert.png:/gfx/document-revert.png
+
+
-
@@ -3612,6 +3621,108 @@ p, li { white-space: pre-wrap; }
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Factory Settings
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 269
+ 40
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 300
+ 60
+
+
+
+
+ 75
+ true
+
+
+
+ Reset all settings to default ...
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 269
+ 292
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+
+
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 3e869a89..9a16e7cd 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -109,6 +109,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect( pushButton_Opponent9Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile9()) );
connect( pushButton_editManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callManualBlindsOrderDialog()) );
connect( pushButton_netEditManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callNetManualBlindsOrderDialog()) );
+ connect( pushButton_resetSettings, SIGNAL(clicked()), this, SLOT(resetSettings()));
connect( checkBox_UseInternetGamePassword, SIGNAL( toggled(bool) ), this, SLOT( clearInternetGamePassword(bool)) );
@@ -1366,3 +1367,15 @@ void settingsDialogImpl::showLogFilePreview()
cursor.movePosition(QTextCursor::Start);
textBrowser_logPreview->setTextCursor(cursor);
}
+
+void settingsDialogImpl::resetSettings()
+{
+ int ret = QMessageBox::warning(this, tr("PokerTH - Settings"),
+ tr("Attention: this will delete all your personal settings!\n"
+ "Do you really want to reset factory settings?"),
+ QMessageBox::Yes | QMessageBox::No);
+ if(ret == QMessageBox::Yes)
+ {
+ //TODO delete config.xml and directly close PokerTH
+ }
+}
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index a56b14ac..09c934c7 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -114,6 +114,7 @@ public slots:
void exportLogToTxt();
void saveLogFileAs();
void showLogFilePreview();
+ void resetSettings();
private:
diff --git a/zlib_compress.pro b/zlib_compress.pro
index 8e0758b5..d141ac06 100644
--- a/zlib_compress.pro
+++ b/zlib_compress.pro
@@ -15,6 +15,7 @@ TARGET = bin/zlib_compress
MOC_DIR = mocs
OBJECTS_DIR = obj
DEFINES += PREFIX=\"$${PREFIX}\"
+DEFINES += BOOST_FILESYSTEM_DEPRECATED
QT -= core gui
INCLUDEPATH += . \
@@ -50,6 +51,7 @@ unix : !mac {
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
BOOST_FS = boost_filesystem boost_filesystem-mt
BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
+ BOOST_SYSTEM = boost_system boost_system-mt
for(dir, LIB_DIRS) {
exists($$dir) {
@@ -65,10 +67,16 @@ unix : !mac {
BOOST_IOSTREAMS = -l$$lib
}
}
+ for(lib, BOOST_SYSTEM) {
+ exists($${dir}/lib$${lib}.so*) {
+ message("Found $$lib")
+ BOOST_SYSTEM = -l$$lib
+ }
+ }
}
}
- BOOST_LIBS = $$BOOST_FS $$BOOST_IOSTREAMS
- !count(BOOST_LIBS, 2) {
+ BOOST_LIBS = $$BOOST_FS $$BOOST_IOSTREAMS $$BOOST_SYSTEM
+ !count(BOOST_LIBS, 3) {
error("could not locate required library: \
libboost (version >= 1.34.1) --> http://www.boost.org/")
}