merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -24,6 +24,7 @@
 #include <QOpenGLWidget>
 #include <QTimer>
 #include <QMutex>
+#include <QMenu>

 #include "rendering/qopenglshaderprogramptr.h"

@@ -33,6 +34,7 @@ public:
  ViewerWindow(QWidget *parent);
  void set_texture(GLuint t, double iar, QMutex *imutex);
 protected:
+  virtual void showEvent(QShowEvent*) override;
  virtual void keyPressEvent(QKeyEvent*) override;
  virtual void mousePressEvent(QMouseEvent*) override;
  virtual void mouseMoveEvent(QMouseEvent*) override;
@@ -45,6 +47,10 @@ private:
  QMutex* mutex_;
  QOpenGLShaderProgramPtr pipeline_;

+  // shortcuts
+  void shortcut_copier(QVector<QShortcut*>& shortcuts, QMenu* menu);
+  QVector<QShortcut*> shortcuts_;
+
  // exit full screen message
  QTimer fullscreen_msg_timer_;
  bool show_fullscreen_msg_;