Git commit beb6e1379608f279c017a037209f3c3038f4fced by Konstantinos Smanis.
Committed on 25/10/2013 at 11:24.
Pushed by ksmanis into branch 'master'.

Added support for automatic GRUB resolution (GRUB_GFXMODE=3Dauto).

This is the new default instead of 640x480.

M  +9    -5    src/kcm_grub2.cpp

http://commits.kde.org/kcm-grub2/beb6e1379608f279c017a037209f3c3038f4fced

diff --git a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
index d2f29c8..1752903 100644
--- a/src/kcm_grub2.cpp
+++ b/src/kcm_grub2.cpp
@@ -197,13 +197,15 @@ void KCMGRUB2::load()
     ui->checkBox_memtest->setChecked(m_memtestOn);
     ui->checkBox_osProber->setChecked(unquoteWord(m_settings.value(QLatin1=
String("GRUB_DISABLE_OS_PROBER"))).compare(QLatin1String("true")) !=3D 0);
 =

-    m_resolutions.append(QLatin1String("640x480"));
-    QString grubGfxmode =3D (m_settings.value(QLatin1String("GRUB_GFXMODE"=
)).isEmpty() ? QLatin1String("640x480") : unquoteWord(m_settings.value(QLat=
in1String("GRUB_GFXMODE"))));
-    if (!grubGfxmode.isEmpty() && !m_resolutions.contains(grubGfxmode)) {
+    QString grubGfxmode =3D unquoteWord(m_settings.value(QLatin1String("GR=
UB_GFXMODE")));
+    if (grubGfxmode.isEmpty()) {
+        grubGfxmode =3D QLatin1String("auto");
+    }
+    if (grubGfxmode !=3D QLatin1String("auto") && !m_resolutions.contains(=
grubGfxmode)) {
         m_resolutions.append(grubGfxmode);
     }
     QString grubGfxpayloadLinux =3D unquoteWord(m_settings.value(QLatin1St=
ring("GRUB_GFXPAYLOAD_LINUX")));
-    if (!grubGfxpayloadLinux.isEmpty() && grubGfxpayloadLinux.compare(QLat=
in1String("text")) !=3D 0 && grubGfxpayloadLinux.compare(QLatin1String("kee=
p")) !=3D 0 && !m_resolutions.contains(grubGfxpayloadLinux)) {
+    if (!grubGfxpayloadLinux.isEmpty() && grubGfxpayloadLinux !=3D QLatin1=
String("text") && grubGfxpayloadLinux !=3D QLatin1String("keep") && !m_reso=
lutions.contains(grubGfxpayloadLinux)) {
         m_resolutions.append(grubGfxpayloadLinux);
     }
     m_resolutions.removeDuplicates();
@@ -1097,10 +1099,12 @@ void KCMGRUB2::showResolutions()
 {
     ui->kcombobox_gfxmode->clear();
     ui->kcombobox_gfxmode->addItem(i18nc("@item:inlistbox Refers to screen=
 resolution.", "Custom..."), QLatin1String("custom"));
+    ui->kcombobox_gfxmode->addItem(i18nc("@item:inlistbox Refers to screen=
 resolution.", "Auto"), QLatin1String("auto"));
 =

     ui->kcombobox_gfxpayload->clear();
     ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox Refers to scr=
een resolution.", "Custom..."), QLatin1String("custom"));
-    ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Unspecifie=
d"), QString());
+    ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox Refers to scr=
een resolution.", "Auto"), QLatin1String("auto"));
+    ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox Refers to scr=
een resolution.", "Unspecified"), QString());
     ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Boot in Te=
xt Mode"), QLatin1String("text"));
     ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Keep GRUB'=
s Resolution"), QLatin1String("keep"));
 =