Commit 41e2430e authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master'

parents 3081b33e f4caf3bc
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QInputDialog> #include <QInputDialog>
#include <QMenuBar> #include <QMenuBar>
#include <QTimer>
#include <QVBoxLayout> #include <QVBoxLayout>
void XttQt::hotkey_Command(char* arg, void* userdata) void XttQt::hotkey_Command(char* arg, void* userdata)
...@@ -774,11 +775,12 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts) ...@@ -774,11 +775,12 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
((CoWowQt*)wow)->SetParent(((CoLoginQt*)xnav->cologin)->toplevel); ((CoWowQt*)wow)->SetParent(((CoLoginQt*)xnav->cologin)->toplevel);
} }
wow->DisplayWarranty();
if (xnav->cologin) { if (xnav->cologin) {
((CoWowQt*)wow)->SetParent(toplevel); ((CoWowQt*)wow)->SetParent(toplevel);
} }
// Use timeout to get in on the top of the display
QTimer::singleShot(100, ((CoWowQt*)wow)->object, SLOT(DisplayWarranty()));
} }
timerid = wow->timer_new(); timerid = wow->timer_new();
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QPushButton> #include <QPushButton>
#include <QTimer>
#define OP_HEIGHT_MIN 90 #define OP_HEIGHT_MIN 90
#define OP_HEIGHT_INC 20 #define OP_HEIGHT_INC 20
...@@ -475,7 +476,8 @@ OpQt::OpQt(void* op_parent_ctx, char* opplace, pwr_tStatus* status) ...@@ -475,7 +476,8 @@ OpQt::OpQt(void* op_parent_ctx, char* opplace, pwr_tStatus* status)
wow = new CoWowQt(toplevel); wow = new CoWowQt(toplevel);
sup_timerid = wow->timer_new(); sup_timerid = wow->timer_new();
wow->DisplayWarranty(); // Use timeout to get in on the top of the display
QTimer::singleShot(100, ((CoWowQt*)wow)->object, SLOT(DisplayWarranty()));
if (!(layout_mask & pwr_mOpWindLayoutMask_HideStatusBar)) { if (!(layout_mask & pwr_mOpWindLayoutMask_HideStatusBar)) {
sup_scan(this); sup_scan(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment