Merge lp:~feng-kylin/unity/changeTopLabel into lp:unity

[handsome_feng]

The desktop name "Ubuntu Desktop" can not be notified,it is not convenient for us to change it to our Special symbol,so i remove the ”const" attribute of desktop_name_ in PanelManuView.h ,and add a if statement in PanelManuView.cpp to judge witch desktop_name to show .thank you.

[Anthony Wong (anthonywong)]

The string "Ubuntu Desktop" was localized but in your change it is no longer the case. You should use _("Ubuntu Desktop") to take the localized string. The same applies to the "Ubuntu Kylin Desktop" string.

review: Needs Fixing

[Jack Yu (jackyu)]

Thanks.

[lp:~feng-kylin/unity/changeTopLabel]

3827. By handsome_feng on 2014-06-20

change the 'Ubuntu Desktop' to _('Ubuntu Desktop')

[Sebastien Bacher (seb128)]

would it make sense to use /etc/os-release, similar to what has been discussed on https://bugs.launchpad.net/bugs/1331873 ?

review: Needs Information

[handsome_feng (feng-kylin)]

yes ,i will do that ,thank you very much!

[lp:~feng-kylin/unity/changeTopLabel]

3828. By handsome_feng on 2014-07-30

 Add support for getting the distro name from /etc/os-release

[handsome_feng (feng-kylin)]

i have add the support for getting the distro name from /etc/os-release , how about this ?

[handsome_feng (feng-kylin)]

> would it make sense to use /etc/os-release, similar to what has been discussed
> on https://bugs.launchpad.net/bugs/1331873 ?
i have add the support to /etc/os-release ,and how about this?

[Stephen M. Webb (bregma)]

This MP has long been superseded by a different one accomplishing the same task. Marking as rejected.

Unmerged revisions

3828. By handsome_feng on 2014-07-30

 Add support for getting the distro name from /etc/os-release

3827. By handsome_feng on 2014-06-20

change the 'Ubuntu Desktop' to _('Ubuntu Desktop')

3826. By handsome_feng on 2014-06-13

change the label on the panel menu

3825. By handsome_feng on 2014-06-13

add a if statement,just for practice.

3824. By handsome_feng on 2014-06-13

add a if statement (a novice,make this for practice)

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-11 19:59:35 +0000
+++ debian/changelog	2014-07-30 01:57:45 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity (7.3.0+14.10.20140711-0ubuntu1) utopic; urgency=low
 
   [ Eleni Maria Stea ]
@@ -77,6 +78,14 @@
 
  -- Ubuntu daily release <[e-mail]>  Thu, 19 Jun 2014 18:41:55 +0000
 
+=======
+unity (7.2.0+14.10.20140607-0ubuntu2) UNRELEASED; urgency=medium
+
+  * add a if statement,just for practice.
+
+ -- handsome_feng <[e-mail]>  Fri, 13 Jun 2014 09:36:20 +0800
+
+>>>>>>> MERGE-SOURCE
 unity (7.2.0+14.10.20140607-0ubuntu1) utopic; urgency=low
 
   [ Chris Townsend ]

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-04-02 21:42:44 +0000
+++ panel/PanelMenuView.cpp	2014-07-30 01:57:45 +0000
@@ -20,6 +20,7 @@
 
 #include <Nux/Nux.h>
 #include <NuxCore/Logger.h>
+#include <fstream>
 
 #include "PanelMenuView.h"
 #include "unity-shared/AnimationUtils.h"
@@ -73,9 +74,23 @@
   , ignore_menu_visibility_(false)
   , integrated_menus_(decoration::Style::Get()->integrated_menus())
   , active_xid_(0)
-  , desktop_name_(_("Ubuntu Desktop"))
 {
-
+  std::ifstream fin("/etc/os-release");
+  std::string temp,os_release_name = _("Ubuntu");
+  if (fin.is_open())
+  {
+    while( getline(fin,temp) )
+    {    
+	    if (temp.substr(0,4) == "NAME")
+      {
+		    size_t i = temp.find_first_of("\"");
+		    size_t j = temp.find_last_of("\"");
+		    os_release_name = temp.substr(i+1,j-i-1);
+		    break;
+	    }
+    }
+  }
+  desktop_name_ = os_release_name + " " + _("Desktop");
   BamfWindow* active_win = bamf_matcher_get_active_window(matcher_);
   if (BAMF_IS_WINDOW(active_win))
     active_xid_ = bamf_window_get_xid(active_win);

=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-04-02 21:42:44 +0000
+++ panel/PanelMenuView.h	2014-07-30 01:57:45 +0000
@@ -188,7 +188,7 @@
 
   Window active_xid_;
   nux::Geometry monitor_geo_;
-  const std::string desktop_name_;
+  std::string desktop_name_;
 
   glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
   glib::Signal<void, BamfMatcher*, BamfView*> view_closed_signal_;