← Back to team overview

ayatana-commits team mailing list archive

  1. ayatana-commits team
  2. Mailing list archive
  3. Message #00756

[Branch ~agateau/plasma-widget-message-indicator/trunk] Rev 106: indicatordisplay -> message-indicator

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 106
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-widget-message-indicator
timestamp: Fri 2010-01-15 11:26:42 +0100
message:
  indicatordisplay -> message-indicator
renamed:
  src/indicatordisplay.cpp => src/message-indicator.cpp
  src/indicatordisplay.h => src/message-indicator.h
  src/plasma-applet-indicatordisplay.desktop => src/plasma-applet-message-indicator.desktop
modified:
  CMakeLists.txt
  Messages.sh
  src/CMakeLists.txt
  src/message-indicator.cpp
  src/message-indicator.h
  src/plasma-applet-message-indicator.desktop


--
lp:plasma-widget-message-indicator
https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk

Your team ayatana-commits is subscribed to branch lp:plasma-widget-message-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk/+edit-subscription.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2009-11-13 17:15:56 +0000
+++ CMakeLists.txt	2010-01-15 10:26:42 +0000
@@ -1,4 +1,4 @@
-project(plasma-indicatordisplay)
+project(plasma-widget-message-indicator)
 
 cmake_minimum_required(VERSION 2.6)
 

=== modified file 'Messages.sh'
--- Messages.sh	2009-08-05 17:13:44 +0000
+++ Messages.sh	2010-01-15 10:26:42 +0000
@@ -1,3 +1,3 @@
 #! /bin/sh
 $EXTRACTRC `find src -name "*.ui" -o -name "*.rc" -o -name "*.kcfg" ` >> rc.cpp
-$XGETTEXT `find src -name "*.cpp" -o -name "*.h"` -o $podir/plasma_applet_indicatordisplay.pot
+$XGETTEXT `find src -name "*.cpp" -o -name "*.h"` -o $podir/plasma_applet_message_indicator.pot

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2009-09-28 08:36:10 +0000
+++ src/CMakeLists.txt	2010-01-15 10:26:42 +0000
@@ -3,26 +3,26 @@
     ${CMAKE_BINARY_DIR}
     )
 
-set(indicatordisplay_SRCS
+set(message_indicator_SRCS
     delegate.cpp
-    indicatordisplay.cpp
+    message-indicator.cpp
     listenermodel.cpp
     modeldump.cpp
     timeutils.cpp
     view.cpp
     )
 
-kde4_add_plugin(plasma_applet_indicatordisplay ${indicatordisplay_SRCS})
+kde4_add_plugin(plasma_applet_message_indicator ${message_indicator_SRCS})
 
-target_link_libraries(plasma_applet_indicatordisplay
+target_link_libraries(plasma_applet_message_indicator
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KIO_LIBS}
     ${INDICATEQT_LIBRARIES}
     ${INDICATE_LIBRARIES}
     )
 
-install(TARGETS plasma_applet_indicatordisplay
+install(TARGETS plasma_applet_message_indicator
     DESTINATION ${PLUGIN_INSTALL_DIR})
 
-install(FILES plasma-applet-indicatordisplay.desktop
+install(FILES plasma-applet-message-indicator.desktop
     DESTINATION ${SERVICES_INSTALL_DIR})

=== renamed file 'src/indicatordisplay.cpp' => 'src/message-indicator.cpp'
--- src/indicatordisplay.cpp	2009-10-08 14:11:28 +0000
+++ src/message-indicator.cpp	2010-01-15 10:26:42 +0000
@@ -9,7 +9,7 @@
  * License: GPL v3
  */
 // Self
-#include "indicatordisplay.h"
+#include "message-indicator.h"
 
 // Qt
 #include <QGraphicsLinearLayout>
@@ -32,10 +32,10 @@
 static const char* NO_NEW_STUFF_ICON = "mail-unread";
 static const char* NEW_STUFF_ICON = "mail-unread-new";
 
-K_EXPORT_PLASMA_APPLET(indicatordisplay, IndicatorDisplay)
-
-
-IndicatorDisplay::IndicatorDisplay(QObject* parent, const QVariantList& args)
+K_EXPORT_PLASMA_APPLET(message-indicator, MessageIndicator)
+
+
+MessageIndicator::MessageIndicator(QObject* parent, const QVariantList& args)
 : Plasma::PopupApplet(parent, args)
 , mListener(0)
 , mSourceModel(0)
@@ -46,13 +46,13 @@
     setAspectRatioMode(Plasma::Square);
 }
 
-IndicatorDisplay::~IndicatorDisplay()
+MessageIndicator::~MessageIndicator()
 {
     removeInterestOnServers();
     delete mView;
 }
 
-void IndicatorDisplay::init()
+void MessageIndicator::init()
 {
     Plasma::ToolTipManager::self()->registerWidget(this);
     mListener = new QIndicate::Listener(this);
@@ -66,7 +66,7 @@
     initIcon();
 }
 
-void IndicatorDisplay::initIcon()
+void MessageIndicator::initIcon()
 {
     // Note: we use an icon widget, not the builtin setPopupIcon() because
     // otherwise our view might get embedded if there is enough space, and we do
@@ -81,7 +81,7 @@
     updateIconState();
 }
 
-void IndicatorDisplay::initSourceModel()
+void MessageIndicator::initSourceModel()
 {
     // Reg exp is a hack to avoid regressions while changing app server types
     // from "messaging" to "message.<something>"
@@ -102,7 +102,7 @@
     #endif
 }
 
-void IndicatorDisplay::initView()
+void MessageIndicator::initView()
 {
     mView->setModel(mSourceModel);
 
@@ -133,7 +133,7 @@
             );
 }
 
-void IndicatorDisplay::initPalette()
+void MessageIndicator::initPalette()
 {
     QPalette pal = mView->palette();
     pal.setColor(QPalette::Base, Qt::transparent);
@@ -142,16 +142,16 @@
     mView->setPalette(pal);
 }
 
-QWidget* IndicatorDisplay::widget()
+QWidget* MessageIndicator::widget()
 {
     return mView;
 }
 
-void IndicatorDisplay::toolTipAboutToShow()
+void MessageIndicator::toolTipAboutToShow()
 {
     Plasma::ToolTipContent toolTip;
     toolTip.setImage(mIconWidget->icon());
-    toolTip.setMainText(i18n("Indicator Display"));
+    toolTip.setMainText(i18n("Message Indicator"));
     int appCount = mSourceModel->rowCount();
     if (appCount == 0) {
         toolTip.setSubText(i18n("No applications running"));
@@ -161,7 +161,7 @@
     Plasma::ToolTipManager::self()->setContent(this, toolTip);
 }
 
-void IndicatorDisplay::adjustViewSize()
+void MessageIndicator::adjustViewSize()
 {
     QSize sh = mView->sizeHint();
 
@@ -177,14 +177,14 @@
     QMetaObject::invokeMethod(dialog, "dialogResized");
 }
 
-void IndicatorDisplay::popupEvent(bool show)
+void MessageIndicator::popupEvent(bool show)
 {
     if (show) {
         adjustViewSize();
     }
 }
 
-void IndicatorDisplay::slotClicked(const QModelIndex& index)
+void MessageIndicator::slotClicked(const QModelIndex& index)
 {
     QIndicate::Listener::Server* server = 0;
     QIndicate::Listener::Indicator* indicator = 0;
@@ -195,7 +195,7 @@
     hidePopup();
 }
 
-void IndicatorDisplay::slotRowsChanged(const QModelIndex& parent)
+void MessageIndicator::slotRowsChanged(const QModelIndex& parent)
 {
     if (!parent.isValid()) {
         // A server has been added or removed
@@ -210,7 +210,7 @@
     #endif
 }
 
-void IndicatorDisplay::slotDrawAttentionChanged()
+void MessageIndicator::slotDrawAttentionChanged()
 {
     updateIconFromIndicators();
 
@@ -219,12 +219,12 @@
     #endif
 }
 
-void IndicatorDisplay::updateIcon(bool newStuff)
+void MessageIndicator::updateIcon(bool newStuff)
 {
     mIconWidget->setIcon(newStuff ? NEW_STUFF_ICON : NO_NEW_STUFF_ICON);
 }
 
-void IndicatorDisplay::updateIconFromIndicators()
+void MessageIndicator::updateIconFromIndicators()
 {
     // Check if one of the indicators want to draw attention
     QModelIndexList lst = mSourceModel->match(mSourceModel->index(0, 0),
@@ -236,7 +236,7 @@
     updateIcon(!lst.isEmpty());
 }
 
-void IndicatorDisplay::updateIconState()
+void MessageIndicator::updateIconState()
 {
     if (mSourceModel->rowCount() == 0) {
         hidePopup();
@@ -246,13 +246,13 @@
     }
 }
 
-void IndicatorDisplay::slotServerAdded(QIndicate::Listener::Server* server)
+void MessageIndicator::slotServerAdded(QIndicate::Listener::Server* server)
 {
     mListener->setInterest(server, QIndicate::InterestServerDisplay, true);
     mListener->setInterest(server, QIndicate::InterestServerSignal, true);
 }
 
-void IndicatorDisplay::removeInterestOnServers()
+void MessageIndicator::removeInterestOnServers()
 {
     for (int row = mSourceModel->rowCount() - 1; row >= 0; --row) {
         QIndicate::Listener::Server* server = 0;
@@ -273,7 +273,7 @@
 
 using namespace ModelDump;
 
-void IndicatorDisplay::dumpModels()
+void MessageIndicator::dumpModels()
 {
     RoleDumperHash hash;
     hash.insert(Qt::DisplayRole, new SimpleRoleDumper("display"));
@@ -290,9 +290,9 @@
     dump(hash, mSourceModel);
 }
 #else
-void IndicatorDisplay::dumpModels()
+void MessageIndicator::dumpModels()
 {
 }
 #endif
 
-#include "indicatordisplay.moc"
+#include "message-indicator.moc"

=== renamed file 'src/indicatordisplay.h' => 'src/message-indicator.h'
--- src/indicatordisplay.h	2009-09-15 15:33:21 +0000
+++ src/message-indicator.h	2010-01-15 10:26:42 +0000
@@ -8,8 +8,8 @@
  *
  * License: GPL v3
  */
-#ifndef INDICATORDISPLAY_H
-#define INDICATORDISPLAY_H
+#ifndef MESSAGEINDICATOR_H
+#define MESSAGEINDICATOR_H
 
 // Qt
 #include <QTreeView>
@@ -23,12 +23,12 @@
 // Local
 #include <listenermodel.h>
 
-class IndicatorDisplay : public Plasma::PopupApplet
+class MessageIndicator : public Plasma::PopupApplet
 {
 Q_OBJECT
 public:
-    IndicatorDisplay(QObject* parent, const QVariantList& args);
-    ~IndicatorDisplay();
+    MessageIndicator(QObject* parent, const QVariantList& args);
+    ~MessageIndicator();
 
     virtual void init();
 
@@ -64,4 +64,4 @@
     void removeInterestOnServers();
 };
 
-#endif /* INDICATORDISPLAY_H */
+#endif /* MESSAGEINDICATOR_H */

=== renamed file 'src/plasma-applet-indicatordisplay.desktop' => 'src/plasma-applet-message-indicator.desktop'
--- src/plasma-applet-indicatordisplay.desktop	2009-11-13 17:17:28 +0000
+++ src/plasma-applet-message-indicator.desktop	2010-01-15 10:26:42 +0000
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Name=Indicator Display
+Name=Message Indicator
 Comment=Show new messages from various applications
 Icon=mail-message-new
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet
 
-X-KDE-Library=plasma_applet_indicatordisplay
+X-KDE-Library=plasma_applet_message_indicator
 X-KDE-PluginInfo-Author=Aurélien Gâteau
 X-KDE-PluginInfo-Email=aurelien.gateau@xxxxxxxxxxxxx
-X-KDE-PluginInfo-Name=indicatordisplay
+X-KDE-PluginInfo-Name=message-indicator
 X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=http://launchpad.net/plasma-indicatordisplay/
+X-KDE-PluginInfo-Website=http://launchpad.net/plasma-message-indicator/
 X-KDE-PluginInfo-Category=Windows and Tasks
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
  Thread Previous • Date Previous • • Thread Next