storm/thunderpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added some button icons (TODO: ok and cancel buttons)

Browse Source
This commit is contained in:
Mathias Panzenböck
2014-02-21 05:22:12 +01:00
parent 5db43041a1
commit c93aa1df37
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/joypadw.cpp
View File

@ -35,7 +35,7 @@ JoyPadWidget::JoyPadWidget( JoyPad* jp, int i, QWidget* parent )
insertCounter ++; insertCounter ++;
} }
insertCounter += 2; insertCounter += 2;
btnClear = new QPushButton("Clear", this); btnClear = new QPushButton(QIcon::fromTheme("edit-clear"), "Clear", this);
connect(btnClear, SIGNAL(clicked()), this, SLOT(clear())); connect(btnClear, SIGNAL(clicked()), this, SLOT(clear()));
layoutMain->addWidget(btnClear, insertCounter / 2, insertCounter % 2); layoutMain->addWidget(btnClear, insertCounter / 2, insertCounter % 2);
insertCounter++; insertCounter++;

15
src/layout.cpp
View File

@ -11,9 +11,9 @@ LayoutManager::LayoutManager( bool useTrayIcon, const QString &devdir, const QSt
: devdir(devdir), settingsDir(settingsDir), : devdir(devdir), settingsDir(settingsDir),
layoutGroup(new QActionGroup(this)), layoutGroup(new QActionGroup(this)),
titleAction(new QAction(this)), titleAction(new QAction(this)),
updateDevicesAction(new QAction("Update &Joystick Devices",this)), updateDevicesAction(new QAction(QIcon::fromTheme("view-refresh"),"Update &Joystick Devices",this)),
updateLayoutsAction(new QAction("Update &Layout List",this)), updateLayoutsAction(new QAction(QIcon::fromTheme("view-refresh"),"Update &Layout List",this)),
quitAction(new QAction("&Quit",this)), quitAction(new QAction(QIcon::fromTheme("application-exit"),"&Quit",this)),
le(0) { le(0) {
//prepare the popup first. //prepare the popup first.
titleAction->setEnabled(false); titleAction->setEnabled(false);
@ -326,8 +326,13 @@ void LayoutManager::fillPopup() {
//make a list of joystick devices //make a list of joystick devices
QString title = "Joysticks: "; QString title = "Joysticks: ";
foreach (JoyPad *joypad, available) { if (available.isEmpty()) {
title += QString("%1 ").arg(joypad->getIndex() + 1); title += "(none)";
}
else {
foreach (JoyPad *joypad, available) {
title += QString("%1 ").arg(joypad->getIndex() + 1);
}
} }
trayMenu.setTitle(title); trayMenu.setTitle(title);

12
src/layout_edit.cpp
View File

@ -22,16 +22,16 @@ LayoutEdit::LayoutEdit( LayoutManager* l ): QWidget(NULL) {
g->addWidget(cmbLayouts,0,0,1,4); g->addWidget(cmbLayouts,0,0,1,4);
//most of these buttons can link directly into slots in the LayoutManager //most of these buttons can link directly into slots in the LayoutManager
btnAdd = new QPushButton("&Add", frame); btnAdd = new QPushButton(QIcon::fromTheme("list-add"), "&Add", frame);
connect(btnAdd, SIGNAL(clicked()), lm, SLOT(saveAs())); connect(btnAdd, SIGNAL(clicked()), lm, SLOT(saveAs()));
g->addWidget(btnAdd,1,0); g->addWidget(btnAdd,1,0);
btnRem = new QPushButton("&Remove", frame); btnRem = new QPushButton(QIcon::fromTheme("list-remove"), "&Remove", frame);
connect(btnRem, SIGNAL(clicked()), lm, SLOT(remove())); connect(btnRem, SIGNAL(clicked()), lm, SLOT(remove()));
g->addWidget(btnRem,1,1); g->addWidget(btnRem,1,1);
btnUpd = new QPushButton("&Save", frame); btnUpd = new QPushButton(QIcon::fromTheme("document-save"), "&Save", frame);
connect(btnUpd, SIGNAL(clicked()), lm, SLOT(save())); connect(btnUpd, SIGNAL(clicked()), lm, SLOT(save()));
g->addWidget(btnUpd,1,2); g->addWidget(btnUpd,1,2);
btnRev = new QPushButton("Re&vert", frame); btnRev = new QPushButton(QIcon::fromTheme("document-revert"), "Re&vert", frame);
connect(btnRev, SIGNAL(clicked()), lm, SLOT(reload())); connect(btnRev, SIGNAL(clicked()), lm, SLOT(reload()));
g->addWidget(btnRev,1,3); g->addWidget(btnRev,1,3);
mainLayout->addWidget( frame ); mainLayout->addWidget( frame );
@ -73,10 +73,10 @@ LayoutEdit::LayoutEdit( LayoutManager* l ): QWidget(NULL) {
QHBoxLayout* h = new QHBoxLayout(0); QHBoxLayout* h = new QHBoxLayout(0);
h->setMargin(0); h->setMargin(0);
h->setSpacing(5); h->setSpacing(5);
QPushButton* close = new QPushButton( "-- &Close Dialog --", this ); QPushButton* close = new QPushButton(QIcon::fromTheme("window-close"), "&Close Dialog", this );
connect(close, SIGNAL(clicked()), this, SLOT(close())); connect(close, SIGNAL(clicked()), this, SLOT(close()));
h->addWidget(close); h->addWidget(close);
QPushButton* quit = new QPushButton( "-- &Quit --", this ); QPushButton* quit = new QPushButton(QIcon::fromTheme("application-exit"), "&Quit", this );
connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit())); connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit()));
h->addWidget(quit); h->addWidget(quit);
mainLayout->addLayout(h); mainLayout->addLayout(h);