|
@@ -297,10 +297,10 @@ void ConfigLineEdit::show(ConfigItem* i)
|
|
|
void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
|
|
|
{
|
|
|
switch (e->key()) {
|
|
|
- case Key_Escape:
|
|
|
+ case Qt::Key_Escape:
|
|
|
break;
|
|
|
- case Key_Return:
|
|
|
- case Key_Enter:
|
|
|
+ case Qt::Key_Return:
|
|
|
+ case Qt::Key_Enter:
|
|
|
sym_set_string_value(item->menu->sym, text().latin1());
|
|
|
parent()->updateList(item);
|
|
|
break;
|
|
@@ -639,7 +639,7 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
|
|
|
struct menu *menu;
|
|
|
enum prop_type type;
|
|
|
|
|
|
- if (ev->key() == Key_Escape && mode != fullMode && mode != listMode) {
|
|
|
+ if (ev->key() == Qt::Key_Escape && mode != fullMode && mode != listMode) {
|
|
|
emit parentSelected();
|
|
|
ev->accept();
|
|
|
return;
|
|
@@ -652,8 +652,8 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
|
|
|
item = (ConfigItem*)i;
|
|
|
|
|
|
switch (ev->key()) {
|
|
|
- case Key_Return:
|
|
|
- case Key_Enter:
|
|
|
+ case Qt::Key_Return:
|
|
|
+ case Qt::Key_Enter:
|
|
|
if (item->goParent) {
|
|
|
emit parentSelected();
|
|
|
break;
|
|
@@ -667,16 +667,16 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
|
|
|
emit menuSelected(menu);
|
|
|
break;
|
|
|
}
|
|
|
- case Key_Space:
|
|
|
+ case Qt::Key_Space:
|
|
|
changeValue(item);
|
|
|
break;
|
|
|
- case Key_N:
|
|
|
+ case Qt::Key_N:
|
|
|
setValue(item, no);
|
|
|
break;
|
|
|
- case Key_M:
|
|
|
+ case Qt::Key_M:
|
|
|
setValue(item, mod);
|
|
|
break;
|
|
|
- case Key_Y:
|
|
|
+ case Qt::Key_Y:
|
|
|
setValue(item, yes);
|
|
|
break;
|
|
|
default:
|
|
@@ -1315,18 +1315,18 @@ ConfigMainWindow::ConfigMainWindow(void)
|
|
|
backAction = new QAction("Back", QPixmap(xpm_back), _("Back"), 0, this);
|
|
|
connect(backAction, SIGNAL(activated()), SLOT(goBack()));
|
|
|
backAction->setEnabled(FALSE);
|
|
|
- QAction *quitAction = new QAction("Quit", _("&Quit"), CTRL+Key_Q, this);
|
|
|
+ QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
|
|
|
connect(quitAction, SIGNAL(activated()), SLOT(close()));
|
|
|
- QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), CTRL+Key_L, this);
|
|
|
+ QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
|
|
|
connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
|
|
|
- saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), CTRL+Key_S, this);
|
|
|
+ saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
|
|
|
connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
|
|
|
conf_set_changed_callback(conf_changed);
|
|
|
// Set saveAction's initial state
|
|
|
conf_changed();
|
|
|
QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this);
|
|
|
connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
|
|
|
- QAction *searchAction = new QAction("Find", _("&Find"), CTRL+Key_F, this);
|
|
|
+ QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
|
|
|
connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
|
|
|
QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
|
|
|
connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
|