battery icon added, keyboard settings revised

Author: onurkepenek

src/hvl-lightdm-greeter.qrc

@@ -17,5 +17,10 @@
         <file>resources/keyboard.png</file>
         <file>resources/restart.png</file>
         <file>resources/sleep.png</file>
+        <file>resources/battery_critical.png</file>
+        <file>resources/battery_full.png</file>
+        <file>resources/battery_good.png</file>
+        <file>resources/battery_low.png</file>
+        <file>resources/battery_normal.png</file>
     </qresource>
 </RCC>

src/resources/battery_critical.png

@@ -19,6 +19,8 @@ class Cache : public QSettings
     void setLastUser(QString userId) { setValue("last-user", userId); }
     QString getLastSession(QString userId) { return value(userId + "/last-session").toString(); }
     void setLastSession(QString userId, QString session) { setValue(userId + "/last-session", session); }
+    void setUserKeyboard(QString keyboard) { setValue("keyboard", keyboard); }
+    QString getUserKeyboard() { return value("keyboard").toString(); }
 };
 
 #define CONFIG_FILE "/usr/share/lightdm/lightdm-hvl-greeter.conf.d/hvl-lightdm-greeter.conf"

src/resources/battery_full.png

@@ -12,6 +12,7 @@
 #include <QApplication>
 #include <QThread>
 #include <QMessageBox>
+#include <QDir>
 
 #include "settings.h"
 #include "networkdialog.h"
@@ -50,13 +51,13 @@ SettingsForm::SettingsForm(QWidget *parent) :
 
     //ui->sessioncomboBox->setModel(&sessionsModel);
 
-   // qDebug() <<"---"<< sessionsModel.rowCount(QModelIndex());
+    // qDebug() <<"---"<< sessionsModel.rowCount(QModelIndex());
 
     //qm.setPixel(1,qRgba(33, 67, 106, 100));
     //QPixmap iconsession(":/resources/login_1_1_bos.png");
     QPixmap iconsession(2,30);
 
-   // iconsession.fill(qRgba(0x1B, 0x6C, 0xBD, 0xFF));
+    // iconsession.fill(qRgba(0x1B, 0x6C, 0xBD, 0xFF));
     iconsession.fill(QColor(0x1B, 0x6C, 0xBD, 0));
 
     for(i = 0; i< sessionsModel.rowCount(QModelIndex()); i++){
@@ -65,9 +66,9 @@ SettingsForm::SettingsForm(QWidget *parent) :
 
     }
 
-   // ui->sessioncomboBox->setItemIcon(1, QIcon(iconsession));
+    // ui->sessioncomboBox->setItemIcon(1, QIcon(iconsession));
     //ui->sessioncomboBox->setItemIcon(0, QIcon(iconsession));
-     //ui->sessioncomboBox->setItemIcon(-1, QIcon(iconsession));
+    //ui->sessioncomboBox->setItemIcon(-1, QIcon(iconsession));
 
 
     user = Cache().getLastUser();
@@ -112,6 +113,7 @@ SettingsForm::SettingsForm(QWidget *parent) :
 
     connect(this, SIGNAL(selectKeyboard(int)), this, SLOT(setKeyboardLayout(int)));
 
+    batteryInit();
 
     checkNetwork();
 }
@@ -127,12 +129,10 @@ SettingsForm::~SettingsForm()
 
 void SettingsForm::initialize(){
 
-
     serviceList = Settings().getservices();
-
-    getKeyboardLayouts();
-    ui->kybrdcomboBox->setCurrentText("tr");
     connect(ui->kybrdcomboBox, SIGNAL(activated(int)), this, SLOT(setKeyboardLayout(int)));
+    getKeyboardLayouts();
+
     nwButtonPressed = false;
 }
 
@@ -216,6 +216,8 @@ void SettingsForm::checkNetwork(){
     uint ip_count = 0;
     int res;
 
+
+    checkBattery();
     int runningServices = 0;
 
     ip_string += "  IP:\n";
@@ -352,6 +354,7 @@ void SettingsForm::getKeyboardLayouts(){
     QString  tmpstring;
     QString outstr;
     int read_size;
+    QString cachedlayout;
 
     tmpstring = "";
 
@@ -393,11 +396,29 @@ void SettingsForm::getKeyboardLayouts(){
     ui->kybrdcomboBox->addItem(iconx, "Türkçe F", "tr f");
     ui->kybrdcomboBox->addItem(iconx, "English Q", "us");
 
+    cachedlayout = Cache().getUserKeyboard();
+
+    if(!cachedlayout.isEmpty() && !cachedlayout.isNull())
+        tmpstring = cachedlayout;
 
     qInfo() << "Current Keyboard layout is: " +  tmpstring;
     emit sendKeyboardLayout(tmpstring);
     current_layout = tmpstring;
 
+    QByteArray ba;
+    char *setcommand;
+    char cmd_array[256];
+
+    ba = tmpstring.toLatin1();
+
+    setcommand = ba.data();
+
+    sprintf(cmd_array, "/usr/bin/setxkbmap %s &",setcommand);
+
+    system(cmd_array);
+
+    Cache().setUserKeyboard(tmpstring);
+
 
     if(ui->kybrdcomboBox->findData(tmpstring) == -1){
 
@@ -434,6 +455,8 @@ void SettingsForm::setKeyboardLayout(int index){
 
     system(cmd_array);
 
+    Cache().setUserKeyboard(actionName);
+
     //set onscreen keyboard layout
     emit sendKeyboardLayout(actionName);
 }
@@ -593,3 +616,70 @@ void SettingsForm::on_sessioncomboBox_activated(int index)
     QString sessionname = ui->sessioncomboBox->itemData(index).toString();
     emit sendSessionInfo(sessionname);
 }
+
+
+
+void SettingsForm::batteryInit(void){
+
+    QDir pathDir("/sys/class/power_supply/BAT0");
+    if (pathDir.exists()){
+
+        ui->Batterybutton->setToolTipDuration(10000);
+        batteryExist = true;
+        ui->Batterybutton->show();
+    }else{
+        batteryExist = false;
+        ui->Batterybutton->hide();
+    }
+}
+
+void SettingsForm::checkBattery(void){
+
+    QFile file("/sys/class/power_supply/BAT0/capacity");
+    int level;
+
+    if(batteryExist){
+
+        if(!file.open(QIODevice::ReadOnly))
+        {
+            return;
+        }
+
+        QTextStream instream(&file);
+        QString line = instream.readLine();
+
+        level = line.toInt();
+
+        if(level == 100){
+
+            QPixmap iconx(":/resources/battery_full.png");
+            ui->Batterybutton->setIcon(iconx);
+        }else if(level <= 15){
+
+            QPixmap iconx(":/resources/battery_critical.png");
+            ui->Batterybutton->setIcon(iconx);
+
+        }else if (level <= 35){
+
+            QPixmap iconx(":/resources/battery_low.png");
+            ui->Batterybutton->setIcon(iconx);
+
+        }else if(level <= 65){
+            QPixmap iconx(":/resources/battery_normal.png");
+            ui->Batterybutton->setIcon(iconx);
+
+
+        }else if(level <= 90){
+
+            QPixmap iconx(":/resources/battery_good.png");
+            ui->Batterybutton->setIcon(iconx);
+
+        }
+
+        ui->Batterybutton->setToolTip("%" + line);
+
+        file.close();
+
+    }
+
+}

src/resources/battery_good.png

@@ -87,7 +87,8 @@ public slots:
 #define SERVICE_NOT_WORKING -1
 #define SERVICE_NOT_EXIST -2
     int CheckService(QString Service);
-
+    void batteryInit(void);
+    void checkBattery(void);
 
 
 
@@ -108,6 +109,7 @@ public slots:
     bool networkOK;
     NetworkDialog *nwDialog;
     bool ctrlClicked;
+    bool batteryExist;
 
 
 

src/resources/battery_low.png

@@ -443,6 +443,32 @@ QComboBox::down-arrow {
        <bool>false</bool>
       </property>
      </widget>
+     <widget class="QPushButton" name="Batterybutton">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>50</x>
+        <y>115</y>
+        <width>60</width>
+        <height>45</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="hvl-lightdm-greeter.qrc">
+        <normaloff>:/resources/battery_critical.png</normaloff>:/resources/battery_critical.png</iconset>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>35</width>
+        <height>35</height>
+       </size>
+      </property>
+     </widget>
     </widget>
    </item>
   </layout>