realse V2.0.2

debian/changelog

@@ -7,7 +7,7 @@ youker-assistant (2.0.2) vivid; urgency=low
   * Add energy conserving model.
   * Fixed battery information(LP: #1430128).
 
- -- Kobe Lee (kylinkobe) <[email protected]>  Tue, 14 Apr 2015 12:07:13 +0800
+ -- Kobe Lee (kylinkobe) <[email protected]>  Wed, 15 Apr 2015 13:11:15 +0800
 
 youker-assistant (2.0.1) vivid; urgency=low
 

info/audiowidget.cpp

@@ -31,8 +31,29 @@ AudioWidget::AudioWidget(QWidget *parent, SystemDispatcher *proxy) :
     setFixedSize(750, 403/* - 10*/);
     scroll_widget = new ScrollWidget(this);
     scroll_widget->setGeometry(0, 0, 750, 403/* - 10*/);
+    dataOK = false;
+//    mulNum = this->initData();
 
-    mulNum = this->initData();
+}
+
+bool AudioWidget::getStatus()
+{
+    return this->dataOK;
+}
+
+void AudioWidget::initData()
+{
+    audio_info_map.clear();
+    audio_info_map = systemproxy->get_audiocard_info_qt();
+    QMap<QString, QVariant>::iterator iter = audio_info_map.find("MulNum");
+    int mulNum = 0;
+    if (iter == audio_info_map.end())
+    {
+        mulNum = 0;
+    }
+    else{
+        mulNum =  iter.value().toInt();
+    }
     if(audio_info_map.count() == 1 && audio_info_map.contains("kylinkobe"))
     {
     }
@@ -75,18 +96,5 @@ AudioWidget::AudioWidget(QWidget *parent, SystemDispatcher *proxy) :
             }
         }
     }
-}
-
-int AudioWidget::initData()
-{
-    audio_info_map.clear();
-    audio_info_map = systemproxy->get_audiocard_info_qt();
-    QMap<QString, QVariant>::iterator iter = audio_info_map.find("MulNum");
-    if (iter == audio_info_map.end())
-    {
-        return 0;
-    }
-    else{
-        return iter.value().toInt();
-    }
+    dataOK = true;
 }

info/audiowidget.h

@@ -32,7 +32,8 @@ class AudioWidget : public QWidget
     Q_OBJECT
 public:
     explicit AudioWidget(QWidget *parent = 0, SystemDispatcher *proxy = 0);
-    int initData();
+    void initData();
+    bool getStatus();
 
 signals:
 
@@ -43,7 +44,8 @@ public slots:
     QMap<QString, QVariant> audio_info_map;
     QMap<QString, QVariant> tmp_info_map;
     SystemDispatcher *systemproxy;
-    int mulNum;
+//    int mulNum;
+    bool dataOK;
 };
 
 #endif // AUDIOWIDGET_H

info/batterywidget.cpp

@@ -28,17 +28,13 @@ BatteryWidget::BatteryWidget(QWidget *parent, SessionDispatcher *proxy) :
     setFixedSize(750, 403);
     scroll_widget = new ScrollWidget(this);
     scroll_widget->setGeometry(0, 0, 750, 403);
-    this->initData();
-    if(battery_info_map.count() == 1 && battery_info_map.contains("kylinkobe"))
-    {
-        page = NULL;
-    }
-    else {
-        page = new ComputerPage(scroll_widget->zone, tr("Battery Info"));
-        page->setMap(battery_info_map, battery_info_map.value("POWER_SUPPLY_MANUFACTURER").toString().toUpper());
-        page->initUI();
-        scroll_widget->addScrollWidget(page);
-    }
+    dataOK = false;
+//    this->initData();
+}
+
+bool BatteryWidget::getStatus()
+{
+    return this->dataOK;
 }
 
 void BatteryWidget::initData()
@@ -71,5 +67,16 @@ void BatteryWidget::initData()
 //                battery_info_map.insert(it.key(), it.value());
 //        }
     }
+    if(battery_info_map.count() == 1 && battery_info_map.contains("kylinkobe"))
+    {
+        page = NULL;
+    }
+    else {
+        page = new ComputerPage(scroll_widget->zone, tr("Battery Info"));
+        page->setMap(battery_info_map, battery_info_map.value("POWER_SUPPLY_MANUFACTURER").toString().toUpper());
+        page->initUI();
+        scroll_widget->addScrollWidget(page);
+    }
+    dataOK = true;
 }
 

info/batterywidget.h

@@ -34,6 +34,7 @@ class BatteryWidget : public QWidget
 public:
     explicit BatteryWidget(QWidget *parent = 0, SessionDispatcher *proxy = 0);
     void initData();
+    bool getStatus();
 
 signals:
 
@@ -44,6 +45,7 @@ public slots:
     ComputerPage *page;
     QMap<QString, QVariant> battery_info_map;
     SessionDispatcher *sessionproxy;
+    bool dataOK;
 };
 
 #endif // BATTERYWIDGET_H

info/boardwidget.cpp

@@ -27,17 +27,13 @@ BoardWidget::BoardWidget(QWidget *parent, SystemDispatcher *proxy) :
     setFixedSize(750, 403);
     scroll_widget = new ScrollWidget(this);
     scroll_widget->setGeometry(0, 0, 750, 403);
-    this->initData();
-    if(board_info_map.count() == 1 && board_info_map.contains("kylinkobe"))
-    {
-        page = NULL;
-    }
-    else {
-        page = new ComputerPage(scroll_widget->zone, tr("Board Info"));
-        page->setMap(board_info_map, board_info_map.value("BoaVendor").toString().toUpper());
-        page->initUI();
-        scroll_widget->addScrollWidget(page);
-    }
+    dataOK = false;
+//    this->initData();
+}
+
+bool BoardWidget::getStatus()
+{
+    return this->dataOK;
 }
 
 void BoardWidget::initData()
@@ -49,4 +45,15 @@ void BoardWidget::initData()
             board_info_map.insert(it.key(), it.value());
         }
     }
+    if(board_info_map.count() == 1 && board_info_map.contains("kylinkobe"))
+    {
+        page = NULL;
+    }
+    else {
+        page = new ComputerPage(scroll_widget->zone, tr("Board Info"));
+        page->setMap(board_info_map, board_info_map.value("BoaVendor").toString().toUpper());
+        page->initUI();
+        scroll_widget->addScrollWidget(page);
+    }
+    dataOK = true;
 }

info/boardwidget.h

@@ -34,6 +34,7 @@ class BoardWidget : public QWidget
 public:
     explicit BoardWidget(QWidget *parent = 0, SystemDispatcher *proxy = 0);
     void initData();
+    bool getStatus();
 
 signals:
 
@@ -44,6 +45,7 @@ public slots:
     ComputerPage *page;
     QMap<QString, QVariant> board_info_map;
     SystemDispatcher *systemproxy;
+    bool dataOK;
 };
 
 #endif // BOARDWIDGET_H

info/cdrowwidget.cpp

@@ -29,6 +29,7 @@ CDRowWidget::CDRowWidget(QWidget *parent, SystemDispatcher *proxy) :
     setFixedSize(750, 403);
     scroll_widget = new ScrollWidget(this);
     scroll_widget->setGeometry(0, 0, 750, 403);
+    dataOK = false;
 //    this->initData();
 //    if(cdrom_info_map.count() == 1 && cdrom_info_map.contains("kylinkobe"))
 //    {
@@ -40,7 +41,35 @@ CDRowWidget::CDRowWidget(QWidget *parent, SystemDispatcher *proxy) :
 //        page->initUI();
 //        scroll_widget->addScrollWidget(page);
 //    }
-    cdNum = this->initData();
+//    cdNum = this->initData();
+
+}
+
+bool CDRowWidget::getStatus()
+{
+    return this->dataOK;
+}
+
+void CDRowWidget::initData()
+{
+//    QMap<QString, QVariant> tmpMap = systemproxy->get_cdrom_info_qt();
+//    QMap<QString,QVariant>::iterator it;
+//    for ( it = tmpMap.begin(); it != tmpMap.end(); ++it ) {
+//        if (it.value().toString().length() > 0) {
+//            cdrom_info_map.insert(it.key(), it.value());
+//        }
+//    }
+    cdrom_info_map.clear();
+    cdrom_info_map = systemproxy->get_cdrom_info_qt();
+    QMap<QString, QVariant>::iterator iter = cdrom_info_map.find("Dvdnum");
+    int cdNum = 0;
+    if (iter == cdrom_info_map.end())
+    {
+        cdNum =  0;
+    }
+    else{
+        cdNum =  iter.value().toInt();
+    }
     if(cdrom_info_map.count() == 1 && cdrom_info_map.contains("kylinkobe"))
     {
     }
@@ -83,25 +112,5 @@ CDRowWidget::CDRowWidget(QWidget *parent, SystemDispatcher *proxy) :
             }
         }
     }
-}
-
-int CDRowWidget::initData()
-{
-//    QMap<QString, QVariant> tmpMap = systemproxy->get_cdrom_info_qt();
-//    QMap<QString,QVariant>::iterator it;
-//    for ( it = tmpMap.begin(); it != tmpMap.end(); ++it ) {
-//        if (it.value().toString().length() > 0) {
-//            cdrom_info_map.insert(it.key(), it.value());
-//        }
-//    }
-    cdrom_info_map.clear();
-    cdrom_info_map = systemproxy->get_cdrom_info_qt();
-    QMap<QString, QVariant>::iterator iter = cdrom_info_map.find("Dvdnum");
-    if (iter == cdrom_info_map.end())
-    {
-        return 0;
-    }
-    else{
-        return iter.value().toInt();
-    }
+    dataOK = true;
 }

info/cdrowwidget.h

@@ -32,7 +32,8 @@ class CDRowWidget : public QWidget
     Q_OBJECT
 public:
     explicit CDRowWidget(QWidget *parent = 0, SystemDispatcher *proxy = 0);
-    int initData();
+    void initData();
+    bool getStatus();
 
 signals:
 
@@ -43,7 +44,8 @@ public slots:
     QMap<QString, QVariant> cdrom_info_map;
     QMap<QString, QVariant> tmp_info_map;
     SystemDispatcher *systemproxy;
-    int cdNum;
+//    int cdNum;
+    bool dataOK;
 };
 
 #endif // CDROWWIDGET_H

info/computerpage.cpp

@@ -301,7 +301,7 @@ QString ComputerPage::translatorSwitch(QString orgStr)
         return tr("IDE interface");
     else if(orgStr == "Signal processing controller")//信号处理控制器
         return tr("SP controller");
-    else if(orgStr == "Network controlle")//网络控制器
+    else if(orgStr == "Network controller")//网络控制器
         return tr("Network controller");
     else if(orgStr == "Multimedia audio controller")//多媒体音频控制器
         return tr("Multimedia audio controller");
@@ -423,7 +423,7 @@ QString ComputerPage::translatorSwitch(QString orgStr)
     else if(orgStr == "machine")//内核架构：
         return tr("Kernel Arch");
     else
-        return "";
+        return orgStr;
 }
 
 //void ComputerPage::resizeEvent(QResizeEvent *event)

info/cpuwidget.cpp

@@ -28,17 +28,13 @@ CpuWidget::CpuWidget(QWidget *parent, SystemDispatcher *proxy) :
     setFixedSize(750, 403);
     scroll_widget = new ScrollWidget(this);
     scroll_widget->setGeometry(0, 0, 750, 403 - 3);
-    this->initData();
-    if(cpu_info_map.count() == 1 && cpu_info_map.contains("kylinkobe"))
-    {
-        page = NULL;
-    }
-    else {
-        page = new ComputerPage(scroll_widget->zone, tr("CPU Info"));
-        page->setMap(cpu_info_map, cpu_info_map.value("CpuVendor").toString().toUpper());
-        page->initUI();
-        scroll_widget->addScrollWidget(page);
-    }
+    dataOK = false;
+//    this->initData();
+}
+
+bool CpuWidget::getStatus()
+{
+    return this->dataOK;
 }
 
 void CpuWidget::initData()
@@ -50,4 +46,15 @@ void CpuWidget::initData()
             cpu_info_map.insert(it.key(), it.value());
         }
     }
+    if(cpu_info_map.count() == 1 && cpu_info_map.contains("kylinkobe"))
+    {
+        page = NULL;
+    }
+    else {
+        page = new ComputerPage(scroll_widget->zone, tr("CPU Info"));
+        page->setMap(cpu_info_map, cpu_info_map.value("CpuVendor").toString().toUpper());
+        page->initUI();
+        scroll_widget->addScrollWidget(page);
+    }
+    dataOK = true;
 }

info/cpuwidget.h

@@ -34,6 +34,7 @@ class CpuWidget : public QWidget
 public:
     explicit CpuWidget(QWidget *parent = 0, SystemDispatcher *proxy = 0);
     void initData();
+    bool getStatus();
 
 signals:
 
@@ -44,6 +45,7 @@ public slots:
     ComputerPage *page;
     QMap<QString, QVariant> cpu_info_map;
     SystemDispatcher *systemproxy;
+    bool dataOK;
 };
 
 #endif // CPUWIDGET_H