Attachment #1255 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All




#include <tqpixmap.h>
#include <tqimage.h>
#include <tqmap.h>
#include <tqtooltip.h>

#include <dcopclient.h>
#include <kapplication.h>

    connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
            TQT_SLOT(slotClearOnClose()));
    connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));
    connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int)));
}

PanelServiceMenu::~PanelServiceMenu()

    RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
}

void PanelServiceMenu::slotSetTooltip(int id)
{
    TQToolTip::remove(this);
    if (KickerSettings::useTooltip() && entryMap_.contains(id) && entryMap_[id]->isType(KST_KService)) {
        KService::Ptr s(static_cast<KService *>(entryMap_[id].data()));
        TQString text;
        if (!s->genericName().isEmpty()) {
            text = s->genericName();
        }
        if (text.isEmpty() && !s->comment().isEmpty()) {
          text = s->comment();
        }
        TQToolTip::add(this, i18n(text.utf8()));
    }
}


Lines 81-86 Link Here

(-)./kicker/kicker/ui/service_mnu.h.ORI (+1 lines)
81	virtual void slotClear();	81	virtual void slotClear();
82	virtual void configChanged();	82	virtual void configChanged();
83	virtual void slotClose();	83	virtual void slotClose();
		84	void slotSetTooltip(int id);
84	void slotDragObjectDestroyed();	85	void slotDragObjectDestroyed();
85		86
86	// for use in Add Applicaton To Panel	87	// for use in Add Applicaton To Panel




                                    &lt;p&gt;&lt;b&gt;Tip&lt;/b&gt;: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $KDEHOME/share/apps/kicker/pics.&lt;/qt&gt;</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>kcfg_UseTooltip</cstring>
                            </property>
                            <property name="text">
                                <string>Show T&amp;ooltip</string>
                            </property>
                            <property name="checked">
                                <bool>false</bool>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>&lt;qt&gt;When this option is selected a tooltip will appear on the KMenu items.</string>
                            </property>
                        </widget>
                        <spacer>
                            <property name="name">
                                <cstring>spacer8</cstring>





void MenuTab::menuStyleChanged()
{
    // Classic K Menu	
    if (m_comboMenuStyle->currentItem()==1) {
       m_openOnHover->setEnabled(false);
       m_subMenus->setEnabled(true);
       kcfg_UseSidePixmap->setEnabled(true);
       kcfg_UseTooltip->setEnabled(true);
       kcfg_MenuEntryFormat->setEnabled(true);
       kcfg_RecentVsOften->setEnabled(true);
       m_showFrequent->setEnabled(true);

       maxrecentdocs->setEnabled(true);
       kcfg_NumVisibleEntries->setEnabled(true);
    }
    
    // Kickoff Menu
    else {
       m_openOnHover->setEnabled(true);
       m_subMenus->setEnabled(false);
       kcfg_UseSidePixmap->setEnabled(false);
       kcfg_UseTooltip->setEnabled(false);
       kcfg_MenuEntryFormat->setEnabled(false);
       kcfg_RecentVsOften->setEnabled(false);
       m_showFrequent->setEnabled(false);

    if (sidepixmapsetting != oldsidepixmapsetting)
        DCOPRef ("kicker", "default").call("restart()");

    bool tooltipsetting = kcfg_UseTooltip->isChecked();
    bool oldtooltipsetting = c->readBoolEntry("UseTooltip", false);

    if (tooltipsetting != oldtooltipsetting) {
        DCOPRef ("kicker", "default").call("restart()");
    }

    // Save KMenu settings
    c->setGroup("KMenu");
    c->writeEntry("CustomIcon", m_kmenu_icon);

Lines 359-364 Link Here

(-)trinity-tdebase-3.5.13.2~pre100+073a32f9/kicker/libkicker/kickerSettings.kcfg.ORI (+5 lines)
359	<default>true</default>	359	<default>true</default>
360	</entry>	360	</entry>
361		361
		362	<entry name="UseTooltip" type="Bool" >
		363	<label>Use Tooltip in Kmenu</label>
		364	<default>false</default>
		365	</entry>
		366
362	<entry name="UseSearchBar" type="Bool" >	367	<entry name="UseSearchBar" type="Bool" >
363	<label>Show searh field in Kmenu</label>	368	<label>Show searh field in Kmenu</label>
364	<default>true</default>	369	<default>true</default>

Return to bug 1499

Lines 27-32 Link Here

(-)./kicker/kicker/ui/service_mnu.cpp.ORI (+18 lines)
27	#include <tqpixmap.h>	27	#include <tqpixmap.h>
28	#include <tqimage.h>	28	#include <tqimage.h>
29	#include <tqmap.h>	29	#include <tqmap.h>
		30	#include <tqtooltip.h>
30		31
31	#include <dcopclient.h>	32	#include <dcopclient.h>
32	#include <kapplication.h>	33	#include <kapplication.h>
Lines 70-75 Link Here
70	connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),	71	connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
71	TQT_SLOT(slotClearOnClose()));	72	TQT_SLOT(slotClearOnClose()));
72	connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));	73	connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));
		74	connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int)));
73	}	75	}
74		76
75	PanelServiceMenu::~PanelServiceMenu()	77	PanelServiceMenu::~PanelServiceMenu()
Lines 1006-1008 Link Here
1006	RecentlyLaunchedApps::the().m_bNeedToUpdate = true;	1008	RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
1007	}	1009	}
1008		1010
		1011	void PanelServiceMenu::slotSetTooltip(int id)
		1012	{
		1013	TQToolTip::remove(this);
		1014	if (KickerSettings::useTooltip() && entryMap_.contains(id) && entryMap_[id]->isType(KST_KService)) {
		1015	KService::Ptr s(static_cast<KService *>(entryMap_[id].data()));
		1016	TQString text;
		1017	if (!s->genericName().isEmpty()) {
		1018	text = s->genericName();
		1019	}
		1020	if (text.isEmpty() && !s->comment().isEmpty()) {
		1021	text = s->comment();
		1022	}
		1023	TQToolTip::add(this, i18n(text.utf8()));
		1024	}
		1025	}
		1026

Lines 187-192 Link Here

(-)trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/kicker/menutab.ui.ORI (+14 lines)
187	<p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $KDEHOME/share/apps/kicker/pics.</qt></string>	187	<p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $KDEHOME/share/apps/kicker/pics.</qt></string>
188	</property>	188	</property>
189	</widget>	189	</widget>
		190	<widget class="TQCheckBox">
		191	<property name="name">
		192	<cstring>kcfg_UseTooltip</cstring>
		193	</property>
		194	<property name="text">
		195	<string>Show T&ooltip</string>
		196	</property>
		197	<property name="checked">
		198	<bool>false</bool>
		199	</property>
		200	<property name="whatsThis" stdset="0">
		201	<string><qt>When this option is selected a tooltip will appear on the KMenu items.</string>
		202	</property>
		203	</widget>
190	<spacer>	204	<spacer>
191	<property name="name">	205	<property name="name">
192	<cstring>spacer8</cstring>	206	<cstring>spacer8</cstring>

Lines 170-179 Link Here

(-)trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/kicker/menutab_impl.cpp.ORI (+12 lines)
170		170
171	void MenuTab::menuStyleChanged()	171	void MenuTab::menuStyleChanged()
172	{	172	{
		173	// Classic K Menu
173	if (m_comboMenuStyle->currentItem()==1) {	174	if (m_comboMenuStyle->currentItem()==1) {
174	m_openOnHover->setEnabled(false);	175	m_openOnHover->setEnabled(false);
175	m_subMenus->setEnabled(true);	176	m_subMenus->setEnabled(true);
176	kcfg_UseSidePixmap->setEnabled(true);	177	kcfg_UseSidePixmap->setEnabled(true);
		178	kcfg_UseTooltip->setEnabled(true);
177	kcfg_MenuEntryFormat->setEnabled(true);	179	kcfg_MenuEntryFormat->setEnabled(true);
178	kcfg_RecentVsOften->setEnabled(true);	180	kcfg_RecentVsOften->setEnabled(true);
179	m_showFrequent->setEnabled(true);	181	m_showFrequent->setEnabled(true);
Lines 182-191 Link Here
182	maxrecentdocs->setEnabled(true);	184	maxrecentdocs->setEnabled(true);
183	kcfg_NumVisibleEntries->setEnabled(true);	185	kcfg_NumVisibleEntries->setEnabled(true);
184	}	186	}
		187
		188	// Kickoff Menu
185	else {	189	else {
186	m_openOnHover->setEnabled(true);	190	m_openOnHover->setEnabled(true);
187	m_subMenus->setEnabled(false);	191	m_subMenus->setEnabled(false);
188	kcfg_UseSidePixmap->setEnabled(false);	192	kcfg_UseSidePixmap->setEnabled(false);
		193	kcfg_UseTooltip->setEnabled(false);
189	kcfg_MenuEntryFormat->setEnabled(false);	194	kcfg_MenuEntryFormat->setEnabled(false);
190	kcfg_RecentVsOften->setEnabled(false);	195	kcfg_RecentVsOften->setEnabled(false);
191	m_showFrequent->setEnabled(false);	196	m_showFrequent->setEnabled(false);
Lines 240-245 Link Here
240	if (sidepixmapsetting != oldsidepixmapsetting)	245	if (sidepixmapsetting != oldsidepixmapsetting)
241	DCOPRef ("kicker", "default").call("restart()");	246	DCOPRef ("kicker", "default").call("restart()");
242		247
		248	bool tooltipsetting = kcfg_UseTooltip->isChecked();
		249	bool oldtooltipsetting = c->readBoolEntry("UseTooltip", false);
		250
		251	if (tooltipsetting != oldtooltipsetting) {
		252	DCOPRef ("kicker", "default").call("restart()");
		253	}
		254
243	// Save KMenu settings	255	// Save KMenu settings
244	c->setGroup("KMenu");	256	c->setGroup("KMenu");
245	c->writeEntry("CustomIcon", m_kmenu_icon);	257	c->writeEntry("CustomIcon", m_kmenu_icon);