Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Fix wrong paths to fallback icons. #75

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Fix: Fix wrong paths to fallback icons. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/dpadpushbuttongroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ void DPadPushButtonGroup::generateButtons()
leftButton = generateBtnForGrid(buttons, 8, 1, 0);

dpadWidget = new DPadPushButton(dpad, displayNames, parentWidget());
dpadWidget->setIcon(QIcon::fromTheme(QString::fromUtf8("games_config_options"),
QIcon(":/icons/hicolor/16x16/actions/games_config_options.png")));
dpadWidget->setIcon(
QIcon::fromTheme(QString::fromUtf8("games_config_options"), QIcon(":/icons/actions/games_config_options.png")));
connect(dpadWidget, &DPadPushButton::clicked, this, &DPadPushButtonGroup::showDPadDialog);
addWidget(dpadWidget, 1, 1);

Expand Down
24 changes: 11 additions & 13 deletions src/joytabwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,29 @@ JoyTabWidget::JoyTabWidget(InputDevice *joystick, AntiMicroSettings *settings, Q
removeButton->setObjectName(QString::fromUtf8("removeButton"));
removeButton->setToolTip(tr("Remove configuration from recent list."));
removeButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
removeButton->setIcon(PadderCommon::loadIcon("user-trash", ":/icons/hicolor/16x16/actions/edit_clear_list.png"));
removeButton->setIcon(PadderCommon::loadIcon("user-trash", ":/icons/actions/edit_clear_list.png"));
configHorizontalLayout->addWidget(removeButton);

loadButton = new QPushButton(tr("Load"), this);
loadButton->setObjectName(QString::fromUtf8("loadButton"));
loadButton->setToolTip(tr("Load configuration file."));
loadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
loadButton->setIcon(PadderCommon::loadIcon("document-open", ":/icons/hicolor/16x16/actions/document_open.png"));
loadButton->setIcon(PadderCommon::loadIcon("document-open", ":/icons/actions/document_open.png"));

configHorizontalLayout->addWidget(loadButton);

saveButton = new QPushButton(tr("Save"), this);
saveButton->setObjectName(QString::fromUtf8("saveButton"));
saveButton->setToolTip(tr("Save changes to configuration file."));
saveButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
saveButton->setIcon(PadderCommon::loadIcon("document-save", ":/icons/hicolor/16x16/actions/document_save.png"));
saveButton->setIcon(PadderCommon::loadIcon("document-save", ":/icons/actions/document_save.png"));
configHorizontalLayout->addWidget(saveButton);

saveAsButton = new QPushButton(tr("Save As"), this);
saveAsButton->setObjectName(QString::fromUtf8("saveAsButton"));
saveAsButton->setToolTip(tr("Save changes to a new configuration file."));
saveAsButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
saveAsButton->setIcon(PadderCommon::loadIcon("document-save-as", ":/icons/hicolor/16x16/actions/document_save_as.png"));
saveAsButton->setIcon(PadderCommon::loadIcon("document-save-as", ":/icons/actions/document_save_as.png"));

configHorizontalLayout->addWidget(saveAsButton);

Expand Down Expand Up @@ -422,16 +422,16 @@ JoyTabWidget::JoyTabWidget(InputDevice *joystick, AntiMicroSettings *settings, Q

stickAssignPushButton = new QPushButton(tr("Stick/Pad Assign"), this);
stickAssignPushButton->setObjectName(QString::fromUtf8("stickAssignPushButton"));
QIcon icon7(QIcon::fromTheme(QString::fromUtf8("games_config_options"),
QIcon(":/icons/hicolor/16x16/actions/games_config_options.png")));
QIcon icon7(
QIcon::fromTheme(QString::fromUtf8("games_config_options"), QIcon(":/icons/actions/games_config_options.png")));

stickAssignPushButton->setIcon(icon7);
horizontalLayout_3->addWidget(stickAssignPushButton);

gameControllerMappingPushButton = new QPushButton(tr("Controller Mapping"), this);
gameControllerMappingPushButton->setObjectName(QString::fromUtf8("gameControllerMappingPushButton"));
gameControllerMappingPushButton->setIcon(QIcon::fromTheme(
QString::fromUtf8("games_config_options"), QIcon(":/icons/hicolor/16x16/actions/games_config_options.png")));
gameControllerMappingPushButton->setIcon(
QIcon::fromTheme(QString::fromUtf8("games_config_options"), QIcon(":/icons/actions/games_config_options.png")));

gameControllerMappingPushButton->setEnabled(false);
gameControllerMappingPushButton->setVisible(false);
Expand All @@ -449,8 +449,7 @@ JoyTabWidget::JoyTabWidget(InputDevice *joystick, AntiMicroSettings *settings, Q
namesPushButton->setObjectName(QString::fromUtf8("namesPushButton"));
namesPushButton->setToolTip(tr("Toggle button name displaying."));
namesPushButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
namesPushButton->setIcon(
QIcon::fromTheme(QString::fromUtf8("text_field"), QIcon(":/icons/hicolor/16x16/actions/text_field.png")));
namesPushButton->setIcon(QIcon::fromTheme(QString::fromUtf8("text_field"), QIcon(":/icons/actions/text_field.png")));

horizontalLayout_3->addWidget(namesPushButton);

Expand All @@ -464,7 +463,7 @@ JoyTabWidget::JoyTabWidget(InputDevice *joystick, AntiMicroSettings *settings, Q
resetButton->setObjectName(QString::fromUtf8("resetButton"));
resetButton->setToolTip(tr("Revert changes to the configuration. Reload configuration file."));
resetButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
resetButton->setIcon(PadderCommon::loadIcon("document-revert", ":/icons/hicolor/16x16/actions/document_revert.png"));
resetButton->setIcon(PadderCommon::loadIcon("document-revert", ":/icons/actions/document_revert.png"));

horizontalLayout_3->addWidget(resetButton);

Expand Down Expand Up @@ -1604,8 +1603,7 @@ void JoyTabWidget::displayProfileEditNotification()
qInstallMessageHandler(MessageHandler::myMessageOutput);

int currentIndex = configBox->currentIndex();
configBox->setItemIcon(currentIndex,
PadderCommon::loadIcon("document-save-as", ":/icons/hicolor/16x16/actions/document_save_as.png"));
configBox->setItemIcon(currentIndex, PadderCommon::loadIcon("document-save-as", ":/icons/actions/document_save_as.png"));

changedNotSaved = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/keyboard/virtualkeyboardmousewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ void VirtualKeyboardMouseWidget::setupMouseControlLayout()
tempVBoxLayout->addSpacerItem(new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding));

mouseSettingsPushButton = new QPushButton(tr("Mouse Settings"), this);
mouseSettingsPushButton->setIcon(PadderCommon::loadIcon("input-mouse", ":/icons/hicolor/16x16/actions/edit_select.png"));
mouseSettingsPushButton->setIcon(PadderCommon::loadIcon("input-mouse", ":/icons/actions/edit_select.png"));

tempVBoxLayout->addWidget(mouseSettingsPushButton);

Expand Down
5 changes: 2 additions & 3 deletions src/mainsettingsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,9 @@ MainSettingsDialog::MainSettingsDialog(AntiMicroSettings *settings, QList<InputD
#endif

ui->profileOpenDirPushButton->setIcon(
PadderCommon::loadIcon("document-open", ":/icons/hicolor/16x16/actions/document_open_folder.png"));
PadderCommon::loadIcon("document-open", ":/icons/actions/document_open_folder.png"));

ui->logFilePushButton->setIcon(
PadderCommon::loadIcon("document-open", ":/icons/hicolor/16x16/actions/document_open_folder.png"));
ui->logFilePushButton->setIcon(PadderCommon::loadIcon("document-open", ":/icons/actions/document_open_folder.png"));

this->settings = settings;
this->allDefaultProfile = nullptr;
Expand Down
18 changes: 8 additions & 10 deletions src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,22 +454,22 @@ void MainWindow::populateTrayIcon()
profileActions.clear();

closeAction = new QAction(tr("&Quit"), trayIconMenu);
closeAction->setIcon(PadderCommon::loadIcon("application-exit", ":/icons/hicolor/16x16/actions/application_exit.png"));
closeAction->setIcon(PadderCommon::loadIcon("application-exit", ":/icons/actions/application_exit.png"));

connect(closeAction, &QAction::triggered, this, &MainWindow::quitProgram, Qt::DirectConnection);

hideAction = new QAction(tr("&Hide"), trayIconMenu);
hideAction->setIcon(PadderCommon::loadIcon("view-restore", ":/icons/hicolor/16x16/actions/view_restore.png"));
hideAction->setIcon(PadderCommon::loadIcon("view-restore", ":/icons/actions/view_restore.png"));

connect(hideAction, &QAction::triggered, this, &MainWindow::hideWindow);

restoreAction = new QAction(tr("&Restore"), trayIconMenu);
restoreAction->setIcon(PadderCommon::loadIcon("view-fullscreen", ":/icons/hicolor/16x16/actions/view_fullscreen.png"));
restoreAction->setIcon(PadderCommon::loadIcon("view-fullscreen", ":/icons/actions/view_fullscreen.png"));

connect(restoreAction, &QAction::triggered, this, &MainWindow::show);

updateJoy = new QAction(tr("&Update Joysticks"), trayIconMenu);
updateJoy->setIcon(PadderCommon::loadIcon("view-refresh", ":/icons/hicolor/16x16/actions/view_refresh.png"));
updateJoy->setIcon(PadderCommon::loadIcon("view-refresh", ":/icons/actions/view_refresh.png"));

connect(updateJoy, &QAction::triggered, this, &MainWindow::startJoystickRefresh);

Expand Down Expand Up @@ -609,8 +609,7 @@ void MainWindow::populateTrayIcon()
newaction = new QAction(tr("Open File"), trayIconMenu);
}

newaction->setIcon(
PadderCommon::loadIcon("document-open", ":/icons/hicolor/16x16/actions/document_open.png"));
newaction->setIcon(PadderCommon::loadIcon("document-open", ":/icons/actions/document_open.png"));

connect(newaction, &QAction::triggered, widget, &JoyTabWidget::openConfigFileDialog);

Expand Down Expand Up @@ -952,8 +951,7 @@ void MainWindow::joystickTrayShow(QMenu *tempmenu)

if (widget->getJoystick()->isDeviceEdited())
{
action->setIcon(
PadderCommon::loadIcon("document-save-as", ":/icons/hicolor/16x16/actions/document_save_as.png"));
action->setIcon(PadderCommon::loadIcon("document-save-as", ":/icons/actions/document_save_as.png"));

} else if (!action->icon().isNull())
{
Expand Down Expand Up @@ -1420,8 +1418,8 @@ void MainWindow::singleTrayProfileMenuShow()

if (widget->getJoystick()->isDeviceEdited())
{
action->setIcon(PadderCommon::loadIcon("document-save-as",
":/icons/hicolor/16x16/actions/document_save_as.png"));
action->setIcon(
PadderCommon::loadIcon("document-save-as", ":/icons/actions/document_save_as.png"));
} else if (!action->icon().isNull())
{
action->setIcon(QIcon());
Expand Down
4 changes: 2 additions & 2 deletions src/stickpushbuttongroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ void StickPushButtonGroup::generateButtons()
leftButton = generateBtnToGrid(pushbutton, stick, JoyControlStick::StickLeft, 1, 0);

stickWidget = new JoyControlStickPushButton(stick, displayNames, parentWidget());
stickWidget->setIcon(QIcon::fromTheme(QString::fromUtf8("games_config_options"),
QIcon(":/icons/hicolor/16x16/actions/games_config_options.png")));
stickWidget->setIcon(
QIcon::fromTheme(QString::fromUtf8("games_config_options"), QIcon(":/icons/actions/games_config_options.png")));

connect(stickWidget, &JoyControlStickPushButton::clicked, this, &StickPushButtonGroup::showStickDialog);

Expand Down