Release V2.0.3

UbuntuKylin · Jul 16, 2015 · e637370 · e637370
1 parent 0236737
commit e637370
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 34 deletions.
diff --git a/backends/youker-assistant-daemon/src/sessiondbus/daemon.py b/backends/youker-assistant-daemon/src/sessiondbus/daemon.py
@@ -360,25 +360,49 @@ def currently_installed_version(self):
         apt_list = []
         cache = apt.Cache()
         pkg = cache['youker-assistant']
-        apt_list.append(pkg.installed.version)
-        print pkg.installed.version
+        installed_version = pkg.installed.version
+#        print installed_version
+        if ":" in installed_version:
+            info = installed_version.split(":")
+            apt_list.append(info.at(1))
+        else:
+            apt_list.append(installed_version)
+#        print pkg.installed.version#1:2.0.3-0~704~ubuntu15.04.1
         if len(pkg.versions) == 2:
-            print pkg.versions[0].version, pkg.versions[1].version
+#            print pkg.versions[0].version, pkg.versions[1].version
             if pkg.versions[0].version == pkg.versions[1].version:
                 apt_list.append(pkg.versions[0].version)
                 apt_list.append(pkg.versions[1].version)
                 apt_list.append("0")
             else:
+                tmp_installed = ''
+                tmp_unstalled = ''
                 if pkg.installed.version == pkg.versions[0].version:
-                    if pkg.versions[0].version < pkg.versions[1].version:
-                        apt_list.append(pkg.versions[0].version)
-                        apt_list.append(pkg.versions[1].version)
+                    if ":" in pkg.versions[0].version:
+                        tmp_installed = pkg.versions[0].version.split(":").at(1)
+                    else:
+                        tmp_installed = pkg.versions[0].version
+                    if ":" in pkg.versions[1].version:
+                        tmp_unstalled = pkg.versions[1].version.split(":").at(1)
+                    else:
+                        tmp_unstalled = pkg.versions[1].version
+                    if tmp_installed < tmp_unstalled:
+                        apt_list.append(tmp_installed)
+                        apt_list.append(tmp_unstalled)
                         apt_list.append("1")
                 elif pkg.installed.version == pkg.versions[1].version:
-                    if pkg.versions[1].version < pkg.versions[0].version:
-                        apt_list.append(pkg.versions[1].version)
-                        apt_list.append(pkg.versions[0].version)
-                        apt_list.append("1")
+                        if ":" in pkg.versions[1].version:
+                            tmp_installed = pkg.versions[1].version.split(":").at(1)
+                        else:
+                            tmp_installed = pkg.versions[1].version
+                        if ":" in pkg.versions[0].version:
+                            tmp_unstalled = pkg.versions[0].version.split(":").at(1)
+                        else:
+                            tmp_unstalled = pkg.versions[0].version
+                        if tmp_installed < tmp_unstalled:
+                            apt_list.append(tmp_installed)
+                            apt_list.append(tmp_unstalled)
+                            apt_list.append("1")
         return apt_list
 
     @dbus.service.method(INTERFACE, in_signature='s', out_signature='')

diff --git a/debian/changelog b/debian/changelog
@@ -12,8 +12,9 @@ youker-assistant (2.0.3) vivid; urgency=low
   * Delete debug logs and command history.
   * Rewrite camera module and replace pygame with opencv.
   * Make dash blur experimental normal(LP: #1430118).
+  * Modify custom skin filter(LP: #1475074).
 
- -- Kobe Lee (kylinkobe) <[email protected]>  Thu, 16 Jul 2015 09:54:35 +0800
+ -- Kobe Lee (kylinkobe) <[email protected]>  Thu, 16 Jul 2015 13:34:35 +0800
 
 youker-assistant (2.0.2) vivid; urgency=low
 

diff --git a/mainui/aboutdialog.cpp b/mainui/aboutdialog.cpp
@@ -98,8 +98,10 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &version, QString skin)
     contributorEdit->setGeometry(QRect(17, 92, 408, 200));
     aboutEdit->setReadOnly(true);
     contributorEdit->setReadOnly(true);
-    aboutEdit->append(tr("      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. \n      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: "));
-    aboutEdit->append(QString::fromLocal8Bit("<a href=\"https://launchpad.net/youker-assistant\">https://launchpad.net/youker-assistant</a>"));
+//    aboutEdit->append(tr("      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. \n      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: "));
+    aboutEdit->append(tr("      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions."));
+    aboutEdit->append(tr("      The software is still under development. Please visit ") + QString::fromLocal8Bit("<a style='color: #3f96e4;' href = http://www.ubuntukylin.com>www.ubuntukylin.com</a>") + tr(" for more information. Welcome everyone to join with us. youker-assistant Homepage: "));
+    aboutEdit->append(QString::fromLocal8Bit("<a style='color: #3f96e4;' href=\"https://launchpad.net/youker-assistant\">https://launchpad.net/youker-assistant</a>"));
     contributorEdit->setText(tr("Maintainer:\nUbuntu Kylin Team <[email protected]>"));
     contributorEdit->hide();
 

diff --git a/mainui/res/qss/youker-assistant.qss b/mainui/res/qss/youker-assistant.qss
@@ -309,6 +309,7 @@ QToolButton#transparentToolButton::pressed{
 QComboBox{
     border:1px solid #32435E;
     width: 150px;
+    height: 24px;
 }
 
 QComboBox::hover{
@@ -317,7 +318,7 @@ QComboBox::hover{
 }
 
 QComboBox QAbstractItemView::item{
-    height:20px;
+    height:24px;
 }
 
 QComboBox::down-arrow{

diff --git a/mainui/translation/youker-assistant_de.ts b/mainui/translation/youker-assistant_de.ts
@@ -14,13 +14,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="101"/>
-        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. 
-      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <location filename="../aboutdialog.cpp" line="102"/>
+        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="103"/>
+        <source> for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="103"/>
+        <source>      The software is still under development. Please visit </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="105"/>
         <source>Maintainer:
 Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
@@ -31,7 +40,7 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="120"/>
+        <location filename="../aboutdialog.cpp" line="122"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2479,6 +2488,11 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../skincenter.cpp" line="426"/>
+        <source>Image Files(*.jpg *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SystemWidget</name>

diff --git a/mainui/translation/youker-assistant_es.ts b/mainui/translation/youker-assistant_es.ts
@@ -14,13 +14,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="101"/>
-        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. 
-      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <location filename="../aboutdialog.cpp" line="102"/>
+        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="103"/>
+        <source> for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="103"/>
+        <source>      The software is still under development. Please visit </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="105"/>
         <source>Maintainer:
 Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
@@ -31,7 +40,7 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="120"/>
+        <location filename="../aboutdialog.cpp" line="122"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2479,6 +2488,11 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../skincenter.cpp" line="426"/>
+        <source>Image Files(*.jpg *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SystemWidget</name>

diff --git a/mainui/translation/youker-assistant_fr.ts b/mainui/translation/youker-assistant_fr.ts
@@ -14,13 +14,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="101"/>
-        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. 
-      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <location filename="../aboutdialog.cpp" line="102"/>
+        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="103"/>
+        <source> for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="103"/>
+        <source>      The software is still under development. Please visit </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="105"/>
         <source>Maintainer:
 Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
@@ -31,7 +40,7 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="120"/>
+        <location filename="../aboutdialog.cpp" line="122"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2479,6 +2488,11 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../skincenter.cpp" line="426"/>
+        <source>Image Files(*.jpg *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SystemWidget</name>

diff --git a/mainui/translation/youker-assistant_ru.ts b/mainui/translation/youker-assistant_ru.ts
@@ -14,13 +14,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="101"/>
-        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions. 
-      The software is still under development. Please visit www.ubuntukylin.com for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <location filename="../aboutdialog.cpp" line="102"/>
+        <source>      Youker Assistant is a powerful system supporting software which is developed by Ubuntu Kylin team. Mainly for the naive user, it can help users manage the system. At present, It provides system junk scanning and cleaning, viewing the system hardware and software information , system customization, task manager, monitoring ball, and some other functions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="103"/>
+        <source> for more information. Welcome everyone to join with us. youker-assistant Homepage: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="103"/>
+        <source>      The software is still under development. Please visit </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="105"/>
         <source>Maintainer:
 Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
@@ -31,7 +40,7 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="120"/>
+        <location filename="../aboutdialog.cpp" line="122"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2479,6 +2488,11 @@ Ubuntu Kylin Team &lt;[email protected]&gt;</source>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../skincenter.cpp" line="426"/>
+        <source>Image Files(*.jpg *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SystemWidget</name>

diff --git a/mainui/translation/youker-assistant_zh_CN.qm b/mainui/translation/youker-assistant_zh_CN.qm