Skip to content

Commit

Permalink
Fix various issues with tool tips.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DLLarson
DLLarson committed Jun 30, 2020
1 parent 24c842d commit 5c3afd9
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 44 deletions.
14 changes: 7 additions & 7 deletions GM/Cbdesign.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1270,14 +1270,14 @@ STRINGTABLE
BEGIN
ID_EDIT_CLEAR "Erase the current selection\nDelete (Del)"
ID_EDIT_CLEAR_ALL "Erase everything"
ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy (Ctrl+C)"
ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"
ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"
ID_EDIT_FIND "Find the specified text"
ID_EDIT_PASTE "Insert Clipboard contents\nPaste (Ctrl+V)"
ID_EDIT_PASTE "Insert Clipboard contents\nPaste"
ID_EDIT_REPEAT "Repeat the last action"
ID_EDIT_REPLACE "Replace specific text with different text"
ID_EDIT_SELECT_ALL "Select the entire document"
ID_EDIT_UNDO "Undo the last action\nUndo (Ctrl+Z)"
ID_EDIT_UNDO "Undo the last action\nUndo"
ID_EDIT_REDO "Redo the previously undone action\nRedo"
END

Expand Down Expand Up @@ -1311,13 +1311,13 @@ BEGIN
ID_EDIT_COLORDLG "Color Dialog Test"
ID_VIEW_GRIDLINES "Hides or shows cell layer border lines\nCell Border Lines"
ID_DEBUG_DUMPPAL "Oh the Doo Dah Day...."
ID_EDIT_LAYER_BASE "Edit the board's base drawing layer\nBase Drawing Layer (Ctrl+1)"
ID_EDIT_LAYER_TILE "Edit the board's cell layer\nBoard Cell Layer (Ctrl+2)"
ID_EDIT_LAYER_BASE "Edit the board's base drawing layer\nBase Drawing Layer"
ID_EDIT_LAYER_TILE "Edit the board's cell layer\nBoard Cell Layer"
END

STRINGTABLE
BEGIN
ID_EDIT_LAYER_TOP "Edit the board's top drawing layer\nTop Drawing Layer (Ctrl+3)"
ID_EDIT_LAYER_TOP "Edit the board's top drawing layer\nTop Drawing Layer"
ID_WINDOW_TOOLPAL "Hides or shows the Board tool palette\nBoard Tool Palette"
ID_WINDOW_COLORPAL "Shows or hides the Color palette\nColor Palette"
ID_WINDOW_TILEPAL "Shows or hides the Tile palette\nTile Palette"
Expand Down Expand Up @@ -1411,7 +1411,7 @@ BEGIN
ID_EDIT_CREATEBOARD "Create game play board."
ID_EDIT_CREATEPIECEGROUP "Create a grouping for playing pieces"
ID_EDIT_CREATEMARKGROUP "Create a grouping for markers"
ID_EDIT_MOVE "Move clipboard objects to new locations\nMove (Ctrl+M)"
ID_EDIT_MOVE "Move clipboard objects to new locations\nMove"
ID_PROJECT_SAVETILESINTILELIBRARYFILE
"Save selected tiles in a file\nSave Tiles in File"
ID_PROJECT_SAVETILEFILE "Save tiles in a tile library file\nSave Tile File"
Expand Down
1 change: 1 addition & 0 deletions GM/FrmMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
return -1; // fail to create
}
m_wndStatusBar.SetPaneStyle(0, SBPS_STRETCH);

CSize colorPalSize;
m_wndColorPal.CalculateMinClientSize(colorPalSize);
m_wndColorPal.SetMinSize(colorPalSize);
Expand Down
40 changes: 20 additions & 20 deletions GP/Cbplay.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1616,9 +1616,9 @@ BEGIN
ID_EDIT_SETBOOKMARK "Save the current state of the game"
ID_EDIT_RESTOREBOOKMARK "Restore game to saved state"
ID_VIEW_ANNOTATIONS "Show or hide annotation graphics"
ID_VIEW_PIECES "Hide or show pieces on board\nHide Pieces (F9)"
ID_ACT_TOFRONT "Move selected piece(s) in front of other pieces\nMove Pieces to Front (Ctrl+F)"
ID_ACT_TOBACK "Move selected pieces(s) behind other pieces\nMove Pieces to Back (Ctrl+B)"
ID_VIEW_PIECES "Hide or show pieces on board\nHide Pieces"
ID_ACT_TOFRONT "Move selected piece(s) in front of other pieces\nMove Pieces to Front"
ID_ACT_TOBACK "Move selected pieces(s) behind other pieces\nMove Pieces to Back"
END

STRINGTABLE
Expand Down Expand Up @@ -1705,15 +1705,15 @@ END

STRINGTABLE
BEGIN
ID_PTOOL_PLOTMOVE "Begin a plotted move.\nBegin Plotted Move (Ctrl+P)"
ID_PTOOL_PLOTMOVE "Begin a plotted move.\nBegin Plotted Move"
ID_FILE_SAVE_GAME_AS_SCENARIO
"Save current state of game as a scenario file.\nSave Game As Scenario"
END

STRINGTABLE
BEGIN
ID_PBCK_PREVIOUS "Step back to previous move\nPrevious Move (F2)"
ID_PBCK_END "Jump to end of move\nEnd of Moves (F5)"
ID_PBCK_PREVIOUS "Step back to previous move\nPrevious Move"
ID_PBCK_END "Jump to end of move\nEnd of Moves"
ID_PBCK_DISCARD "Discard the current move recording.\nDiscard Current Recording"
ID_PBCK_FINISH "Finishes and accepts the move file being played back. Adds to game history.\nAccepts Current Move Playback"
ID_ACT_PLOTDONE "Record the plotted move\nAccept Plotted Move (Enter)"
Expand All @@ -1734,10 +1734,10 @@ BEGIN
ID_EDIT_BRD2FILE "Save the current board image as a bitmap file."
ID_EDIT_BRDPROP "Edit properties of current playing board."
ID_ACT_COMPOUNDMOVE_BEGIN
"Begin compound move\nBegin Compound Move (Ctrl+Enter)"
ID_ACT_COMPOUNDMOVE_END "End active compound move\nEnd Compound Move (Enter)"
"Begin compound move\nBegin Compound Move"
ID_ACT_COMPOUNDMOVE_END "End active compound move\nEnd Compound Move"
ID_ACT_COMPOUNDMOVE_DISCARD
"Discard current compound move\nDiscard Compound Move (Esc)"
"Discard current compound move\nDiscard Compound Move"
ID_INDICATOR_COMPMOVE "This game file's player owner key has been tampered with.\nThis game file cannot be loaded.\n\n....GOOD BYE!"
ID_ACT_ROTATEREL "Rotate piece or marker using incremental amounts\nRotate Object - Incremental"
ID_PPROJITEM_PROPERTIES "Examine item properties."
Expand All @@ -1749,27 +1749,27 @@ END

STRINGTABLE
BEGIN
ID_ACT_STACK "Automatically stack selected pieces.\nAuto-Stack (Ctrl+A)"
ID_ACT_STACK "Automatically stack selected pieces.\nAuto-Stack"
ID_ACTIONS_ANNWITHTEXT "Annotate board with text box"
ID_ACT_DRAWLINE "Draw line annotation on board"
ID_ACT_DRAWTEXTBOX "Draw text box annotation on board"
ID_ACT_DOMESSAGE "Enter message for opponent\nEnter Message (Ctrl+M)"
ID_ACT_DOMESSAGE "Enter message for opponent\nEnter Message"
ID_EDIT_CLRBOOKMARK "Clear saved bookmark"
ID_VIEW_DICEPAL "Show or hide the dice palette"
ID_ACT_TURNOVER "Turn the selected piece over to the opposite side\nTurn Piece Over (Ctrl+I)"
ID_ACT_TURNOVER "Turn the selected piece over to the opposite side\nTurn Piece Over"
ID_ACT_ROTATE "Rotate the selected piece\nRotate Piece"
ID_ACT_REFINESELECT "Manually reduce the piece selections"
ID_ACT_ARRANGESTACK "Manually arrange stack order of selected pieces"
ID_PBCK_START "Jump to start of moves\nStart of Moves"
ID_PBCK_NEXT "Do the next move\nNext Move (F3)"
ID_PBCK_NEXT "Do the next move\nNext Move"
END

STRINGTABLE
BEGIN
ID_PLAYBACK_NEXTHISTORYENTRY
"Close this history and open the next history entry\nOpen Next History Entry (F6)"
ID_PBCK_NEXTHIST "Close current history playback and open the next\nOpen Next History (F4)"
ID_PBCK_CLOSEHIST "Close history playback mode.\nClose History Playback (F5)"
"Close this history and open the next history entry\nOpen Next History Entry"
ID_PBCK_NEXTHIST "Close current history playback and open the next\nOpen Next History"
ID_PBCK_CLOSEHIST "Close history playback mode.\nClose History Playback"
ID_FILE_SENDMOVES2FILE "Send current move recording to file\nSend Recording to File"
ID_FILE_DISCARDRECORDING
"Discard the current move recording.\nDiscard Current Recording"
Expand Down Expand Up @@ -1836,13 +1836,13 @@ END

STRINGTABLE
BEGIN
ID_ACTIONS_ROLLDICE "Roll Dice\nRoll Dice (Ctrl+R)"
ID_VIEW_DRAW_IND_ON_TOP "Draw movement playback indicators on top of pieces.\nIndicators On Top (F10)"
ID_ACTIONS_ROLLDICE "Roll Dice\nRoll Dice"
ID_VIEW_DRAW_IND_ON_TOP "Draw movement playback indicators on top of pieces.\nIndicators On Top"
ID_PBCK_STEP_CMOVES "If checked, compound moves are single stepped.\nSingle Step Compound Moves"
ID_PTRAY_SHUFFLE "Shuffle (randomize) the tray's contents"
ID_VIEW_SPLITBOARDROWS "Split board view horizontally into two rows.\nHorizontal Split"
ID_VIEW_SPLITBOARDCOLS "Split board view vertically into two columns.\nVertical Split"
ID_VIEW_SHOW_TIP_TEXT "Show text associated with objects as pop-up data tips.\nShow Object Text Tips (F7)"
ID_VIEW_SHOW_TIP_TEXT "Show text associated with objects as pop-up data tips.\nShow Object Text Tips"
ID_EDIT_ELEMENT_TEXT "Edit text associated with a piece or marker\nEdit Object Text"
END

Expand Down Expand Up @@ -1920,7 +1920,7 @@ END
STRINGTABLE
BEGIN
ID_ACT_SIMULATE_SPECTATOR
"View the board and trays as if the current player was a spectator.\nSimulate Spectator Player (F8)"
"View the board and trays as if the current player was a spectator.\nSimulate Spectator Player"
ID_EDIT_CREATE_GEOMORPHIC
"Create geomorphic board.\nCreate Geomorphic Board"
ID_HELP_WEBSITE "Opens a web browser and takes you to the CyberBoard web site."
Expand Down
24 changes: 10 additions & 14 deletions GP/FrmMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)

// Build the main window tool bar.
if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT,
WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER |
CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CRect(0, 0, 0, 0), IDW_TOOLBAR_MAIN) ||
!m_wndToolBar.LoadToolBar(IDR_GP_MAINFRAME))
Expand All @@ -181,10 +181,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
}

if (!m_wndTBarView.CreateEx(this, TBSTYLE_FLAT,
WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY |
CBRS_HIDE_INPLACE | CBRS_SIZE_DYNAMIC | CBRS_GRIPPER | CBRS_BORDER_3D,
//CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
//CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CRect(0, 0, 0, 0), IDW_TOOLBAR_VIEW) ||
!m_wndTBarView.LoadToolBar(IDR_TBAR_VIEW))
{
Expand All @@ -193,10 +191,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
}

if (!m_wndTBarMove.CreateEx(this, TBSTYLE_FLAT,
WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY |
CBRS_HIDE_INPLACE | CBRS_SIZE_DYNAMIC | CBRS_GRIPPER | CBRS_BORDER_3D,
//CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
//CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CRect(0, 0, 0, 0), IDW_TOOLBAR_MOVE) ||
!m_wndTBarMove.LoadToolBar(IDR_TBAR_MOVE))
{
Expand All @@ -205,22 +201,22 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
}

if (!m_wndTBarPlay.CreateEx(this, TBSTYLE_FLAT,
WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY |
CBRS_HIDE_INPLACE | CBRS_SIZE_DYNAMIC | CBRS_GRIPPER | CBRS_BORDER_3D,
//CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
//CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CBRS_GRIPPER | WS_CHILD | WS_VISIBLE | CBRS_TOP |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC,
CRect(0, 0, 0, 0), IDW_TOOLBAR_PLAY) ||
!m_wndTBarPlay.LoadToolBar(IDR_TBAR_PLAYBACK))
{
TRACE("Failed to create toolbar\n");
return -1; // fail to create
}

if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators, sizeof(indicators)/sizeof(UINT)))
if (!m_wndStatusBar.Create(this) ||
!m_wndStatusBar.SetIndicators(indicators, sizeof(indicators)/sizeof(UINT)))
{
TRACE0("Failed to create status bar\n");
return -1; // fail to create
}
m_wndStatusBar.SetPaneStyle(0, SBPS_STRETCH);

CString str;
str.LoadString(IDS_TRAYA_TITLE);
Expand Down
2 changes: 0 additions & 2 deletions GP/GamDoc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,6 @@ void CGamDoc::OnIdle(BOOL bActive)
CReadMsgWnd* pDocMsg = pMFrame->GetMessageWindow();
pMFrame->UpdatePaletteWindow(pDocMsg, m_bMsgWinVisible && !IsScenario());
pDocMsg->SetText(this);

pMFrame->RecalcLayout();
}
}

Expand Down
2 changes: 1 addition & 1 deletion GP/VwPbrd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ BOOL CPlayBoardView::PreTranslateMessage(MSG* pMsg)
m_toolHitTip.RelayEvent(pMsg);
m_toolMsgTip.RelayEvent(pMsg);

return CView::PreTranslateMessage(pMsg);
return CScrollView::PreTranslateMessage(pMsg);
}

/////////////////////////////////////////////////////////////////////////////
Expand Down

0 comments on commit 5c3afd9

Please sign in to comment.