[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2008-11-02 5:59:38
Message-ID: 1225605578.128032.29135.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 878925 by aseigo:
ToolTipContent
M +7 -7 devicenotifier/devicenotifier.cpp
M +1 -4 icon/icon.cpp
M +4 -4 kickoff/applet/applet.cpp
M +1 -3 system-monitor/hwinfo.cpp
M +1 -2 tasks/abstracttaskitem.cpp
M +6 -7 tasks/taskgroupitem.cpp
M +5 -6 tasks/windowtaskitem.cpp
M +7 -7 trash/trash.cpp
--- trunk/KDE/kdebase/workspace/plasma/applets/devicenotifier/devicenotifier.cpp \
#878924:878925 @@ -212,17 +212,17 @@
void DeviceNotifier::toolTipAboutToShow()
{
- Plasma::ToolTipManager::Content toolTip;
+ Plasma::ToolTipContent toolTip;
if (!m_lastPlugged.isEmpty()) {
Solid::Device *device = new Solid::Device(m_lastPlugged.last());
- toolTip.subText = i18n("Last plugged in device: %1", device->product());
- toolTip.image = \
KIcon(device->icon()).pixmap(IconSize(KIconLoader::Desktop)); + \
toolTip.setSubText(i18n("Last plugged in device: %1", device->product())); + \
toolTip.setImage(KIcon(device->icon()));
- delete device;
+ delete device;
} else {
- toolTip.subText = i18n("No devices plugged in");
- toolTip.image = \
KIcon("device-notifier").pixmap(IconSize(KIconLoader::Desktop)); + \
toolTip.setSubText(i18n("No devices plugged in")); + \
toolTip.setImage(KIcon("device-notifier")); }
Plasma::ToolTipManager::self()->setContent(this, toolTip);
@@ -230,7 +230,7 @@
void DeviceNotifier::toolTipHidden()
{
- Plasma::ToolTipManager::self()->setContent(this, \
Plasma::ToolTipManager::Content()); + \
Plasma::ToolTipManager::self()->clearContent(this); }
void DeviceNotifier::removeLastDeviceNotification(const QString &name)
--- trunk/KDE/kdebase/workspace/plasma/applets/icon/icon.cpp #878924:878925
@@ -159,10 +159,7 @@
//in the panel the icon behaves like a button
connect(m_icon, SIGNAL(clicked()), this, SLOT(openUrl()));
m_icon->setText(QString());
- Plasma::ToolTipManager::Content data;
- data.mainText = m_text;
- data.subText = m_genericName;
- data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop));
+ Plasma::ToolTipContent data(m_text, m_genericName, m_icon->icon());
Plasma::ToolTipManager::self()->setContent(m_icon, data);
m_icon->setDrawBackground(false);
}
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/applet/applet.cpp \
#878924:878925 @@ -78,10 +78,10 @@
void LauncherApplet::Private::initToolTip()
{
- Plasma::ToolTipManager::Content data;
- data.mainText = i18n("Kickoff Application Launcher");
- data.subText = i18n("Favorites, applications, computer places, recently used \
items and desktop sessions");
- data.image = q->popupIcon().pixmap(IconSize(KIconLoader::Desktop));
+ Plasma::ToolTipContent data(i18n("Kickoff Application Launcher"),
+ i18n("Favorites, applications, computer places, "
+ "recently used items and desktop sessions"),
+ \
q->popupIcon().pixmap(IconSize(KIconLoader::Desktop))); \
Plasma::ToolTipManager::self()->setContent(q, data); }
--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hwinfo.cpp \
#878924:878925 @@ -137,9 +137,7 @@
m_info->setHtml(html);
} else if (m_icon) {
html = START_BASIC START_TABLE + html;
- Plasma::ToolTipManager::Content data;
- data.mainText = i18n("Hardware Info");
- data.subText = html;
+ Plasma::ToolTipContent data(i18n("Hardware Info"), html);
Plasma::ToolTipManager::self()->setContent(m_icon, data);
}
}
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp \
#878924:878925 @@ -185,8 +185,7 @@
void AbstractTaskItem::toolTipHidden()
{
m_showingTooltip = false;
- Plasma::ToolTipManager::Content data;
- Plasma::ToolTipManager::self()->setContent(this, data);
+ Plasma::ToolTipManager::self()->clearContent(this);
}
void AbstractTaskItem::queueUpdate()
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #878924:878925
@@ -63,11 +63,11 @@
m_lastActivated(-1),
m_activeTaskIndex(0),
m_maximumRows(1),
+ m_forceRows(false),
m_isCollapsed(true),
- m_parentSplitGroup(0),
- m_childSplitGroup(0),
m_splitPosition(0),
- m_forceRows(false)
+ m_parentSplitGroup(0),
+ m_childSplitGroup(0)
{
setAcceptDrops(true);
}
@@ -242,10 +242,9 @@
return;
}
- Plasma::ToolTipManager::Content data;
- data.mainText = m_group->name();
- data.subText = i18nc("Which virtual desktop a window is currently on", "On %1",
- KWindowSystem::desktopName(m_group->desktop()));
+ Plasma::ToolTipContent data(m_group->name(),
+ i18nc("Which virtual desktop a window is currently \
on", "On %1", + \
KWindowSystem::desktopName(m_group->desktop()))); // data.image = \
m_group->icon().pixmap(QSize::small); // data.windowToPreview = m_task->window();
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/windowtaskitem.cpp \
#878924:878925 @@ -191,12 +191,11 @@
return;
}
- Plasma::ToolTipManager::Content data;
- data.mainText = m_task->name();
- data.subText = i18nc("Which virtual desktop a window is currently on", "On %1",
- KWindowSystem::desktopName(m_task->desktop()));
- data.image = m_task->task()->icon(KIconLoader::SizeSmall, \
KIconLoader::SizeSmall, false);
- data.windowToPreview = m_task->task()->window();
+ Plasma::ToolTipContent data(m_task->name(),
+ i18nc("Which virtual desktop a window is currently \
on", "On %1", + \
KWindowSystem::desktopName(m_task->desktop())), + \
m_task->task()->icon(KIconLoader::SizeSmall, KIconLoader::SizeSmall, false)); + \
data.setWindowToPreview(m_task->task()->window());
Plasma::ToolTipManager::self()->setContent(this, data);
}
--- trunk/KDE/kdebase/workspace/plasma/applets/trash/trash.cpp #878924:878925
@@ -209,20 +209,20 @@
void Trash::updateIcon()
{
- Plasma::ToolTipManager::Content data;
- data.mainText = i18n("Trash");
+ Plasma::ToolTipContent data;
+ data.setMainText(i18n("Trash"));
if (m_count > 0) {
m_icon->setIcon(KIcon("user-trash-full"));
- data.subText = i18np("One item", "%1 items", m_count);
+ data.setSubText(i18np("One item", "%1 items", m_count));
if (m_showText) {
m_icon->setInfoText(i18np("One item", "%1 items", m_count));
}
} else {
m_icon->setIcon(KIcon("user-trash"));
- data.subText = i18nc("The trash is empty. This is not an action, but a \
state", "Empty"); + data.setSubText(i18nc("The trash is empty. This is not an \
action, but a state", "Empty")); if (m_showText) {
m_icon->setInfoText(i18nc("The trash is empty. This is not an action, \
but a state", "Empty")); }
@@ -230,15 +230,15 @@
m_icon->update();
- data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop));
+ data.setImage(m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)));
if (!m_showText) {
Plasma::ToolTipManager::self()->setContent(this, data);
} else {
- Plasma::ToolTipManager::self()->setContent(this, \
Plasma::ToolTipManager::Content()); + \
Plasma::ToolTipManager::self()->clearContent(this); }
- emptyTrash->setEnabled(m_count>0);
+ emptyTrash->setEnabled(m_count > 0);
}
void Trash::slotClear()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic