File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3232/* *****************************************************************************/
3333UwxAutomation::UwxAutomation (QWidget *parent) : QDialog(parent), ui(new Ui::UwxAutomation){
3434 // On dialogue creation
35- this ->setWindowFlags ((Qt::Dialog | Qt::WindowCloseButtonHint));
3635 ui->setupUi (this );
37- this ->hide ();
3836
3937 // Default values
4038 mchItemPosition = 0 ;
@@ -103,10 +101,9 @@ UwxAutomation::SetMainHandle(
103101{
104102 // Sets the main window handle
105103 mMainAuto = mwNewHandle;
106- this -> setParent ( mMainAuto );
107- this ->setWindowFlags ((Qt::WindowCloseButtonHint | Qt::Window) );
104+ // Commented out to allow window to appear behind main window
105+ // this->setParent(mMainAuto );
108106 this ->setModal (false );
109- this ->hide ();
110107}
111108
112109// =============================================================================
@@ -664,6 +661,8 @@ UwxAutomation::on_check_OnTop_stateChanged(
664661 )
665662{
666663 // Always on-top state changed
664+ bool bReShow = this ->isVisible ();
665+
667666 if (ui->check_OnTop ->isChecked ())
668667 {
669668 // Always on top
@@ -672,9 +671,14 @@ UwxAutomation::on_check_OnTop_stateChanged(
672671 else
673672 {
674673 // Not always on top
675- this ->setWindowFlags ((Qt::Dialog | Qt::WindowCloseButtonHint));
674+ this ->setWindowFlags ((Qt::Window | Qt::WindowCloseButtonHint));
675+ }
676+
677+ if (bReShow == true )
678+ {
679+ // Repaint (show) window
680+ this ->show ();
676681 }
677- this ->show ();
678682}
679683
680684/* *****************************************************************************/
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ private slots:
147147 unsigned char mchItemPosition; // Current position of the array for the text boxes
148148 unsigned char mchItemTotal; // Total number of array entries
149149 unsigned char mchItemHighest; // Highest number in the array with an entry that has data
150- QStatusBar *msbStatusBar; //
150+ QStatusBar *msbStatusBar; // Pointer to automation status bar
151151};
152152
153153#endif // UWXAUTOMATION_H
Original file line number Diff line number Diff line change 8484#define MODE_CHECK_FIRMWARE_VERSIONS 17
8585#define MODE_CHECK_FIRMWARE_SUPPORT 18
8686// Defines for version and functions
87- #define UwVersion " 1.04p " // Version string
87+ #define UwVersion " 1.05 " // Version string
8888#define FileReadBlock 512 // Number of bytes to read per block when streaming files
8989#define StreamProgress 10000 // Number of bytes between streaming progress updates
9090#define BatchTimeout 4000 // Time (in mS) to wait for getting a response from a batch command for
You can’t perform that action at this time.
0 commit comments