[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kicker/applets/launcher
From:       Alejandro Exojo <suy () badopi ! org>
Date:       2006-08-23 23:08:02
Message-ID: 1156374482.378290.10486.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 576375 by suy:

Forward port 576357:
Make quick launcher use the Name field instead of the Comment one of the
application's desktop file in the tooltips.


 M  +4 -6      quickbutton.cpp  
 M  +2 -2      quickbutton.h  


--- trunk/KDE/kdebase/workspace/kicker/applets/launcher/quickbutton.cpp #576374:576375
@@ -104,13 +104,11 @@
          if (!_service->menuId().isEmpty())
             _menuId = _service->menuId();
 
-         _comment = _service->comment();
-         if (_comment.isEmpty())
-            _comment = _service->name();
          m_genericName = _service->genericName();
+         m_name = _service->name();
       }
    } else {
-      _comment = _kurl.prettyUrl();
+      m_name = _kurl.prettyUrl();
    }
    DEBUGSTR<<"QuickURL::QuickURL("<<u<<") END"<<endl<<flush;
 }
@@ -155,7 +153,7 @@
     _oldCursor = cursor();
     _qurl=new QuickURL(u);
 
-    this->setToolTip( _qurl->comment());
+    this->setToolTip( _qurl->name());
     resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM));
 
     QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
@@ -365,7 +363,7 @@
     {
         return;
     }
-    data.message = _qurl->comment();
+    data.message = _qurl->name();
     data.direction = m_popupDirection;
     data.subtext = _qurl->genericName();
     if (data.subtext == QString())
--- trunk/KDE/kdebase/workspace/kicker/applets/launcher/quickbutton.h #576374:576375
@@ -52,8 +52,8 @@
     KUrl kurl() const {return _kurl;};
     QString url() const {return _kurl.url();};
     QString menuId() const  {return _menuId;};
-    QString comment() const {return _comment;};
     QString genericName() const { return m_genericName; }
+    QString name() const { return m_name; }
     KService::Ptr service() const {return _service;};
     void run() const;
     QPixmap pixmap(mode_t _mode = 0, K3Icon::Group _group = K3Icon::Desktop,
@@ -62,8 +62,8 @@
 private:
     KUrl _kurl;
     QString _menuId;
-    QString _comment;
     QString m_genericName;
+    QString m_name;
     KService::Ptr _service;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]