SVN commit 1017823 by adiaferia:
allow showing icon names
M +25 -1 quicklaunchApplet.cpp
M +3 -0 quicklaunchApplet.h
M +16 -2 quicklaunchConfig.ui
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.cpp #1017822:1017823
@@ -63,7 +63,8 @@
m_addAction(0),
m_removeAction(0),
m_sortappAscending(0),
- m_sortappDescending(0)
+ m_sortappDescending(0),
+ m_showIconNames(false)
{
setHasConfigurationInterface(true);
setAcceptDrops(true);
@@ -105,6 +106,9 @@
m_visibleIcons = qMax(-1, cg.readEntry("visibleIcons", m_visibleIcons));
m_dialogIconSize = qMax(s_defaultIconSize, (int)cg.readEntry("dialogIconSize", contentsRect().height() / 2));
+ m_showIconNames = (bool)cg.readEntry("showIconNames", false);
+ setShowIconNames(m_showIconNames);
+
// Initialize outer layout
m_layout = new QGraphicsLinearLayout(this);
m_layout->setContentsMargins(0, 0, 0, 0);
@@ -155,6 +159,13 @@
m_isBusy = false;
}
+void QuicklaunchApplet::setShowIconNames(bool set)
+{
+ foreach (QuicklaunchIcon *icon, m_icons) {
+ icon->setText(set ? icon->appName() : QString());
+ }
+}
+
QSizeF QuicklaunchApplet::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{
if (which == Qt::PreferredSize) {
@@ -325,6 +336,8 @@
uiConfig.iconSizeSlider->setValue(m_preferredIconSize);
uiConfig.dialogIconSizeSpin->setValue(m_dialogIconSize);
uiConfig.dialogIconSizeSlider->setValue(m_dialogIconSize);
+
+ uiConfig.iconNamesCheckBox->setChecked(m_showIconNames);
uiConfig.icons->setValue(m_visibleIcons);
parent->addPage(widget, i18n("General"), icon());
@@ -357,6 +370,14 @@
cg.writeEntry("dialogIconSize", m_dialogIconSize);
changed = true;
}
+
+ bool iconNames = uiConfig.iconNamesCheckBox->isChecked();
+ if (m_showIconNames != iconNames) {
+ m_showIconNames = iconNames;
+ cg.writeEntry("showIconNames", m_showIconNames);
+ setShowIconNames(m_showIconNames);
+ changed = true;
+ }
if (changed) {
emit configNeedsSaving();
@@ -631,6 +652,9 @@
}
QuicklaunchIcon *container = new QuicklaunchIcon(appUrl, text, icon, genericName, this);
+ if (m_showIconNames) {
+ container->setText(container->appName());
+ }
container->installEventFilter(this);
m_icons.insert(index, container);
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.h #1017822:1017823
@@ -167,6 +167,8 @@
void saveConfig() {}
bool dropHandler(const int pos, const QMimeData *mimedata);
+
+ void setShowIconNames(bool set);
QGraphicsLinearLayout *m_layout;
QuicklaunchLayout *m_innerLayout;
@@ -186,6 +188,7 @@
QuicklaunchIcon *m_rightClickedIcon;
QPointF m_mousePressPos;
bool m_isBusy;
+ bool m_showIconNames;
QAction* m_addAction;
QAction* m_removeAction;
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchConfig.ui #1017822:1017823
@@ -6,8 +6,8 @@
0
0
- 372
- 117
+ 405
+ 143
@@ -117,6 +117,20 @@
+ -
+
+
+ Show icon names:
+
+
+
+ -
+
+
+
+
+
+