diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 704e28cb..d4263190 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -46,11 +46,7 @@
resources/icon_spectator.svg
resources/replay_start.svg
- resources/replay_stop.svg
resources/replay_fastforward.svg
- resources/replay_rewind.svg
- resources/replay_toend.svg
- resources/replay_tostart.svg
resources/replay_pause.svg
resources/genders/male.svg
diff --git a/cockatrice/resources/replay_fastforward.svg b/cockatrice/resources/replay_fastforward.svg
index f46a38c4..23a275ab 100644
--- a/cockatrice/resources/replay_fastforward.svg
+++ b/cockatrice/resources/replay_fastforward.svg
@@ -14,8 +14,8 @@
height="32px"
id="svg3415"
version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="New document 11">
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="replay_fastforward.svg">
+ inkscape:window-x="307"
+ inkscape:window-y="118"
+ inkscape:window-maximized="0">
+
+
@@ -140,7 +144,7 @@
image/svg+xml
-
+
@@ -148,33 +152,39 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
-
-
-
-
-
-
+
+
diff --git a/cockatrice/resources/replay_pause.svg b/cockatrice/resources/replay_pause.svg
index 89bf0b7e..95801e6b 100644
--- a/cockatrice/resources/replay_pause.svg
+++ b/cockatrice/resources/replay_pause.svg
@@ -7,27 +7,16 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32px"
height="32px"
id="svg3648"
version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="New document 17">
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="replay_pause.svg">
-
-
-
-
+ inkscape:window-width="988"
+ inkscape:window-height="852"
+ inkscape:window-x="109"
+ inkscape:window-y="38"
+ inkscape:window-maximized="0">
+
+
@@ -130,7 +93,7 @@
image/svg+xml
-
+
@@ -141,47 +104,20 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/cockatrice/resources/replay_rewind.svg b/cockatrice/resources/replay_rewind.svg
deleted file mode 100644
index 9700cc0a..00000000
--- a/cockatrice/resources/replay_rewind.svg
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
diff --git a/cockatrice/resources/replay_start.svg b/cockatrice/resources/replay_start.svg
index 30af90d0..d3a5dcce 100644
--- a/cockatrice/resources/replay_start.svg
+++ b/cockatrice/resources/replay_start.svg
@@ -14,20 +14,17 @@
height="32px"
id="svg3239"
version="1.1"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_start.svg">
-
+
-
+ inkscape:window-width="1221"
+ inkscape:window-height="886"
+ inkscape:window-x="210"
+ inkscape:window-y="33"
+ inkscape:window-maximized="0">
+
+
@@ -102,7 +93,7 @@
image/svg+xml
-
+
@@ -112,19 +103,24 @@
inkscape:groupmode="layer">
+ transform="matrix(0.6981983,0,0,0.76802309,-828.26352,-426.88805)">
-
+ sodipodi:type="star"
+ style="fill:#237d12;fill-opacity:1;fill-rule:nonzero;stroke:#233312;stroke-width:0.52436191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3013"
+ sodipodi:sides="3"
+ sodipodi:cx="11.177006"
+ sodipodi:cy="8.825078"
+ sodipodi:r1="8.8405695"
+ sodipodi:r2="4.4202847"
+ sodipodi:arg1="0"
+ sodipodi:arg2="1.0471976"
+ inkscape:flatsided="true"
+ inkscape:rounded="1.6306401e-016"
+ inkscape:randomized="0"
+ d="m 20.017575,8.825078 -13.260854,7.656158 0,-15.3123158 z"
+ transform="matrix(2.0475365,0,0,1.8613848,1182.5389,560.23295)"
+ inkscape:transform-center-x="-3.1595648" />
diff --git a/cockatrice/resources/replay_stop.svg b/cockatrice/resources/replay_stop.svg
index 17da8995..8791b3c0 100644
--- a/cockatrice/resources/replay_stop.svg
+++ b/cockatrice/resources/replay_stop.svg
@@ -14,20 +14,10 @@
height="32px"
id="svg3320"
version="1.1"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_stop.svg">
-
-
+ inkscape:window-width="1099"
+ inkscape:window-height="800"
+ inkscape:window-x="128"
+ inkscape:window-y="20"
+ inkscape:window-maximized="0">
+
+
@@ -105,23 +89,12 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
-
-
-
-
+
diff --git a/cockatrice/resources/replay_toend.svg b/cockatrice/resources/replay_toend.svg
deleted file mode 100644
index 3f6b82b6..00000000
--- a/cockatrice/resources/replay_toend.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
diff --git a/cockatrice/resources/replay_tostart.svg b/cockatrice/resources/replay_tostart.svg
deleted file mode 100644
index 9b8b0936..00000000
--- a/cockatrice/resources/replay_tostart.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-
-
diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index 21791c38..ef1588ec 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -799,8 +799,7 @@ void MessageLogWidget::logSetActivePlayer(Player *player)
str = tr("It is now %1's turn.", "female");
else
str = tr("It is now %1's turn.", "male");
- QString fontColor = (player->getName().compare(QString(tabSupervisor->getUserInfo()->name().c_str())) == 0) ? "#" + settingsCache->getChatMentionColor(): "#0041FF";
- appendHtml("
" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + str.arg("" + player->getName() + "") + "
");
+ appendHtml("
" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + str.arg(player->getName()) + "
");
}
void MessageLogWidget::logSetActivePhase(int phase)
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp
index ba645cd2..8ee332af 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/tab_game.cpp
@@ -283,8 +283,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
playerListWidget = new PlayerListWidget(0, 0, this);
playerListWidget->setFocusPolicy(Qt::NoFocus);
- timeElapsedLabel = new QLabel;
- timeElapsedLabel->setAlignment(Qt::AlignCenter);
messageLog = new MessageLogWidget(tabSupervisor, this);
connect(messageLog, SIGNAL(cardNameHovered(QString)), cardInfo, SLOT(setCard(QString)));
connect(messageLog, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
@@ -294,7 +292,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
deckViewContainerLayout = new QVBoxLayout;
QVBoxLayout *messageLogLayout = new QVBoxLayout;
- messageLogLayout->addWidget(timeElapsedLabel);
messageLogLayout->addWidget(messageLog);
QWidget *messageLogLayoutWidget = new QWidget;
@@ -305,10 +302,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
connect(timelineWidget, SIGNAL(processNextEvent()), this, SLOT(replayNextEvent()));
connect(timelineWidget, SIGNAL(replayFinished()), this, SLOT(replayFinished()));
- replayToStartButton = new QToolButton;
- replayToStartButton->setIconSize(QSize(32, 32));
- replayToStartButton->setIcon(QIcon(":/resources/replay_tostart.svg"));
- connect(replayToStartButton, SIGNAL(clicked()), this, SLOT(replayToStartButtonClicked()));
replayStartButton = new QToolButton;
replayStartButton->setIconSize(QSize(32, 32));
replayStartButton->setIcon(QIcon(":/resources/replay_start.svg"));
@@ -318,21 +311,12 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
replayPauseButton->setEnabled(false);
replayPauseButton->setIcon(QIcon(":/resources/replay_pause.svg"));
connect(replayPauseButton, SIGNAL(clicked()), this, SLOT(replayPauseButtonClicked()));
- replayStopButton = new QToolButton;
- replayStopButton->setIconSize(QSize(32, 32));
- replayStopButton->setEnabled(false);
- replayStopButton->setIcon(QIcon(":/resources/replay_stop.svg"));
- connect(replayStopButton, SIGNAL(clicked()), this, SLOT(replayStopButtonClicked()));
replayFastForwardButton = new QToolButton;
replayFastForwardButton->setIconSize(QSize(32, 32));
replayFastForwardButton->setEnabled(false);
replayFastForwardButton->setIcon(QIcon(":/resources/replay_fastforward.svg"));
replayFastForwardButton->setCheckable(true);
connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool)));
- replayToEndButton = new QToolButton;
- replayToEndButton->setIconSize(QSize(32, 32));
- replayToEndButton->setIcon(QIcon(":/resources/replay_toend.svg"));
- connect(replayStopButton, SIGNAL(clicked()), this, SLOT(replayToEndButtonClicked()));
splitter = new QSplitter(Qt::Vertical);
splitter->addWidget(cardInfo);
@@ -346,12 +330,9 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
QHBoxLayout *replayControlLayout = new QHBoxLayout;
replayControlLayout->addWidget(timelineWidget, 10);
- replayControlLayout->addWidget(replayToStartButton);
replayControlLayout->addWidget(replayStartButton);
replayControlLayout->addWidget(replayPauseButton);
- replayControlLayout->addWidget(replayStopButton);
replayControlLayout->addWidget(replayFastForwardButton);
- replayControlLayout->addWidget(replayToEndButton);
QVBoxLayout *superMainLayout = new QVBoxLayout;
superMainLayout->addLayout(mainLayout);
@@ -599,20 +580,14 @@ void TabGame::replayFinished()
{
replayStartButton->setEnabled(true);
replayPauseButton->setEnabled(false);
- replayStopButton->setEnabled(false);
replayFastForwardButton->setEnabled(false);
}
-void TabGame::replayToStartButtonClicked()
-{
- // XXX
-}
void TabGame::replayStartButtonClicked()
{
replayStartButton->setEnabled(false);
replayPauseButton->setEnabled(true);
- replayStopButton->setEnabled(true);
replayFastForwardButton->setEnabled(true);
timelineWidget->startReplay();
@@ -627,27 +602,11 @@ void TabGame::replayPauseButtonClicked()
timelineWidget->stopReplay();
}
-void TabGame::replayStopButtonClicked()
-{
- replayStartButton->setEnabled(true);
- replayPauseButton->setEnabled(false);
- replayStopButton->setEnabled(false);
- replayFastForwardButton->setEnabled(false);
-
- timelineWidget->stopReplay();
- // XXX to start
-}
-
void TabGame::replayFastForwardButtonToggled(bool checked)
{
timelineWidget->setTimeScaleFactor(checked ? 10.0 : 1.0);
}
-void TabGame::replayToEndButtonClicked()
-{
- // XXX
-}
-
void TabGame::incrementGameTime()
{
int seconds = ++secondsElapsed;
diff --git a/cockatrice/src/tab_game.h b/cockatrice/src/tab_game.h
index cd2fcb0f..15c7ad96 100644
--- a/cockatrice/src/tab_game.h
+++ b/cockatrice/src/tab_game.h
@@ -121,7 +121,7 @@ private:
int currentReplayStep;
QList replayTimeline;
ReplayTimelineWidget *timelineWidget;
- QToolButton *replayToStartButton, *replayStartButton, *replayPauseButton, *replayStopButton, *replayFastForwardButton, *replayToEndButton;
+ QToolButton *replayStartButton, *replayPauseButton, *replayFastForwardButton;
QSplitter *splitter;
CardInfoWidget *cardInfo;
@@ -176,12 +176,9 @@ signals:
private slots:
void replayNextEvent();
void replayFinished();
- void replayToStartButtonClicked();
void replayStartButtonClicked();
void replayPauseButtonClicked();
- void replayStopButtonClicked();
void replayFastForwardButtonToggled(bool checked);
- void replayToEndButtonClicked();
void incrementGameTime();
void adminLockChanged(bool lock);