aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/animationlayer.cpp1
-rw-r--r--src/aoapplication.cpp2
-rw-r--r--src/aoapplication.h8
-rw-r--r--src/widgets/moderator_dialog.cpp14
-rw-r--r--src/widgets/moderator_dialog.h4
5 files changed, 20 insertions, 9 deletions
diff --git a/src/animationlayer.cpp b/src/animationlayer.cpp
index a1084eda..7ffe1d7f 100644
--- a/src/animationlayer.cpp
+++ b/src/animationlayer.cpp
@@ -65,6 +65,7 @@ void AnimationLayer::startPlayback()
}
resetData();
m_processing = true;
+ setVisible(true);
Q_EMIT startedPlayback();
frameTicker();
}
diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index dd5821db..da7c1e2b 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()
QString AOApplication::get_version_string()
{
- return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC1";
+ return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC2";
}
QString AOApplication::find_image(QStringList p_list)
diff --git a/src/aoapplication.h b/src/aoapplication.h
index f0d3d81c..e9477e0c 100644
--- a/src/aoapplication.h
+++ b/src/aoapplication.h
@@ -43,7 +43,7 @@ public:
inline VPath operator+(const VPath &str) const { return VPath(this->toQString() + str.toQString()); }
};
-inline uint qHash(const VPath &key, uint seed = qGlobalQHashSeed())
+inline size_t qHash(const VPath &key, uint seed = qGlobalQHashSeed())
{
return qHash(key.toQString(), seed);
}
@@ -338,9 +338,9 @@ public:
private:
QVector<ServerInfo> server_list;
- QHash<uint, QString> asset_lookup_cache;
- QHash<uint, QString> dir_listing_cache;
- QSet<uint> dir_listing_exist_cache;
+ QHash<size_t, QString> asset_lookup_cache;
+ QHash<size_t, QString> dir_listing_cache;
+ QSet<size_t> dir_listing_exist_cache;
public Q_SLOTS:
void server_connected();
diff --git a/src/widgets/moderator_dialog.cpp b/src/widgets/moderator_dialog.cpp
index 11b99ccf..a39840fe 100644
--- a/src/widgets/moderator_dialog.cpp
+++ b/src/widgets/moderator_dialog.cpp
@@ -9,6 +9,7 @@
#include <QMessageBox>
#include <QUiLoader>
#include <QVBoxLayout>
+#include <chrono>
const QString ModeratorDialog::UI_FILE_PATH = "moderator_action_dialog.ui";
@@ -31,7 +32,9 @@ ModeratorDialog::ModeratorDialog(int clientId, bool ban, AOApplication *ao_app,
layout->addWidget(ui_widget);
FROM_UI(QComboBox, action);
- FROM_UI(QSpinBox, duration);
+ FROM_UI(QSpinBox, duration_mm);
+ FROM_UI(QSpinBox, duration_hh);
+ FROM_UI(QSpinBox, duration_dd);
FROM_UI(QLabel, duration_label);
FROM_UI(QCheckBox, permanent);
FROM_UI(QTextEdit, details);
@@ -46,7 +49,9 @@ ModeratorDialog::ModeratorDialog(int clientId, bool ban, AOApplication *ao_app,
ui_action->addItem(tr("Kick"));
}
- ui_duration->setVisible(m_ban);
+ ui_duration_mm->setVisible(m_ban);
+ ui_duration_hh->setVisible(m_ban);
+ ui_duration_dd->setVisible(m_ban);
ui_duration_label->setVisible(m_ban);
ui_permanent->setVisible(m_ban);
@@ -87,7 +92,10 @@ void ModeratorDialog::onAcceptedClicked()
}
else
{
- arglist.append(QString::number(ui_duration->value()));
+ qint64 duration = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::days(ui_duration_dd->value())).count();
+ duration = duration + std::chrono::duration_cast<std::chrono::seconds>(std::chrono::hours(ui_duration_hh->value())).count();
+ duration = duration + std::chrono::duration_cast<std::chrono::seconds>(std::chrono::minutes(ui_duration_mm->value())).count();
+ arglist.append(QString::number(duration));
}
}
else
diff --git a/src/widgets/moderator_dialog.h b/src/widgets/moderator_dialog.h
index 648f979d..558080f0 100644
--- a/src/widgets/moderator_dialog.h
+++ b/src/widgets/moderator_dialog.h
@@ -27,7 +27,9 @@ private:
QWidget *ui_widget;
QComboBox *ui_action;
- QSpinBox *ui_duration;
+ QSpinBox *ui_duration_mm;
+ QSpinBox *ui_duration_hh;
+ QSpinBox *ui_duration_dd;
QLabel *ui_duration_label;
QCheckBox *ui_permanent;
QTextEdit *ui_details;