From 3407b7db9ebd0432a7d49a4c2f73f730bb44e774 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Dec 2020 21:00:31 +0100 Subject: [PATCH] New user welcome wizard not showing --- wDataDigger.w | 113 ++++++++++++++++++++++++------------------------ wDataDigger.wrx | Bin 2560 -> 2560 bytes 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/wDataDigger.w b/wDataDigger.w index 4594ed8..fbe96c3 100644 --- a/wDataDigger.w +++ b/wDataDigger.w @@ -193,8 +193,8 @@ DEFINE VARIABLE glUseColorsFavouriteTable AS LOGICAL NO-UNDO. &Scoped-Define ENABLED-OBJECTS rctQuery rctEdit btnFavourite fiTableFilter ~ cbDatabaseFilter tgSelAll fiIndexNameFilter fiFlagsFilter fiFieldsFilter ~ btnClearIndexFilter btnClearTableFilter brTables brFields brIndexes ~ -tgDebugMode btnTableFilter fiTableDesc cbFavouriteGroup ficWhere ~ -btnAddFavGroup btnWhere btnQueries btnView btnTools btnTabTables btnClear ~ +tgDebugMode btnTableFilter fiTableDesc cbFavouriteGroup btnAddFavGroup ~ +ficWhere btnWhere btnQueries btnView btnTools btnTabTables btnClear ~ btnClearFieldFilter btnClipboard btnMoveBottom btnMoveDown btnMoveTop ~ btnMoveUp btnReset btnTabFavourites btnTabFields btnTabIndexes btnNextQuery ~ btnPrevQuery btnDump btnLoad btnDelete btnResizeVer btnClone btnAdd btnEdit ~ @@ -1004,10 +1004,10 @@ DEFINE FRAME frMain btnTableFilter AT Y 3 X 257 WIDGET-ID 38 fiTableDesc AT Y 236 X 57 NO-LABEL WIDGET-ID 90 cbFavouriteGroup AT Y 236 X 75 COLON-ALIGNED NO-LABEL WIDGET-ID 316 - ficWhere AT Y 266 X 80 NO-LABEL btnAddFavGroup AT Y 236 X 248 WIDGET-ID 318 - fiWarning AT Y 520 X 480 COLON-ALIGNED NO-LABEL WIDGET-ID 172 + ficWhere AT Y 266 X 80 NO-LABEL btnWhere AT Y 265 X 683 WIDGET-ID 236 + fiWarning AT Y 520 X 480 COLON-ALIGNED NO-LABEL WIDGET-ID 172 btnQueries AT Y 265 X 745 WIDGET-ID 190 btnView AT Y 520 X 200 WIDGET-ID 4 btnTools AT Y 0 X 1 WIDGET-ID 264 @@ -1044,17 +1044,46 @@ DEFINE FRAME frMain AT X 0 Y 0 SIZE-PIXELS 1498 BY 560 DROP-TARGET. -DEFINE FRAME frData - btnClearDataFilter AT Y 5 X 761 WIDGET-ID 76 - btnDataSort AT Y 4 X 5 WIDGET-ID 300 - fiNumSelected AT Y 198 X 636 COLON-ALIGNED NO-LABEL WIDGET-ID 298 - fiNumRecords AT Y 198 X 665 COLON-ALIGNED NO-LABEL WIDGET-ID 210 - rctData AT Y 0 X 0 WIDGET-ID 272 - rctDataFilter AT Y 1 X 0 WIDGET-ID 296 +DEFINE FRAME frSettings + btnQueries-txt AT Y 175 X 37 WIDGET-ID 294 + btnDataDigger AT Y 35 X 1 WIDGET-ID 126 + btnSettings AT Y 70 X 1 WIDGET-ID 210 + btnDict AT Y 105 X 1 WIDGET-ID 224 + btnDataAdmin AT Y 140 X 1 WIDGET-ID 214 + btnQueries-3 AT Y 175 X 1 WIDGET-ID 190 + btnQueryTester AT Y 210 X 1 WIDGET-ID 232 + btnConnections AT Y 245 X 1 WIDGET-ID 212 + btnEditor AT Y 280 X 1 WIDGET-ID 228 + btnHelp AT Y 315 X 1 WIDGET-ID 260 + btnAbout AT Y 350 X 1 WIDGET-ID 196 + btnExpand AT Y 485 X 1 WIDGET-ID 306 + btnExpand-txt AT Y 485 X 35 WIDGET-ID 308 + btnEditor-txt AT Y 280 X 37 WIDGET-ID 290 + btnQueryTester-txt AT Y 210 X 37 WIDGET-ID 298 + btnAbout-txt AT Y 350 X 37 WIDGET-ID 266 + btnConnections-txt AT Y 245 X 37 WIDGET-ID 270 + btnDataAdmin-txt AT Y 140 X 37 WIDGET-ID 274 + btnDataDigger-txt AT Y 35 X 37 WIDGET-ID 278 + btnHelp-txt AT Y 315 X 37 WIDGET-ID 286 + btnSettings-txt AT Y 70 X 37 WIDGET-ID 302 + btnTools-2 AT Y 0 X 1 WIDGET-ID 264 + btnDict-txt AT Y 105 X 37 WIDGET-ID 282 + btnTools-txt AT Y 0 X 35 WIDGET-ID 304 WITH 1 DOWN NO-BOX KEEP-TAB-ORDER OVERLAY - SIDE-LABELS NO-UNDERLINE THREE-D - AT COL 7 ROW 15.05 - SIZE 158 BY 10.24 WIDGET-ID 700. + SIDE-LABELS NO-UNDERLINE + AT COL 1 ROW 2.43 + SIZE 28 BY 24.76 + BGCOLOR 15 WIDGET-ID 500. + +DEFINE FRAME frHint + edHint AT Y 4 X 35 NO-LABEL WIDGET-ID 2 + btGotIt AT Y 110 X 104 WIDGET-ID 4 + imgArrow AT Y 0 X 0 WIDGET-ID 10 + WITH 1 DOWN KEEP-TAB-ORDER OVERLAY + SIDE-LABELS TOP-ONLY NO-UNDERLINE THREE-D + AT X 1150 Y 15 + SIZE-PIXELS 285 BY 140 + BGCOLOR 14 WIDGET-ID 600. DEFINE FRAME frWhere btnBegins AT Y 123 X 17 WIDGET-ID 74 @@ -1092,46 +1121,17 @@ DEFINE FRAME frWhere TITLE "Query Editor" DEFAULT-BUTTON btnOK WIDGET-ID 400. -DEFINE FRAME frHint - edHint AT Y 4 X 35 NO-LABEL WIDGET-ID 2 - btGotIt AT Y 110 X 104 WIDGET-ID 4 - imgArrow AT Y 0 X 0 WIDGET-ID 10 - WITH 1 DOWN KEEP-TAB-ORDER OVERLAY - SIDE-LABELS TOP-ONLY NO-UNDERLINE THREE-D - AT X 1150 Y 15 - SIZE-PIXELS 285 BY 140 - BGCOLOR 14 WIDGET-ID 600. - -DEFINE FRAME frSettings - btnQueries-txt AT Y 175 X 37 WIDGET-ID 294 - btnDataDigger AT Y 35 X 1 WIDGET-ID 126 - btnSettings AT Y 70 X 1 WIDGET-ID 210 - btnDict AT Y 105 X 1 WIDGET-ID 224 - btnDataAdmin AT Y 140 X 1 WIDGET-ID 214 - btnQueries-3 AT Y 175 X 1 WIDGET-ID 190 - btnQueryTester AT Y 210 X 1 WIDGET-ID 232 - btnConnections AT Y 245 X 1 WIDGET-ID 212 - btnEditor AT Y 280 X 1 WIDGET-ID 228 - btnHelp AT Y 315 X 1 WIDGET-ID 260 - btnAbout AT Y 350 X 1 WIDGET-ID 196 - btnExpand AT Y 485 X 1 WIDGET-ID 306 - btnExpand-txt AT Y 485 X 35 WIDGET-ID 308 - btnEditor-txt AT Y 280 X 37 WIDGET-ID 290 - btnQueryTester-txt AT Y 210 X 37 WIDGET-ID 298 - btnAbout-txt AT Y 350 X 37 WIDGET-ID 266 - btnConnections-txt AT Y 245 X 37 WIDGET-ID 270 - btnDataAdmin-txt AT Y 140 X 37 WIDGET-ID 274 - btnDataDigger-txt AT Y 35 X 37 WIDGET-ID 278 - btnHelp-txt AT Y 315 X 37 WIDGET-ID 286 - btnSettings-txt AT Y 70 X 37 WIDGET-ID 302 - btnTools-2 AT Y 0 X 1 WIDGET-ID 264 - btnDict-txt AT Y 105 X 37 WIDGET-ID 282 - btnTools-txt AT Y 0 X 35 WIDGET-ID 304 +DEFINE FRAME frData + btnClearDataFilter AT Y 5 X 761 WIDGET-ID 76 + btnDataSort AT Y 4 X 5 WIDGET-ID 300 + fiNumSelected AT Y 198 X 636 COLON-ALIGNED NO-LABEL WIDGET-ID 298 + fiNumRecords AT Y 198 X 665 COLON-ALIGNED NO-LABEL WIDGET-ID 210 + rctData AT Y 0 X 0 WIDGET-ID 272 + rctDataFilter AT Y 1 X 0 WIDGET-ID 296 WITH 1 DOWN NO-BOX KEEP-TAB-ORDER OVERLAY - SIDE-LABELS NO-UNDERLINE - AT COL 1 ROW 2.43 - SIZE 28 BY 24.76 - BGCOLOR 15 WIDGET-ID 500. + SIDE-LABELS NO-UNDERLINE THREE-D + AT COL 7 ROW 15.05 + SIZE 158 BY 10.24 WIDGET-ID 700. /* *********************** Procedure Settings ************************ */ @@ -1205,7 +1205,7 @@ ASSIGN NO-ENABLE */ /* SETTINGS FOR FRAME frMain FRAME-NAME */ -/* BROWSE-TAB brTables frHint frMain */ +/* BROWSE-TAB brTables btnClearTableFilter frMain */ /* BROWSE-TAB brFields brTables frMain */ /* BROWSE-TAB brIndexes brFields frMain */ /* SETTINGS FOR BROWSE brFields IN FRAME frMain @@ -6772,7 +6772,7 @@ PROCEDURE enable_UI : ENABLE rctQuery rctEdit btnFavourite fiTableFilter cbDatabaseFilter tgSelAll fiIndexNameFilter fiFlagsFilter fiFieldsFilter btnClearIndexFilter btnClearTableFilter brTables brFields brIndexes tgDebugMode - btnTableFilter fiTableDesc cbFavouriteGroup ficWhere btnAddFavGroup + btnTableFilter fiTableDesc cbFavouriteGroup btnAddFavGroup ficWhere btnWhere btnQueries btnView btnTools btnTabTables btnClear btnClearFieldFilter btnClipboard btnMoveBottom btnMoveDown btnMoveTop btnMoveUp btnReset btnTabFavourites btnTabFields btnTabIndexes @@ -12487,12 +12487,11 @@ PROCEDURE startSession : /* Check if this is the first run, a new version or a new build */ iVersion = INTEGER(getRegistry('DataDigger', 'Version')) NO-ERROR. - IF iVersion = ? THEN iVersion = {&version}. - cBuild = getRegistry('DataDigger', 'Build'). IF cBuild = ? THEN cBuild = ''. lNewUser = (iVersion = ?). + IF iVersion = ? THEN iVersion = {&version}. lNewVersion = (iVersion <> {&version}). lNewBuild = (cBuild <> '{&build}'). diff --git a/wDataDigger.wrx b/wDataDigger.wrx index 25524e095d410bcc3e9de8e2faefda7504d1bb0b..57805cd0aaf7526969050a06158ca44aa8e94c04 100644 GIT binary patch delta 38 ncmZn=X%N|v!@|Zew_=aXy~#x^MSKSsK+J255TVVVSol~07rqYf delta 38 ncmZn=X%N|v!@{QUt@eW2-N{8PMSLF`K+J255TVVVSol~0J-QJ0