Fixups

dannyedel · Jan 19, 2021 · 862dad3 · 862dad3
1 parent 555d28b
commit 862dad3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/cmake/compiler_gnu_gcc.cmake b/cmake/compiler_gnu_gcc.cmake
@@ -26,6 +26,7 @@ add_definitions(
 	-pedantic
 	-Wold-style-cast
 	-Woverloaded-virtual
+        -Wno-deprecated-declarations
 	-Weffc++
 )
 

diff --git a/dspdfviewer.cpp b/dspdfviewer.cpp
@@ -80,6 +80,7 @@ DSPDFViewer::DSPDFViewer(const RuntimeConfiguration& r):
   sconnect( &audienceWindow, SIGNAL(quitRequested()), this, SLOT(exit()));
   sconnect( &audienceWindow, SIGNAL(rerenderRequested()), this, SLOT(renderPage()));
   sconnect( &audienceWindow, SIGNAL(restartRequested()), this, SLOT(goToStartAndResetClocks()));
+  sconnect( &audienceWindow, SIGNAL(restartTimer()), this, SLOT(resetClocks()));
 
   sconnect( &audienceWindow, SIGNAL(screenSwapRequested()), this, SLOT(swapScreens()) );
 
@@ -102,6 +103,7 @@ DSPDFViewer::DSPDFViewer(const RuntimeConfiguration& r):
     sconnect( &secondaryWindow, SIGNAL(quitRequested()), this, SLOT(exit()));
     sconnect( &secondaryWindow, SIGNAL(rerenderRequested()), this, SLOT(renderPage()));
     sconnect( &secondaryWindow, SIGNAL(restartRequested()), this, SLOT(goToStartAndResetClocks()));
+    sconnect( &secondaryWindow, SIGNAL(restartTimer()), this, SLOT(resetClocks()));
 
     sconnect( &secondaryWindow, SIGNAL(screenSwapRequested()), this, SLOT(swapScreens()) );
 
@@ -249,6 +251,12 @@ void DSPDFViewer::goToStartAndResetClocks()
   gotoPage(0);
 }
 
+void DSPDFViewer::resetClocks()
+{
+  presentationClockRunning=false;
+  sendAllClockSignals();
+}
+
 QTime DSPDFViewer::presentationClock() const
 {
   if ( ! presentationClockRunning )

diff --git a/dspdfviewer.h b/dspdfviewer.h
@@ -120,6 +120,7 @@ public slots:
     void goBackward();
 
     void goToStartAndResetClocks();
+    void resetClocks();
 
     void swapScreens();
 

diff --git a/pdfviewerwindow.cpp b/pdfviewerwindow.cpp
@@ -222,6 +222,9 @@ void PDFViewerWindow::keyPressEvent(QKeyEvent* e)
       case Qt::Key_H: //Home
 	emit restartRequested();
 	break;
+      case Qt::Key_R: //Restart Timer
+	emit restartTimer();
+	break;
     }
 }
 

diff --git a/pdfviewerwindow.h b/pdfviewerwindow.h
@@ -130,6 +130,7 @@ public slots:
     void previousPageRequested();
     void pageRequested(unsigned requestedPageNumber);
     void restartRequested();
+    void restartTimer();
 
     void screenSwapRequested();