mirror of https://github.com/stella-emu/stella.git
some polishing for LauncherDialog (incl. doc)
This commit is contained in:
thrust26
parent
a948a7a9f9
commit
68833dc904
|
|
@ -1955,101 +1955,121 @@
|
|||
<th>Function</th>
|
||||
<th>Key (Standard)</th>
|
||||
<th>Key (macOS)</th>
|
||||
<th>Controller</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open context-sensitive help</td>
|
||||
<td>F1</td>
|
||||
<td>Shift-Cmd + ?</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Up</td>
|
||||
<td>Up arrow</td>
|
||||
<td>Up arrow</td>
|
||||
<td>Up</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Down</td>
|
||||
<td>Down arrow</td>
|
||||
<td>Down arrow</td>
|
||||
<td>Down</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Left</td>
|
||||
<td>Left arrow</td>
|
||||
<td>Left arrow</td>
|
||||
<td>Down</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Right</td>
|
||||
<td>Right arrow</td>
|
||||
<td>Right arrow</td>
|
||||
<td>Up</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Home</td>
|
||||
<td>Home</td>
|
||||
<td>Home</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move End</td>
|
||||
<td>End</td>
|
||||
<td>End</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Page Up</td>
|
||||
<td>Page Up</td>
|
||||
<td>Page Up</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move Page Down</td>
|
||||
<td>Page Down</td>
|
||||
<td>Page Down</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>OK</td>
|
||||
<td>-</td>
|
||||
<td>-</td>
|
||||
<td>Button 1/X + Up, Button 2/A</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Cancel</td>
|
||||
<td>Escape</td>
|
||||
<td>Escape</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Select item</td>
|
||||
<td>Return/Enter/Space</td>
|
||||
<td>Return/Enter/Space</td>
|
||||
<td>Button 1/X</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move to previous object</td>
|
||||
<td>Shift + Tab</td>
|
||||
<td>Shift + Tab</td>
|
||||
<td>Left</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move to next object</td>
|
||||
<td>Tab</td>
|
||||
<td>Tab</td>
|
||||
<td>Right</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move to previous tab</td>
|
||||
<td>Shift-Control + Tab</td>
|
||||
<td>Shift-Control + Tab</td>
|
||||
<td>Button 1/X + Left, Button 4/Y</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move to next tab</td>
|
||||
<td>Control + Tab</td>
|
||||
<td>Control + Tab</td>
|
||||
<td>Button 1/X + Right, Button 3/B</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle windowed/fullscreen mode</td>
|
||||
<td>Alt + Return</td>
|
||||
<td>Cmd + Return</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle UI theme</td>
|
||||
<td>Alt + T</td>
|
||||
<td>Cmd + T</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Exit Stella</td>
|
||||
<td>Control + Q</td>
|
||||
<td>Cmd + Q</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
@ -2060,91 +2080,115 @@
|
|||
<th>Function</th>
|
||||
<th>Key (Standard)</th>
|
||||
<th>Key (macOS)</th>
|
||||
<th>Controller</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Go to initial directory (also in other file dialogs)</td>
|
||||
<td>Alt + Home</td>
|
||||
<td>Alt + Home</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Go to previous directory in history (also in other file dialogs)</td>
|
||||
<td>Alt + Left arrow</td>
|
||||
<td>Alt + Left arrow</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Go to next directory in history (also in other file dialogs)</td>
|
||||
<td>Alt + Right arrow</td>
|
||||
<td>Alt + Right arrow</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Go to parent directory (also in other file dialogs)</td>
|
||||
<td>Backspace, Alt + Up arrow</td>
|
||||
<td>Backspace, Alt + Up arrow</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Select previous image</td>
|
||||
<td>Control + Left arrow</td>
|
||||
<td>Control + Left arrow</td>
|
||||
<td>Button 1/X + Left</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Select next image</td>
|
||||
<td>Control + Right arrow</td>
|
||||
<td>Control + Right arrow</td>
|
||||
<td>Button 1/X + Right</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toogle image zoom</td>
|
||||
<td>Control + Return</td>
|
||||
<td>Control + Return</td>
|
||||
<td>Button 1/X + Up</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Remove from 'Recently Played' or 'Most Popular' folder</td>
|
||||
<td>Control + X</td>
|
||||
<td>Control + X</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle favorite</td>
|
||||
<td>Control + F</td>
|
||||
<td>Control + F</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open Game properties dialog</td>
|
||||
<td>Control + G</td>
|
||||
<td>Control + G</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open Power-On options dialog</td>
|
||||
<td>Control + P</td>
|
||||
<td>Control + P</td>
|
||||
<td>Button 2/A</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open High Scores dialog (if available for selected ROM)</td>
|
||||
<td>Control + H</td>
|
||||
<td>Control + H</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle file extensions display</td>
|
||||
<td>Control + E</td>
|
||||
<td>Control + E</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle search ROMs in subdirectories too</td>
|
||||
<td>Control + D</td>
|
||||
<td>Control + D</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Toggle favorites sorting (normal or alternative)</td>
|
||||
<td>Control + S</td>
|
||||
<td>Control + S</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Reload ROM listing</td>
|
||||
<td>Control + R</td>
|
||||
<td>Control + R</td>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open Options dialog</td>
|
||||
<td>Control + O</td>
|
||||
<td>Control + O</td>
|
||||
<td>Button 4/Y</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Open context menu</td>
|
||||
<td>-</td>
|
||||
<td>-</td>
|
||||
<td>Hold Button</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -170,6 +170,11 @@
|
|||
<td>-</td>
|
||||
<td>Display next image</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Button 1 + Up</td>
|
||||
<td>-</td>
|
||||
<td>Toggle image zoom</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Button 2</td>
|
||||
<td>SKILL P2</td>
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ void LauncherDialog::loadConfig()
|
|||
const string& version = settings.getString("stella.version");
|
||||
|
||||
// Show "What's New" message when a new version of Stella is run for the first time
|
||||
if(version != STELLA_VERSION)
|
||||
if(version < STELLA_VERSION)
|
||||
{
|
||||
openWhatsNew();
|
||||
settings.setValue("stella.version", STELLA_VERSION);
|
||||
|
|
@ -918,26 +918,33 @@ Event::Type LauncherDialog::getJoyAxisEvent(int stick, JoyAxis axis, JoyDir adir
|
|||
if(myUseMinimalUI)
|
||||
// convert unused previous item event into page-up event
|
||||
e = Event::UIPgUp;
|
||||
else
|
||||
myRomImageWidget->disableImageZoom();
|
||||
break;
|
||||
|
||||
case Event::UINavNext:
|
||||
if(myUseMinimalUI)
|
||||
// convert unused next item event into page-down event
|
||||
e = Event::UIPgDown;
|
||||
else
|
||||
myRomImageWidget->disableImageZoom();
|
||||
break;
|
||||
|
||||
case Event::UITabPrev:
|
||||
myRomImageWidget->changeImage(-1);
|
||||
if(myList->isHighlighted())
|
||||
myRomImageWidget->changeImage(-1);
|
||||
myEventHandled = true;
|
||||
break;
|
||||
|
||||
case Event::UITabNext:
|
||||
myRomImageWidget->changeImage(1);
|
||||
if(myList->isHighlighted())
|
||||
myRomImageWidget->changeImage(1);
|
||||
myEventHandled = true;
|
||||
break;
|
||||
|
||||
case Event::UIOK:
|
||||
myRomImageWidget->toggleImageZoom();
|
||||
if(myList->isHighlighted())
|
||||
myRomImageWidget->toggleImageZoom();
|
||||
myEventHandled = true;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ class RomImageWidget : public Widget
|
|||
bool changeImage(int direction = 1);
|
||||
// Toggle zoom via keyboard
|
||||
void toggleImageZoom();
|
||||
void disableImageZoom() { myZoomMode = false; };
|
||||
|
||||
uInt64 pendingLoadTime() { return myMaxLoadTime * timeFactor; }
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue