Attachment #266 for bug #455

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 455
Collapse All | Expand All





kde_module_LTLIBRARIES = launcher_panelapplet.la

launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp

METASOURCES = AUTO
noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h popularity.h configdlg.h

lnkdir = $(kde_datadir)/kicker/applets
lnk_DATA = quicklauncher.desktop

EXTRA_DIST = $(lnk_DATA)

launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
launcher_panelapplet_la_LIBADD = ../../kicker/buttons/libkicker_buttons.la \
				../../libkicker/libkickermain.la $(LIB_KIO) \
				$(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)

kde_kcfg_DATA = launcherapplet.kcfg

$(kde_module_LTLIBRARIES): LIBTOOL := $(LIBTOOL) --preserve-dup-deps
$(kde_module_LTLIBRARIES).closure: LIBTOOL := $(LIBTOOL) --preserve-dup-deps

messages: rc.cpp
	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot


Lines 155-160 QuickLauncher::~QuickLauncher() Link Here

(-)a/kicker/applets/launcher/quicklauncher.cpp (+1 lines)
155	m_buttons->deleteContents();	155	m_buttons->deleteContents();
156	delete m_buttons;	156	delete m_buttons;
157	}	157	}
		158	delete m_configAction;
158	}	159	}
159		160
160	// Builds, connects _popup menu	161	// Builds, connects _popup menu

Lines 31-37 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Link Here

(-)a/kicker/applets/launcher/quicklauncher.h (-1 / +1 lines)
31	#include <kpanelapplet.h>	31	#include <kpanelapplet.h>
32	#include <map>	32	#include <map>
33		33
34	#include "flowgridmanager.h"	34	#include <flowgridmanager.h>
35	#include "prefs.h"	35	#include "prefs.h"
36	#include "quickbutton.h"	36	#include "quickbutton.h"
37		37

Lines 1-11 Link Here

(-)a/kicker/applets/media/Makefile.am (-2 / +2 lines)
1	INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes)	1	INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes)
2		2
3	kde_module_LTLIBRARIES = media_panelapplet.la	3	kde_module_LTLIBRARIES = media_panelapplet.la
4	media_panelapplet_la_SOURCES = preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp	4	media_panelapplet_la_SOURCES = preferences_page.ui preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp mediaprefsdlg.cpp prefs.kcfgc
5		5
6	METASOURCES = AUTO	6	METASOURCES = AUTO
7		7
8	noinst_HEADERS = mediaapplet.h mediumbutton.h preferencesdialog.h	8	noinst_HEADERS = mediaapplet.h mediumbutton.h preferencesdialog.h mediaprefsdlg.h
9		9
10	lnkdir = $(kde_datadir)/kicker/applets	10	lnkdir = $(kde_datadir)/kicker/applets
11	lnk_DATA = mediaapplet.desktop	11	lnk_DATA = mediaapplet.desktop




#include "mediaapplet.h"

#include "preferencesdialog.h"
#include "prefs.h"

extern "C"
{

{
    if (!parent)
        setBackgroundMode(X11ParentRelative);

    setBackgroundOrigin(AncestorOrigin);

    setAcceptDrops(true);

    loadConfig();

    m_manager = new FlowGridManager;
    m_manager->setConserveSpace(true);

    mpDirLister = new KDirLister();

    connect( mpDirLister, TQT_SIGNAL( clear() ),
            this, TQT_SLOT( slotClear() ) );
    connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),

            this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
    connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
            this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );

    reloadList();

    mpConfigAction = new KAction(i18n("Configure Storage Media..."), "configure", KShortcut(),
        this, SLOT(preferences()), this);

    mpAppletPopup = new TQPopupMenu(this);
    mpConfigAction->plug(mpAppletPopup);
}

MediaApplet::~MediaApplet()
{
    delete mpDirLister;
    delete m_manager;
    delete mpAppletPopup;

    while (!mButtonList.isEmpty())
    {
        MediumButton *b = mButtonList.first();
        mButtonList.remove(b);
        delete b;
    }

    delete mpConfigAction;

    KGlobal::locale()->removeCatalogue("mediaapplet");
}


    
    dialog.setExcludedMediumTypes(mExcludedTypesList);
    dialog.setExcludedMedia(mExcludedList);
    dialog.setIconDim(mIconDim); 
    
    if(dialog.exec())
    {
        mExcludedTypesList = dialog.excludedMediumTypes();
        mExcludedList = dialog.excludedMedia();
        mIconDim = dialog.iconDim();
        saveConfig();
        reloadList();
    }


void MediaApplet::arrangeButtons()
{
    unsigned border(2 + dimension()/12), space(1);
    int idim, d(dimension() - border * 2);
    // determine button size
    if (mIconDim == PreferencesDialog::SIZE_AUTO)
    // Determine upper bound for the button size
    MediumButtonList::iterator it;
    MediumButtonList::iterator end = mButtonList.end();
    for ( it = mButtonList.begin(); it != end; ++it )
    {
        MediumButton *button = *it;
        
        button_size = std::max(button_size,
                            orientation() == Qt::Vertical ?
                    button->heightForWidth(width()) :
                button->widthForHeight(height()) );
    //		                           button->widthForHeight(height()) :
    //		                           button->heightForWidth(width()) );
    }
    
    int kicker_size;
    if (orientation() == Qt::Vertical)
    {
        kicker_size = width();
    }
    else
    {
        kicker_size = height();
    }
    
    unsigned int max_packed_buttons = kicker_size / button_size;
    // Center icons if we only have one column/row
    if (mButtonList.count() < max_packed_buttons)
    {
        if (d < 18)
    }
            max_packed_buttons = TQMAX(uint(1), max_packed_buttons);
    
    int padded_button_size = kicker_size / max_packed_buttons;
    mButtonSizeSum = 0;
    unsigned int pack_count = 0;
    
    // Arrange the buttons. If kicker is more than twice as high/wide
    // as the maximum preferred size of an icon, we put several icons
    // in one column/row
    for ( it = mButtonList.begin(); it != end; ++it )
    {
        MediumButton *button = *it;
    
        button->move(x_offset, y_offset);
        button->setPanelPosition(position());
    
        if(pack_count == 0)
        {
        idim = std::min(16, d);
        }
        else if (d < 64)
        ++pack_count;
    
        if(orientation() == Qt::Vertical)
                    {
        if (pack_count < max_packed_buttons)
        {
            idim = 16;
        }
        else if (d < 80)
        {
            idim = 20;
            y_offset += button_size;
            pack_count = 0;
        }
        
        button->resize(padded_button_size, button_size);
        }
        else if (d < 122)
        {
        if (pack_count < max_packed_buttons)
        {
            idim = 24;
        }
        else
        {
            idim = 28;
            x_offset += button_size;
            pack_count = 0;
        }
    }
    else
    {
        idim=std::min(mIconDim, d);
    }
    m_manager->setOrientation(orientation());
    m_manager->setNumItems(mButtonList.size());
    m_manager->setFrameSize(size());
    m_manager->setItemSize(TQSize(idim, idim));
    m_manager->setSpaceSize(TQSize(space, space));
    m_manager->setBorderSize(orientation() == Horizontal ?
        TQSize(space, border) : TQSize(border, space));

    for (unsigned index = 0; index < mButtonList.size(); index++)
    {
        TQPoint pos = m_manager->pos(index);
        MediumButton *button = mButtonList[index];
        button->move(pos.x(), pos.y());
        button->setPanelPosition(position());
        button->resize(m_manager->itemSize());
        button->unsetPalette();
        button->setBackgroundOrigin(AncestorOrigin);
    }

    mButtonSizeSum = orientation() == Horizontal ?
        m_manager->frameSize().width() :
        m_manager->frameSize().height();

    updateGeometry();
    emit updateLayout();
}

int MediaApplet::dimension() const
{
    if (orientation()==Qt::Vertical)
    {
        return size().width();
    }
    return size().height();
}

void MediaApplet::slotClear()
{
    kdDebug()<<"MediaApplet::slotClear"<<endl;

        MediumButtonList::iterator end = mButtonList.end();
        for ( it2 = mButtonList.begin(); it2 != end; ++it2 )
        {
            MediumButton *button = *it2;
            
            if(button->fileItem().url()==it.current()->url())
            {
                found = true;
                button->setFileItem(*it.current());
                break;
            }
        }
        
        if(!found && !mExcludedList.contains(it.current()->url().url()) )
        {
            MediumButton *button = new MediumButton(this, *it.current());
            button->show();
            mButtonList.append(button);
        }
    }
    

        
        if(button->fileItem().url()==fileItem->url())
        {
            mButtonList.remove(button);
            delete button;
            break;
        }
    }
    slotCompleted();

        MediumButtonList::iterator end = mButtonList.end();
        for ( it2 = mButtonList.begin(); it2 != end; ++it2 )
        {
            MediumButton *button = *it2;
            
            if(button->fileItem().url()==(*it.current()).url())
        {
            if(mExcludedTypesList.contains(mimetype))
            {
                if(mExcludedTypesList.contains(mimetype))
                {
                    mButtonList.remove(button);
                    delete button;
                }
                else
                {
                    button->setFileItem(*it.current());
                }
                found = true;
                break;
            }
            found = true;
            break;
        }
        }
    
        if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
        {
            MediumButton *button = new MediumButton(this, *it.current());
            button->show();
            mButtonList.append(button);
        }
    }
    

    {
        mExcludedList.clear();
    }
    mIconDim = c->readNumEntry("IconDim");
}

void MediaApplet::saveConfig()

    
    c->writeEntry("ExcludedTypes", mExcludedTypesList, ';');
    c->writeEntry("ExcludedMedia", mExcludedList, ';');
    c->writeEntry("IconDim", mIconDim);
    
    c->sync();
}


void MediaApplet::mousePressEvent(TQMouseEvent *e)
{
    if( e->button() == Qt::RightButton )
    {
        mpAppletPopup->popup(e->globalPos());
    
        menu.insertTitle(i18n("Media"));
        menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1);
    
        int choice = menu.exec(this->mapToGlobal(e->pos()));
    
        if(choice==1)
        {
            preferences();
        }
    }
}





#include <kurl.h>
#include <kfileitem.h>
#include <kdirlister.h>
#include <flowgridmanager.h>

#include <tqptrlist.h>
#include "mediumbutton.h"
typedef TQValueList<MediumButton*> MediumButtonList;

class Prefs;

class MediaApplet : public KPanelApplet
{

	int widthForHeight(int height) const;
	int heightForWidth(int width) const;
	void about();
	void preferences();

protected:
	void arrangeButtons();

	void slotNewItems(const KFileItemList &entries);
	void slotDeleteItem(KFileItem *fileItem);
	void slotRefreshItems(const KFileItemList &entries);
	void preferences();

private:
	int dimension() const;

private:
	KDirLister *mpDirLister;

	TQStringList mExcludedTypesList;
	TQStringList mExcludedList;
	KFileItemList mMedia;
	int mButtonSizeSum;

	int mIconDim;
	FlowGridManager *m_manager;
	KAction *mpConfigAction;
	TQPopupMenu *mpAppletPopup;
};

#endif





MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
                "MediumButton::mOpenTimer"), mPopup(NULL)
{
    KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
                                    &mActions, "pasteto");

    //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
    
    setPopup(new TQPopupMenu());
    setDrawArrow(false);
}

MediumButton::~MediumButton()

	KParts::BrowserExtension::PopupFlags bef =
		  KParts::BrowserExtension::DefaultPopupItems;

	mPopup = new KonqPopupMenu(0L, items,
	                                   KURL("media:/"), mActions, 0L,
	                                   this, kpf, bef);
	KPopupTitle *title = new KPopupTitle(mPopup);
	title->setTitle(mFileItem.text());

	mPopup->insertItem(title, -1, 0);

	setPopup(mPopup);
	setDrawArrow(false);

	if (old_popup!=0L) delete old_popup;
}

void MediumButton::refreshType()
{
    KMimeType::Ptr mime = mFileItem.determineMimeType();
    TQToolTip::add(this, mFileItem.text() + " (" + mime->comment() + ")");
    setIcon(mFileItem.iconName());
}


    KonqOperations::doDrop(&mFileItem, mFileItem.url(), e, this);
}

int MediumButton::preferredIconSize(int proposed_size) const
{
    if (proposed_size < 0)
    {
        return std::min(width(), height()) - 2 * ICON_MARGIN;
    }
    return proposed_size;
}

void MediumButton::slotDragOpen()
{
    mFileItem.run();

    }
}

void MediumButton::mousePressEvent(TQMouseEvent *e)
{
    if (e->button() == RightButton)
    {
        showMenu();
        return;
    }
    else if (e->button() == LeftButton)
    {
        setDown(true);
        repaint();
        return;
    }
    PanelButton::mousePressEvent(e);
}

void MediumButton::mouseReleaseEvent(TQMouseEvent *e)
{
    if (e->button() == LeftButton)
    {
        setDown(false);
        repaint();

        if (rect().contains(mapFromGlobal(e->globalPos())))
        {
            if (!mPopup)
                initPopup();

            KAction *a = mPopup->actionCollection()->action("newview");
            if (a) a->activate();
        }

        return;
    }
    PanelButton::mouseReleaseEvent(e);
}

#include "mediumbutton.moc"

Lines 29-40 Link Here

(-)a/kicker/applets/media/mediumbutton.h (+6 lines)
29	#include <kfileitem.h>	29	#include <kfileitem.h>
30	#include <kpanelapplet.h>	30	#include <kpanelapplet.h>
31	#include <kactioncollection.h>	31	#include <kactioncollection.h>
		32	#include <konq_popupmenu.h>
32		33
33	class MediumButton : public PanelPopupButton	34	class MediumButton : public PanelPopupButton
34	{	35	{
35	Q_OBJECT	36	Q_OBJECT
36		37
37	public:	38	public:
		39	enum { ICON_MARGIN = 1 };
38	MediumButton(TQWidget *parent, const KFileItem &fileItem);	40	MediumButton(TQWidget *parent, const KFileItem &fileItem);
39	~MediumButton();	41	~MediumButton();
40	const KFileItem &fileItem() const;	42	const KFileItem &fileItem() const;
Lines 48-53 protected: Link Here
48	void dragEnterEvent( TQDragEnterEvent* );	50	void dragEnterEvent( TQDragEnterEvent* );
49	void dragLeaveEvent( TQDragLeaveEvent* );	51	void dragLeaveEvent( TQDragLeaveEvent* );
50	void dropEvent(TQDropEvent *e);	52	void dropEvent(TQDropEvent *e);
		53	virtual int preferredIconSize(int proposed_size = -1) const;
		54	void mousePressEvent(TQMouseEvent *e);
		55	void mouseReleaseEvent(TQMouseEvent *e);
51		56
52	protected slots:	57	protected slots:
53	// Activate this code only if we find a way to have both an	58	// Activate this code only if we find a way to have both an
Lines 61-66 private: Link Here
61	KActionCollection mActions;	66	KActionCollection mActions;
62	KFileItem mFileItem;	67	KFileItem mFileItem;
63	TQTimer mOpenTimer;	68	TQTimer mOpenTimer;
		69	KonqPopupMenu *mPopup;
64	};	70	};
65		71
66	#endif	72	#endif

Lines 26-31 Link Here

(-)a/kicker/applets/media/preferencesdialog.cpp (-1 / +34 lines)
26	#include <klistview.h>	26	#include <klistview.h>
27	#include <kfiledetailview.h>	27	#include <kfiledetailview.h>
28		28
		29	#include <tqcombobox.h>
		30	#include <tqlabel.h>
		31	#include <tqlayout.h>
		32
		33	#include "mediaprefsdlg.h"
		34
29	class MediumTypeItem : public TQCheckListItem	35	class MediumTypeItem : public TQCheckListItem
30	{	36	{
31	public:	37	public:
Lines 54-60 private: Link Here
54	KFileItem mMedium;	60	KFileItem mMedium;
55	};	61	};
56		62
57		63	#include "preferences_page.h"
58		64
59	PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent,	65	PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent,
60	const char *name)	66	const char *name)
Lines 78-83 PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, Link Here
78	mpMediaListView->addColumn( i18n("Media to Display") );	84	mpMediaListView->addColumn( i18n("Media to Display") );
79	TQWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet"));	85	TQWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet"));
80		86
		87	TQVBox *preferences_page = addVBoxPage( i18n("Preferences") );
		88	mpMediaPrefsDlg = new MediaPrefsDlg(preferences_page);
		89
81	slotDefault();	90	slotDefault();
82	}	91	}
83		92
Lines 163-167 void PreferencesDialog::setExcludedMedia(TQStringList excludedList) Link Here
163	}	172	}
164	}	173	}
165		174
		175	int PreferencesDialog::iconDim()
		176	{
		177	if (mpMediaPrefsDlg->iconDim->currentText() == i18n("Automatic"))
		178	{
		179	return SIZE_AUTO;
		180	}
		181	else
		182	{
		183	return mpMediaPrefsDlg->iconDim->currentText().toInt();
		184	}
		185	}
		186
		187	void PreferencesDialog::setIconDim(int iconDim)
		188	{
		189	if (iconDim == SIZE_AUTO)
		190	{
		191	mpMediaPrefsDlg->iconDim->setEditText(i18n("Automatic"));
		192	}
		193	else
		194	{
		195	mpMediaPrefsDlg->iconDim->setEditText(TQString::number(iconDim));
		196	}
		197	}
		198
166		199
167	#include "preferencesdialog.moc"	200	#include "preferencesdialog.moc"

Lines 28-37 Link Here

(-)a/kicker/applets/media/preferencesdialog.h (+7 lines)
28	*@author ervin	28	*@author ervin
29	*/	29	*/
30		30
		31	class MediaPrefsDlg;
		32
31	class PreferencesDialog : public KDialogBase	33	class PreferencesDialog : public KDialogBase
32	{	34	{
33	Q_OBJECT	35	Q_OBJECT
34	public:	36	public:
		37	enum {SIZE_AUTO=0};
35	PreferencesDialog(KFileItemList media, TQWidget parent=0, const char name=0);	38	PreferencesDialog(KFileItemList media, TQWidget parent=0, const char name=0);
36	~PreferencesDialog();	39	~PreferencesDialog();
37		40
Lines 40-45 public: Link Here
40		43
41	TQStringList excludedMedia();	44	TQStringList excludedMedia();
42	void setExcludedMedia(TQStringList excludedList);	45	void setExcludedMedia(TQStringList excludedList);
		46
		47	int iconDim();
		48	void setIconDim(int iconDim);
43		49
44	protected slots:	50	protected slots:
45	void slotDefault();	51	void slotDefault();
Lines 48-53 private: Link Here
48	KListView *mpMediumTypesListView;	54	KListView *mpMediumTypesListView;
49	KListView *mpMediaListView;	55	KListView *mpMediaListView;
50	KFileItemList mMedia;	56	KFileItemList mMedia;
		57	MediaPrefsDlg *mpMediaPrefsDlg;
51	};	58	};
52		59
53	#endif	60	#endif




                           menuinfo.cpp panelbutton.cpp panner.cpp \
                           kickerSettings.kcfgc kshadowsettings.cpp \
                           kshadowengine.cpp paneldrag.cpp \
                           simplebutton.cpp flowgridmanager.cpp

libkickermain_la_METASOURCES = AUTO

libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libkickermain_la_LIBADD = $(LIB_KIO) ../kicker/core/libkicker_core.la ../kicker/ui/libkicker_ui.la

kde_kcfg_DATA = kickerSettings.kcfg


Return to bug 455

Lines 3-12 INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a Link Here

(-)a/kicker/applets/launcher/Makefile.am (-4 / +7 lines)
3		3
4	kde_module_LTLIBRARIES = launcher_panelapplet.la	4	kde_module_LTLIBRARIES = launcher_panelapplet.la
5		5
6	launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp	6	launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
7		7
8	METASOURCES = AUTO	8	METASOURCES = AUTO
9	noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h	9	noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h popularity.h configdlg.h
10		10
11	lnkdir = $(kde_datadir)/kicker/applets	11	lnkdir = $(kde_datadir)/kicker/applets
12	lnk_DATA = quicklauncher.desktop	12	lnk_DATA = quicklauncher.desktop
Lines 14-25 lnk_DATA = quicklauncher.desktop Link Here
14	EXTRA_DIST = $(lnk_DATA)	14	EXTRA_DIST = $(lnk_DATA)
15		15
16	launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined	16	launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
17	launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \	17	launcher_panelapplet_la_LIBADD = ../../kicker/buttons/libkicker_buttons.la \
18	../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \	18	../../libkicker/libkickermain.la $(LIB_KIO) \
19	$(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)	19	$(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)
20		20
21	kde_kcfg_DATA = launcherapplet.kcfg	21	kde_kcfg_DATA = launcherapplet.kcfg
22		22
		23	$(kde_module_LTLIBRARIES): LIBTOOL := $(LIBTOOL) --preserve-dup-deps
		24	$(kde_module_LTLIBRARIES).closure: LIBTOOL := $(LIBTOOL) --preserve-dup-deps
		25
23	messages: rc.cpp	26	messages: rc.cpp
24	$(XGETTEXT) .cpp .h -o $(podir)/quicklauncher.pot	27	$(XGETTEXT) .cpp .h -o $(podir)/quicklauncher.pot
25		28

Lines 30-35 Link Here

(-)a/kicker/applets/media/mediaapplet.cpp (-130 / +107 lines)
30	#include "mediaapplet.h"	30	#include "mediaapplet.h"
31		31
32	#include "preferencesdialog.h"	32	#include "preferencesdialog.h"
		33	#include "prefs.h"
33		34
34	extern "C"	35	extern "C"
35	{	36	{
Lines 48-62 MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW Link Here
48	{	49	{
49	if (!parent)	50	if (!parent)
50	setBackgroundMode(X11ParentRelative);	51	setBackgroundMode(X11ParentRelative);
51		52
52	setBackgroundOrigin(AncestorOrigin);	53	setBackgroundOrigin(AncestorOrigin);
53		54
54	setAcceptDrops(true);	55	setAcceptDrops(true);
55		56
56	loadConfig();	57	loadConfig();
57		58
		59	m_manager = new FlowGridManager;
		60	m_manager->setConserveSpace(true);
		61
58	mpDirLister = new KDirLister();	62	mpDirLister = new KDirLister();
59		63
60	connect( mpDirLister, TQT_SIGNAL( clear() ),	64	connect( mpDirLister, TQT_SIGNAL( clear() ),
61	this, TQT_SLOT( slotClear() ) );	65	this, TQT_SLOT( slotClear() ) );
62	connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),	66	connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),
Lines 69-89 MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW Link Here
69	this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );	73	this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
70	connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),	74	connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
71	this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );	75	this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
72		76
73	reloadList();	77	reloadList();
		78
		79	mpConfigAction = new KAction(i18n("Configure Storage Media..."), "configure", KShortcut(),
		80	this, SLOT(preferences()), this);
		81
		82	mpAppletPopup = new TQPopupMenu(this);
		83	mpConfigAction->plug(mpAppletPopup);
74	}	84	}
75		85
76	MediaApplet::~MediaApplet()	86	MediaApplet::~MediaApplet()
77	{	87	{
78	delete mpDirLister;	88	delete mpDirLister;
79		89	delete m_manager;
		90	delete mpAppletPopup;
		91
80	while (!mButtonList.isEmpty())	92	while (!mButtonList.isEmpty())
81	{	93	{
82	MediumButton *b = mButtonList.first();	94	MediumButton *b = mButtonList.first();
83	mButtonList.remove(b);	95	mButtonList.remove(b);
84	delete b;	96	delete b;
85	}	97	}
86		98
		99	delete mpConfigAction;
		100
87	KGlobal::locale()->removeCatalogue("mediaapplet");	101	KGlobal::locale()->removeCatalogue("mediaapplet");
88	}	102	}
89		103
Lines 115-125 void MediaApplet::preferences() Link Here
115		129
116	dialog.setExcludedMediumTypes(mExcludedTypesList);	130	dialog.setExcludedMediumTypes(mExcludedTypesList);
117	dialog.setExcludedMedia(mExcludedList);	131	dialog.setExcludedMedia(mExcludedList);
		132	dialog.setIconDim(mIconDim);
118		133
119	if(dialog.exec())	134	if(dialog.exec())
120	{	135	{
121	mExcludedTypesList = dialog.excludedMediumTypes();	136	mExcludedTypesList = dialog.excludedMediumTypes();
122	mExcludedList = dialog.excludedMedia();	137	mExcludedList = dialog.excludedMedia();
		138	mIconDim = dialog.iconDim();
123	saveConfig();	139	saveConfig();
124	reloadList();	140	reloadList();
125	}	141	}
Lines 142-244 void MediaApplet::resizeEvent( TQResizeEvent *) Link Here
142		158
143	void MediaApplet::arrangeButtons()	159	void MediaApplet::arrangeButtons()
144	{	160	{
145	int button_size = 1;	161	unsigned border(2 + dimension()/12), space(1);
146	int x_offset = 0;	162	int idim, d(dimension() - border * 2);
147	int y_offset = 0;	163	// determine button size
148		164	if (mIconDim == PreferencesDialog::SIZE_AUTO)
149	// Determine upper bound for the button size
150	MediumButtonList::iterator it;
151	MediumButtonList::iterator end = mButtonList.end();
152	for ( it = mButtonList.begin(); it != end; ++it )
153	{
154	MediumButton button = it;
155
156	button_size = std::max(button_size,
157	orientation() == Qt::Vertical ?
158	button->heightForWidth(width()) :
159	button->widthForHeight(height()) );
160	// button->widthForHeight(height()) :
161	// button->heightForWidth(width()) );
162	}
163
164	int kicker_size;
165	if (orientation() == Qt::Vertical)
166	{
167	kicker_size = width();
168	}
169	else
170	{
171	kicker_size = height();
172	}
173
174	unsigned int max_packed_buttons = kicker_size / button_size;
175	// Center icons if we only have one column/row
176	if (mButtonList.count() < max_packed_buttons)
177	{	165	{
178	max_packed_buttons = TQMAX(uint(1), mButtonList.count());	166	if (d < 18)
179	}
180	max_packed_buttons = TQMAX(uint(1), max_packed_buttons);
181
182	int padded_button_size = kicker_size / max_packed_buttons;
183	mButtonSizeSum = 0;
184	unsigned int pack_count = 0;
185
186	// Arrange the buttons. If kicker is more than twice as high/wide
187	// as the maximum preferred size of an icon, we put several icons
188	// in one column/row
189	for ( it = mButtonList.begin(); it != end; ++it )
190	{
191	MediumButton button = it;
192
193	button->move(x_offset, y_offset);
194	button->setPanelPosition(position());
195
196	if(pack_count == 0)
197	{	167	{
198	mButtonSizeSum += button_size;	168	idim = std::min(16, d);
199	}	169	}
200		170	else if (d < 64)
201	++pack_count;
202
203	if(orientation() == Qt::Vertical)
204	{
205	if (pack_count < max_packed_buttons)
206	{	171	{
207	x_offset += padded_button_size;	172	idim = 16;
208	}	173	}
209	else	174	else if (d < 80)
210	{	175	{
211	x_offset = 0;	176	idim = 20;
212	y_offset += button_size;
213	pack_count = 0;
214	}
215
216	button->resize(padded_button_size, button_size);
217	}	177	}
218	else	178	else if (d < 122)
219	{
220	if (pack_count < max_packed_buttons)
221	{	179	{
222	y_offset += padded_button_size;	180	idim = 24;
223	}	181	}
224	else	182	else
225	{	183	{
226	y_offset = 0;	184	idim = 28;
227	x_offset += button_size;
228	pack_count = 0;
229	}	185	}
230		186	}
231	button->resize(button_size, padded_button_size);	187	else
232	}	188	{
233		189	idim=std::min(mIconDim, d);
		190	}
		191	m_manager->setOrientation(orientation());
		192	m_manager->setNumItems(mButtonList.size());
		193	m_manager->setFrameSize(size());
		194	m_manager->setItemSize(TQSize(idim, idim));
		195	m_manager->setSpaceSize(TQSize(space, space));
		196	m_manager->setBorderSize(orientation() == Horizontal ?
		197	TQSize(space, border) : TQSize(border, space));
		198
		199	for (unsigned index = 0; index < mButtonList.size(); index++)
		200	{
		201	TQPoint pos = m_manager->pos(index);
		202	MediumButton *button = mButtonList[index];
		203	button->move(pos.x(), pos.y());
		204	button->setPanelPosition(position());
		205	button->resize(m_manager->itemSize());
234	button->unsetPalette();	206	button->unsetPalette();
235	button->setBackgroundOrigin(AncestorOrigin);	207	button->setBackgroundOrigin(AncestorOrigin);
236	}	208	}
237		209
		210	mButtonSizeSum = orientation() == Horizontal ?
		211	m_manager->frameSize().width() :
		212	m_manager->frameSize().height();
		213
238	updateGeometry();	214	updateGeometry();
239	emit updateLayout();	215	emit updateLayout();
240	}	216	}
241		217
		218	int MediaApplet::dimension() const
		219	{
		220	if (orientation()==Qt::Vertical)
		221	{
		222	return size().width();
		223	}
		224	return size().height();
		225	}
		226
242	void MediaApplet::slotClear()	227	void MediaApplet::slotClear()
243	{	228	{
244	kdDebug()<<"MediaApplet::slotClear"<<endl;	229	kdDebug()<<"MediaApplet::slotClear"<<endl;
Lines 275-295 void MediaApplet::slotNewItems(const KFileItemList &entries) Link Here
275	MediumButtonList::iterator end = mButtonList.end();	260	MediumButtonList::iterator end = mButtonList.end();
276	for ( it2 = mButtonList.begin(); it2 != end; ++it2 )	261	for ( it2 = mButtonList.begin(); it2 != end; ++it2 )
277	{	262	{
278	MediumButton button = it2;	263	MediumButton button = it2;
279		264
280	if(button->fileItem().url()==it.current()->url())	265	if(button->fileItem().url()==it.current()->url())
281	{	266	{
282	found = true;	267	found = true;
283	button->setFileItem(*it.current());	268	button->setFileItem(*it.current());
284	break;	269	break;
285	}	270	}
286	}	271	}
287		272
288	if(!found && !mExcludedList.contains(it.current()->url().url()) )	273	if(!found && !mExcludedList.contains(it.current()->url().url()) )
289	{	274	{
290	MediumButton button = new MediumButton(this, it.current());	275	MediumButton button = new MediumButton(this, it.current());
291	button->show();	276	button->show();
292	mButtonList.append(button);	277	mButtonList.append(button);
293	}	278	}
294	}	279	}
295		280
Lines 308-316 void MediaApplet::slotDeleteItem(KFileItem *fileItem) Link Here
308		293
309	if(button->fileItem().url()==fileItem->url())	294	if(button->fileItem().url()==fileItem->url())
310	{	295	{
311	mButtonList.remove(button);	296	mButtonList.remove(button);
312	delete button;	297	delete button;
313	break;	298	break;
314	}	299	}
315	}	300	}
316	slotCompleted();	301	slotCompleted();
Lines 332-360 void MediaApplet::slotRefreshItems(const KFileItemList &entries) Link Here
332	MediumButtonList::iterator end = mButtonList.end();	317	MediumButtonList::iterator end = mButtonList.end();
333	for ( it2 = mButtonList.begin(); it2 != end; ++it2 )	318	for ( it2 = mButtonList.begin(); it2 != end; ++it2 )
334	{	319	{
335	MediumButton button = it2;	320	MediumButton button = it2;
336		321
337	if(button->fileItem().url()==(*it.current()).url())	322	if(button->fileItem().url()==(*it.current()).url())
338	{
339	if(mExcludedTypesList.contains(mimetype))
340	{	323	{
341	mButtonList.remove(button);	324	if(mExcludedTypesList.contains(mimetype))
342	delete button;	325	{
343	}	326	mButtonList.remove(button);
344	else	327	delete button;
345	{	328	}
346	button->setFileItem(*it.current());	329	else
		330	{
		331	button->setFileItem(*it.current());
		332	}
		333	found = true;
		334	break;
347	}	335	}
348	found = true;
349	break;
350	}
351	}	336	}
352		337
353	if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )	338	if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
354	{	339	{
355	MediumButton button = new MediumButton(this, it.current());	340	MediumButton button = new MediumButton(this, it.current());
356	button->show();	341	button->show();
357	mButtonList.append(button);	342	mButtonList.append(button);
358	}	343	}
359	}	344	}
360		345
Lines 394-399 void MediaApplet::loadConfig() Link Here
394	{	379	{
395	mExcludedList.clear();	380	mExcludedList.clear();
396	}	381	}
		382	mIconDim = c->readNumEntry("IconDim");
397	}	383	}
398		384
399	void MediaApplet::saveConfig()	385	void MediaApplet::saveConfig()
Lines 403-408 void MediaApplet::saveConfig() Link Here
403		389
404	c->writeEntry("ExcludedTypes", mExcludedTypesList, ';');	390	c->writeEntry("ExcludedTypes", mExcludedTypesList, ';');
405	c->writeEntry("ExcludedMedia", mExcludedList, ';');	391	c->writeEntry("ExcludedMedia", mExcludedList, ';');
		392	c->writeEntry("IconDim", mIconDim);
406		393
407	c->sync();	394	c->sync();
408	}	395	}
Lines 425-443 void MediaApplet::reloadList() Link Here
425		412
426	void MediaApplet::mousePressEvent(TQMouseEvent *e)	413	void MediaApplet::mousePressEvent(TQMouseEvent *e)
427	{	414	{
428	if(e->button()==Qt::RightButton)	415	if( e->button() == Qt::RightButton )
429	{	416	{
430	KPopupMenu menu(this);	417	mpAppletPopup->popup(e->globalPos());
431
432	menu.insertTitle(i18n("Media"));
433	menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1);
434
435	int choice = menu.exec(this->mapToGlobal(e->pos()));
436
437	if(choice==1)
438	{
439	preferences();
440	}
441	}	418	}
442	}	419	}
443		420

Lines 30-40 Link Here

(-)a/kicker/applets/media/mediaapplet.h (-2 / +12 lines)
30	#include <kurl.h>	30	#include <kurl.h>
31	#include <kfileitem.h>	31	#include <kfileitem.h>
32	#include <kdirlister.h>	32	#include <kdirlister.h>
		33	#include <flowgridmanager.h>
33		34
34	#include <tqptrlist.h>	35	#include <tqptrlist.h>
35	#include "mediumbutton.h"	36	#include "mediumbutton.h"
36	typedef TQValueList<MediumButton*> MediumButtonList;	37	typedef TQValueList<MediumButton*> MediumButtonList;
37		38
		39	class Prefs;
38		40
39	class MediaApplet : public KPanelApplet	41	class MediaApplet : public KPanelApplet
40	{	42	{
Lines 48-54 public: Link Here
48	int widthForHeight(int height) const;	50	int widthForHeight(int height) const;
49	int heightForWidth(int width) const;	51	int heightForWidth(int width) const;
50	void about();	52	void about();
51	void preferences();
52		53
53	protected:	54	protected:
54	void arrangeButtons();	55	void arrangeButtons();
Lines 66-71 protected slots: Link Here
66	void slotNewItems(const KFileItemList &entries);	67	void slotNewItems(const KFileItemList &entries);
67	void slotDeleteItem(KFileItem *fileItem);	68	void slotDeleteItem(KFileItem *fileItem);
68	void slotRefreshItems(const KFileItemList &entries);	69	void slotRefreshItems(const KFileItemList &entries);
		70	void preferences();
		71
		72	private:
		73	int dimension() const;
69		74
70	private:	75	private:
71	KDirLister *mpDirLister;	76	KDirLister *mpDirLister;
Lines 73-79 private: Link Here
73	TQStringList mExcludedTypesList;	78	TQStringList mExcludedTypesList;
74	TQStringList mExcludedList;	79	TQStringList mExcludedList;
75	KFileItemList mMedia;	80	KFileItemList mMedia;
76	int mButtonSizeSum;	81	int mButtonSizeSum;
		82
		83	int mIconDim;
		84	FlowGridManager *m_manager;
		85	KAction *mpConfigAction;
		86	TQPopupMenu *mpAppletPopup;
77	};	87	};
78		88
79	#endif	89	#endif

Lines 46-52 Link Here

(-)a/kicker/applets/media/mediumbutton.cpp (-6 / +54 lines)
46		46
47	MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)	47	MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
48	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,	48	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
49	"MediumButton::mOpenTimer")	49	"MediumButton::mOpenTimer"), mPopup(NULL)
50	{	50	{
51	KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),	51	KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
52	&mActions, "pasteto");	52	&mActions, "pasteto");
Lines 71-76 MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) Link Here
71	//connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));	71	//connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
72		72
73	setPopup(new TQPopupMenu());	73	setPopup(new TQPopupMenu());
		74	setDrawArrow(false);
74	}	75	}
75		76
76	MediumButton::~MediumButton()	77	MediumButton::~MediumButton()
Lines 107-121 void MediumButton::initPopup() Link Here
107	KParts::BrowserExtension::PopupFlags bef =	108	KParts::BrowserExtension::PopupFlags bef =
108	KParts::BrowserExtension::DefaultPopupItems;	109	KParts::BrowserExtension::DefaultPopupItems;
109		110
110	KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items,	111	mPopup = new KonqPopupMenu(0L, items,
111	KURL("media:/"), mActions, 0L,	112	KURL("media:/"), mActions, 0L,
112	this, kpf, bef);	113	this, kpf, bef);
113	KPopupTitle *title = new KPopupTitle(new_popup);	114	KPopupTitle *title = new KPopupTitle(mPopup);
114	title->setTitle(mFileItem.text());	115	title->setTitle(mFileItem.text());
115		116
116	new_popup->insertItem(title, -1, 0);	117	mPopup->insertItem(title, -1, 0);
117		118
118	setPopup(new_popup);	119	setPopup(mPopup);
		120	setDrawArrow(false);
119		121
120	if (old_popup!=0L) delete old_popup;	122	if (old_popup!=0L) delete old_popup;
121	}	123	}
Lines 123-129 void MediumButton::initPopup() Link Here
123	void MediumButton::refreshType()	125	void MediumButton::refreshType()
124	{	126	{
125	KMimeType::Ptr mime = mFileItem.determineMimeType();	127	KMimeType::Ptr mime = mFileItem.determineMimeType();
126	TQToolTip::add(this, mime->comment());	128	TQToolTip::add(this, mFileItem.text() + " (" + mime->comment() + ")");
127	setIcon(mFileItem.iconName());	129	setIcon(mFileItem.iconName());
128	}	130	}
129		131
Lines 171-176 void MediumButton::dropEvent(TQDropEvent *e) Link Here
171	KonqOperations::doDrop(&mFileItem, mFileItem.url(), e, this);	173	KonqOperations::doDrop(&mFileItem, mFileItem.url(), e, this);
172	}	174	}
173		175
		176	int MediumButton::preferredIconSize(int proposed_size) const
		177	{
		178	if (proposed_size < 0)
		179	{
		180	return std::min(width(), height()) - 2 * ICON_MARGIN;
		181	}
		182	return proposed_size;
		183	}
		184
174	void MediumButton::slotDragOpen()	185	void MediumButton::slotDragOpen()
175	{	186	{
176	mFileItem.run();	187	mFileItem.run();
Lines 200-203 void MediumButton::setPanelPosition(KPanelApplet::Position position) Link Here
200	}	211	}
201	}	212	}
202		213
		214	void MediumButton::mousePressEvent(TQMouseEvent *e)
		215	{
		216	if (e->button() == RightButton)
		217	{
		218	showMenu();
		219	return;
		220	}
		221	else if (e->button() == LeftButton)
		222	{
		223	setDown(true);
		224	repaint();
		225	return;
		226	}
		227	PanelButton::mousePressEvent(e);
		228	}
		229
		230	void MediumButton::mouseReleaseEvent(TQMouseEvent *e)
		231	{
		232	if (e->button() == LeftButton)
		233	{
		234	setDown(false);
		235	repaint();
		236
		237	if (rect().contains(mapFromGlobal(e->globalPos())))
		238	{
		239	if (!mPopup)
		240	initPopup();
		241
		242	KAction *a = mPopup->actionCollection()->action("newview");
		243	if (a) a->activate();
		244	}
		245
		246	return;
		247	}
		248	PanelButton::mouseReleaseEvent(e);
		249	}
		250
203	#include "mediumbutton.moc"	251	#include "mediumbutton.moc"

Lines 6-17 libkickermain_la_SOURCES = appletinfo.cpp global.cpp kickertip.cpp \ Link Here

(-)a/kicker/libkicker/Makefile.am (-2 / +2 lines)
6	menuinfo.cpp panelbutton.cpp panner.cpp \	6	menuinfo.cpp panelbutton.cpp panner.cpp \
7	kickerSettings.kcfgc kshadowsettings.cpp \	7	kickerSettings.kcfgc kshadowsettings.cpp \
8	kshadowengine.cpp paneldrag.cpp \	8	kshadowengine.cpp paneldrag.cpp \
9	simplebutton.cpp	9	simplebutton.cpp flowgridmanager.cpp
10		10
11	libkickermain_la_METASOURCES = AUTO	11	libkickermain_la_METASOURCES = AUTO
12		12
13	libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined	13	libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
14	libkickermain_la_LIBADD = $(LIB_KIO)	14	libkickermain_la_LIBADD = $(LIB_KIO) ../kicker/core/libkicker_core.la ../kicker/ui/libkicker_ui.la
15		15
16	kde_kcfg_DATA = kickerSettings.kcfg	16	kde_kcfg_DATA = kickerSettings.kcfg
17		17