diff -pur kdeadmin-3.4.0/lilo-config/kde/Details.cpp kdeadmin-3.4.0-lilofix/lilo-config/kde/Details.cpp
--- kdeadmin-3.4.0/lilo-config/kde/Details.cpp 2005-02-03 23:27:42.000000000 +0100
+++ kdeadmin-3.4.0-lilofix/lilo-config/kde/Details.cpp 2005-05-16 08:24:21.000000000 +0200
@@ -45,8 +45,8 @@ Details::Details(liloimage *lilo, QWidge
vga=new QComboBox(false, vgab);
vlbl->setBuddy(vga);
QWhatsThis::add(vgab, _("You can select the graphics mode for this kernel here.
If you intend to use a VGA graphics mode, you must compile the kernel with support for framebuffer devices. The ask setting brings up a prompt at boot time."));
- vga->insertItem(_("default"));
- vga->insertItem(_("ask"));
+ vga->insertItem("default");
+ vga->insertItem("ask");
vga->insertItem(_("text 80x25 (0)"));
vga->insertItem(_("text 80x50 (1)"));
vga->insertItem(_("text 80x43 (2)"));
diff -pur kdeadmin-3.4.0/lilo-config/kde-qt-common/images.cpp kdeadmin-3.4.0-lilofix/lilo-config/kde-qt-common/images.cpp
--- kdeadmin-3.4.0/lilo-config/kde-qt-common/images.cpp 2004-01-07 20:41:04.000000000 +0100
+++ kdeadmin-3.4.0-lilofix/lilo-config/kde-qt-common/images.cpp 2005-05-16 08:27:38.000000000 +0200
@@ -306,12 +306,17 @@ void Images::saveChanges() // SLOT
{
if(!current.isEmpty()) {
liloimage *l=lilo->images[current.latin1()];
- if(l) {
+ if(!l) return;
+
+ if(l->isLinux()) {
l->set("image", image->text().latin1(), true, true);
l->set("label", label->text().latin1(), true, true, "\t");
l->set("root", root->text().latin1(), true, true, "\t");
l->set("initrd", initrd->text().latin1(), true, true, "\t");
l->set("append", append->text().latin1(), true, true, "\t");
+ } else {
+ l->set("other", image->text().latin1(), true, true);
+ l->set("label", label->text().latin1(), true, true, "\t");
}
}
}
diff -pur kdeadmin-3.4.0/lilo-config/kde-qt-common/mainwidget.cpp kdeadmin-3.4.0-lilofix/lilo-config/kde-qt-common/mainwidget.cpp
--- kdeadmin-3.4.0/lilo-config/kde-qt-common/mainwidget.cpp 2004-01-07 20:41:04.000000000 +0100
+++ kdeadmin-3.4.0-lilofix/lilo-config/kde-qt-common/mainwidget.cpp 2005-05-16 08:28:14.000000000 +0200
@@ -93,15 +93,15 @@ void MainWidget::tabChanged(QString cons
{
if(previous==_("&Expert"))
expert->saveChanges();
- else if(previous==_("&General options"))
+ else if(previous==_("&General Options"))
general->saveChanges();
- else if(previous==_("&Operating systems"))
+ else if(previous==_("&Operating Systems"))
images->saveChanges();
if(lbl==_("&Expert"))
expert->update();
- else if(lbl==_("&Operating systems"))
+ else if(lbl==_("&Operating Systems"))
images->update();
- else if(lbl==_("&General options"))
+ else if(lbl==_("&General Options"))
general->update();
previous=lbl;
}
diff -pur kdeadmin-3.4.0/lilo-config/qt/Details.cpp kdeadmin-3.4.0-lilofix/lilo-config/qt/Details.cpp
--- kdeadmin-3.4.0/lilo-config/qt/Details.cpp 2005-02-03 23:27:42.000000000 +0100
+++ kdeadmin-3.4.0-lilofix/lilo-config/qt/Details.cpp 2005-05-16 08:28:41.000000000 +0200
@@ -45,8 +45,8 @@ Details::Details(liloimage *lilo, QWidge
vga=new QComboBox(false, vgab);
vlbl->setBuddy(vga);
QWhatsThis::add(vgab, _("You can select the graphics mode for this kernel here.
If you intend to use a VGA graphics mode, you must compile the kernel with support for framebuffer devices. The ask setting brings up a prompt at boot time."));
- vga->insertItem(_("default"));
- vga->insertItem(_("ask"));
+ vga->insertItem("default");
+ vga->insertItem("ask");
vga->insertItem(_("text 80x25 (0)"));
vga->insertItem(_("text 80x50 (1)"));
vga->insertItem(_("text 80x43 (2)"));