Replaced code that generates profile name from filename with calls to…

… getProfileName(). Progress towards issue AntiMicro#70.
Nyllac · Oct 30, 2016 · b0a5200 · b0a5200
1 parent 17b940e
commit b0a5200
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/joybuttonslot.cpp b/src/joybuttonslot.cpp
@@ -650,7 +650,7 @@ QString JoyButtonSlot::getSlotString()
             {
                 QFileInfo profileInfo(textData);
                 QString temp;
-                temp.append(tr("Load %1").arg(profileInfo.completeBaseName()));
+                temp.append(tr("Load %1").arg(PadderCommon::getProfileName(profileInfo)));
                 newlabel.append(temp);
             }
         }

diff --git a/src/joytabwidget.cpp b/src/joytabwidget.cpp
@@ -511,7 +511,7 @@ void JoyTabWidget::openConfigFileDialog()
                 configBox->removeItem(numberRecentProfiles);
             }
 
-            configBox->insertItem(1, fileinfo.completeBaseName(), fileinfo.absoluteFilePath());
+            configBox->insertItem(1, PadderCommon::getProfileName(fileinfo), fileinfo.absoluteFilePath());
             configBox->setCurrentIndex(1);
             saveDeviceSettings();
             emit joystickConfigChanged(joystick->getJoyNumber());
@@ -658,7 +658,7 @@ void JoyTabWidget::saveConfigFile()
                 }
 
                 joystick->revertProfileEdited();
-                QString tempProfileName = fileinfo.completeBaseName();
+                QString tempProfileName = PadderCommon::getProfileName(fileinfo);
                 if (!joystick->getProfileName().isEmpty())
                 {
                     oldProfileName = joystick->getProfileName();
@@ -843,7 +843,7 @@ void JoyTabWidget::saveAsConfig()
                 }
 
                 joystick->revertProfileEdited();
-                QString tempProfileName = fileinfo.completeBaseName();
+                QString tempProfileName = PadderCommon::getProfileName(fileinfo);
                 if (!joystick->getProfileName().isEmpty())
                 {
                     oldProfileName = joystick->getProfileName();
@@ -910,7 +910,7 @@ void JoyTabWidget::changeJoyConfig(int index)
             else
             {
                 QFileInfo profile(filename);
-                oldProfileName = profile.completeBaseName();
+                oldProfileName = PadderCommon::getProfileName(profile);
                 profileName = oldProfileName;
             }
             configBox->setItemText(index, profileName);
@@ -1003,7 +1003,7 @@ void JoyTabWidget::saveSettings()
 
             settings->setValue(controlEntryString.arg(currentjoy), outputFilename);
 
-            if (profileBaseFile.completeBaseName() != profileText)
+            if (PadderCommon::getProfileName(profileBaseFile) != profileText)
             {
                 settings->setValue(controlEntryProfileName.arg(currentjoy), profileText);
             }
@@ -1043,7 +1043,7 @@ void JoyTabWidget::saveSettings()
 #endif
                settings->setValue(controlEntryString.arg(currentjoy), outputFilename);
 
-               if (profileBaseFile.completeBaseName() != profileText)
+               if (PadderCommon::getProfileName(profileBaseFile) != profileText)
                {
                    settings->setValue(controlEntryProfileName.arg(currentjoy), profileText);
                }
@@ -1127,7 +1127,7 @@ void JoyTabWidget::loadSettings(bool forceRefresh)
             if (fileInfo.exists() && configBox->findData(fileInfo.absoluteFilePath()) == -1)
             {
                 QString profileName = settings->value(controlEntryProfileName.arg(i), "").toString();
-                profileName = !profileName.isEmpty() ? profileName : fileInfo.completeBaseName();
+                profileName = !profileName.isEmpty() ? profileName : PadderCommon::getProfileName(fileInfo);
                 configBox->addItem(profileName, fileInfo.absoluteFilePath());
             }
         }
@@ -1337,7 +1337,7 @@ void JoyTabWidget::loadConfigFile(QString fileLocation)
                     configBox->removeItem(numberRecentProfiles-1);
                     //configBox->removeItem(5);
                 }
-                configBox->insertItem(1, fileinfo.completeBaseName(), fileinfo.absoluteFilePath());
+                configBox->insertItem(1, PadderCommon::getProfileName(fileinfo), fileinfo.absoluteFilePath());
 
                 reconnectCheckUnsavedEvent();
                 reconnectMainComboBoxEvents();
@@ -2319,7 +2319,7 @@ void JoyTabWidget::editCurrentProfileItemText(QString text)
         else if (currentIndex > 0)
         {
             QFileInfo profileName(configBox->itemData(currentIndex).toString());
-            configBox->setItemText(currentIndex, profileName.completeBaseName());
+            configBox->setItemText(currentIndex, PadderCommon::getProfileName(profileName));
         }
     }
 }