Fixed navigation in Paths panel

BlitterStudio · Dec 27, 2020 · a097bd6 · a097bd6
1 parent 327bdb7
commit a097bd6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/osdep/gui/Navigation.cpp b/src/osdep/gui/Navigation.cpp
@@ -54,14 +54,15 @@ static NavigationMap navMap[] =
 #endif
 
 	// PanelPaths
-	{"SystemROMs", "Paths", "Paths", "RescanROMs", "ConfigPath"},
-	{"ConfigPath", "Paths", "Paths", "SystemROMs", "ControllersPath"},
-	{"ControllersPath", "Paths", "Paths", "ConfigPath", "RetroArchFile"},
-	{"RetroArchFile", "Paths", "Paths", "ControllersPath", "chkEnableLogging"},
-	{"chkEnableLogging", "Paths", "Paths", "RetroArchFile", "cmdLogfilePath"},
-	{"cmdLogfilePath", "Paths", "Paths", "chkEnableLogging", "RescanROMs"},
-	{"RescanROMs", "Paths", "DownloadXML", "cmdLogfilePath", "SystemROMs"},
-	{"DownloadXML", "RescanROMs", "Paths", "cmdLogfilePath", "SystemROMs"},
+	{"cmdSystemROMs", "Paths", "Paths", "cmdRescanROMs", "cmdConfigPath"},
+	{"cmdConfigPath", "Paths", "Paths", "cmdSystemROMs", "cmdControllersPath"},
+	{"cmdControllersPath", "Paths", "Paths", "cmdConfigPath", "cmdRetroArchFile"},
+	{"cmdRetroArchFile", "Paths", "Paths", "cmdControllersPath", "chkEnableLogging"},
+	{"chkEnableLogging", "Paths", "Paths", "cmdRetroArchFile", "cmdLogfilePath"},
+	{"cmdLogfilePath", "Paths", "Paths", "chkEnableLogging", "cmdRescanROMs"},
+	{"cmdRescanROMs", "Paths", "cmdDownloadXML", "cmdLogfilePath", "cmdSystemROMs"},
+	{"cmdDownloadXML", "cmdRescanROMs", "cmdDownloadCtrlDb", "cmdLogfilePath", "cmdSystemROMs"},
+	{"cmdDownloadCtrlDb", "cmdDownloadXML", "Paths", "cmdLogfilePath", "cmdSystemROMs" },
 
 	//  active            move left         move right        move up           move down
 	// PanelQuickstart

diff --git a/src/osdep/gui/PanelPaths.cpp b/src/osdep/gui/PanelPaths.cpp
@@ -248,7 +248,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 	txtSystemROMs->setBackgroundColor(colTextboxBackground);
 
 	cmdSystemROMs = new gcn::Button("...");
-	cmdSystemROMs->setId("SystemROMs");
+	cmdSystemROMs->setId("cmdSystemROMs");
 	cmdSystemROMs->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
 	cmdSystemROMs->setBaseColor(gui_baseCol);
 	cmdSystemROMs->addActionListener(folderButtonActionListener);
@@ -259,7 +259,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 	txtConfigPath->setBackgroundColor(colTextboxBackground);
 
 	cmdConfigPath = new gcn::Button("...");
-	cmdConfigPath->setId("ConfigPath");
+	cmdConfigPath->setId("cmdConfigPath");
 	cmdConfigPath->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
 	cmdConfigPath->setBaseColor(gui_baseCol);
 	cmdConfigPath->addActionListener(folderButtonActionListener);
@@ -270,7 +270,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 	txtControllersPath->setBackgroundColor(colTextboxBackground);
 
 	cmdControllersPath = new gcn::Button("...");
-	cmdControllersPath->setId("ControllersPath");
+	cmdControllersPath->setId("cmdControllersPath");
 	cmdControllersPath->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
 	cmdControllersPath->setBaseColor(gui_baseCol);
 	cmdControllersPath->addActionListener(folderButtonActionListener);
@@ -281,7 +281,7 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 	txtRetroArchFile->setBackgroundColor(colTextboxBackground);
 
 	cmdRetroArchFile = new gcn::Button("...");
-	cmdRetroArchFile->setId("RetroArchFile");
+	cmdRetroArchFile->setId("cmdRetroArchFile");
 	cmdRetroArchFile->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
 	cmdRetroArchFile->setBaseColor(gui_baseCol);
 	cmdRetroArchFile->addActionListener(folderButtonActionListener);
@@ -338,14 +338,14 @@ void InitPanelPaths(const struct _ConfigCategory& category)
 	cmdRescanROMs = new gcn::Button("Rescan Paths");
 	cmdRescanROMs->setSize(cmdRescanROMs->getWidth() + DISTANCE_BORDER, BUTTON_HEIGHT);
 	cmdRescanROMs->setBaseColor(gui_baseCol);
-	cmdRescanROMs->setId("RescanROMs");
+	cmdRescanROMs->setId("cmdRescanROMs");
 	cmdRescanROMs->addActionListener(rescanROMsButtonActionListener);
 
 	downloadXMLButtonActionListener = new DownloadXMLButtonActionListener();
 	cmdDownloadXML = new gcn::Button("Update WHDLoad XML");
 	cmdDownloadXML->setSize(cmdDownloadXML->getWidth() + DISTANCE_BORDER, BUTTON_HEIGHT);
 	cmdDownloadXML->setBaseColor(gui_baseCol);
-	cmdDownloadXML->setId("DownloadXML");
+	cmdDownloadXML->setId("cmdDownloadXML");
 	cmdDownloadXML->addActionListener(downloadXMLButtonActionListener);
 
 	downloadControllerDbActionListener = new DownloadControllerDbActionListener();