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.

[patch] Cleaned up version of patch

bug_455_new.diff (text/plain), 20.70 KB, created by Timothy Pearson on 2012-01-11 19:01:21 CST

(hide)

Description: Cleaned up version of patch

Filename:

MIME Type:

Creator: Timothy Pearson

Created: 2012-01-11 19:01:21 CST

Size: 20.70 KB

patch

obsolete

>--- kicker/libkicker/Makefile.am (revision 1185150) >+++ kicker/libkicker/Makefile.am (working copy) >@@ -6,12 +6,12 @@ > menuinfo.cpp panelbutton.cpp panner.cpp \ > kickerSettings.kcfgc kshadowsettings.cpp \ > kshadowengine.cpp paneldrag.cpp \ >- simplebutton.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) >+libkickermain_la_LIBADD = $(LIB_KIO) ../kicker/core/libkicker_core.la ../kicker/ui/libkicker_ui.la > > kde_kcfg_DATA = kickerSettings.kcfg > >--- kicker/applets/media/mediumbutton.h (revision 1185150) >+++ kicker/applets/media/mediumbutton.h (working copy) >@@ -29,12 +29,14 @@ > #include <kfileitem.h> > #include <kpanelapplet.h> > #include <kactioncollection.h> >+#include <konq_popupmenu.h> > > class MediumButton : public PanelPopupButton > { > Q_OBJECT > > public: >+ enum { ICON_MARGIN = 1 }; > MediumButton(TQWidget *parent, const KFileItem &fileItem); > ~MediumButton(); > const KFileItem &fileItem() const; >@@ -48,6 +50,9 @@ > void dragEnterEvent( TQDragEnterEvent* ); > void dragLeaveEvent( TQDragLeaveEvent* ); > void dropEvent(TQDropEvent *e); >+ virtual int preferredIconSize(int proposed_size = -1) const; >+ void mousePressEvent(TQMouseEvent *e); >+ void mouseReleaseEvent(TQMouseEvent *e); > > protected slots: > // Activate this code only if we find a way to have both an >@@ -61,6 +66,7 @@ > KActionCollection mActions; > KFileItem mFileItem; > TQTimer mOpenTimer; >+ KonqPopupMenu *mPopup; > }; > > #endif >--- kicker/applets/media/preferencesdialog.cpp (revision 1185150) >+++ kicker/applets/media/preferencesdialog.cpp (working copy) >@@ -26,7 +26,13 @@ > #include <klistview.h> > #include <kfiledetailview.h> > >-class MediumTypeItem : public QCheckListItem >+#include <qcombobox.h> >+#include <qlabel.h> >+#include <qlayout.h> >+ >+#include "mediaprefsdlg.h" >+ >+class MediumTypeItem : public TQCheckListItem > { > public: > MediumTypeItem(TQListView *parent, const TQString name, >@@ -54,8 +60,8 @@ > KFileItem mMedium; > }; > >+#include "preferences_page.h" > >- > PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, > const char *name) > : KDialogBase(Tabbed, i18n("Media Applet Preferences"), Ok|Cancel|Default, >@@ -78,6 +84,9 @@ > mpMediaListView->addColumn( i18n("Media to Display") ); > TQWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet")); > >+ TQVBox *preferences_page = addVBoxPage( i18n("Preferences") ); >+ mpMediaPrefsDlg = new MediaPrefsDlg(preferences_page); >+ > slotDefault(); > } > >@@ -163,5 +172,29 @@ > } > } > >+int PreferencesDialog::iconDim() >+{ >+ if (mpMediaPrefsDlg->iconDim->currentText() == i18n("Automatic")) >+ { >+ return SIZE_AUTO; >+ } >+ else >+ { >+ return mpMediaPrefsDlg->iconDim->currentText().toInt(); >+ } >+} > >+void PreferencesDialog::setIconDim(int iconDim) >+{ >+ if (iconDim == SIZE_AUTO) >+ { >+ mpMediaPrefsDlg->iconDim->setEditText(i18n("Automatic")); >+ } >+ else >+ { >+ mpMediaPrefsDlg->iconDim->setEditText(TQString::number(iconDim)); >+ } >+} >+ >+ > #include "preferencesdialog.moc" >--- kicker/applets/media/mediaapplet.cpp (revision 1185150) >+++ kicker/applets/media/mediaapplet.cpp (working copy) >@@ -30,6 +30,7 @@ > #include "mediaapplet.h" > > #include "preferencesdialog.h" >+#include "prefs.h" > > extern "C" > { >@@ -48,15 +49,18 @@ > { > 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&) ), >@@ -69,21 +73,31 @@ > 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"); > } > >@@ -115,11 +129,13 @@ > > dialog.setExcludedMediumTypes(mExcludedTypesList); > dialog.setExcludedMedia(mExcludedList); >+ dialog.setIconDim(mIconDim); > > if(dialog.exec()) > { > mExcludedTypesList = dialog.excludedMediumTypes(); > mExcludedList = dialog.excludedMedia(); >+ mIconDim = dialog.iconDim(); > saveConfig(); > reloadList(); > } >@@ -142,103 +158,72 @@ > > void MediaApplet::arrangeButtons() > { >- int button_size = 1; >- int x_offset = 0; >- int y_offset = 0; >- >- // Determine upper bound for the button size >- MediumButtonList::iterator it; >- MediumButtonList::iterator end = mButtonList.end(); >- for ( it = mButtonList.begin(); it != end; ++it ) >+ unsigned border(2 + dimension()/12), space(1); >+ int idim, d(dimension() - border * 2); >+ // determine button size >+ if (mIconDim == PreferencesDialog::SIZE_AUTO) > { >- MediumButton *button = *it; >- >- button_size = std::max(button_size, >- orientation() == Vertical ? >- button->heightForWidth(width()) : >- button->widthForHeight(height()) ); >- // button->widthForHeight(height()) : >- // button->heightForWidth(width()) ); >- } >- >- int kicker_size; >- if (orientation() == 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) >- { >- max_packed_buttons = QMAX(uint(1), mButtonList.count()); >- } >- max_packed_buttons = QMAX(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) >+ if (d < 18) > { >- mButtonSizeSum += button_size; >+ idim = std::min(16, d); > } >- >- ++pack_count; >- >- if(orientation() == Vertical) >- { >- if (pack_count < max_packed_buttons) >+ else if (d < 64) > { >- x_offset += padded_button_size; >+ idim = 16; > } >- else >+ else if (d < 80) > { >- x_offset = 0; >- y_offset += button_size; >- pack_count = 0; >+ idim = 20; > } >- >- button->resize(padded_button_size, button_size); >+ else if (d < 122) >+ { >+ idim = 24; > } > else > { >- if (pack_count < max_packed_buttons) >- { >- y_offset += padded_button_size; >- } >- else >- { >- y_offset = 0; >- x_offset += button_size; >- pack_count = 0; >+ idim = 28; > } >- >- button->resize(button_size, padded_button_size); >- } >- >+ } >+ 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; >@@ -275,21 +260,21 @@ > 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; >+ 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); >+ MediumButton *button = new MediumButton(this, *it.current()); >+ button->show(); >+ mButtonList.append(button); > } > } > >@@ -308,9 +293,9 @@ > > if(button->fileItem().url()==fileItem->url()) > { >- mButtonList.remove(button); >- delete button; >- break; >+ mButtonList.remove(button); >+ delete button; >+ break; > } > } > slotCompleted(); >@@ -332,29 +317,29 @@ > 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)) >+ MediumButton *button = *it2; >+ >+ if(button->fileItem().url()==(*it.current()).url()) > { >- mButtonList.remove(button); >- delete button; >+ if(mExcludedTypesList.contains(mimetype)) >+ { >+ mButtonList.remove(button); >+ delete button; >+ } >+ else >+ { >+ button->setFileItem(*it.current()); >+ } >+ found = true; >+ break; > } >- else >- { >- button->setFileItem(*it.current()); >- } >- 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); >+ MediumButton *button = new MediumButton(this, *it.current()); >+ button->show(); >+ mButtonList.append(button); > } > } > >@@ -394,6 +379,7 @@ > { > mExcludedList.clear(); > } >+ mIconDim = c->readNumEntry("IconDim"); > } > > void MediaApplet::saveConfig() >@@ -403,6 +389,7 @@ > > c->writeEntry("ExcludedTypes", mExcludedTypesList, ';'); > c->writeEntry("ExcludedMedia", mExcludedList, ';'); >+ c->writeEntry("IconDim", mIconDim); > > c->sync(); > } >@@ -425,19 +412,9 @@ > > void MediaApplet::mousePressEvent(TQMouseEvent *e) > { >- if(e->button()==RightButton) >+ if (e->button() == RightButton) > { >- KPopupMenu menu(this); >- >- menu.insertTitle(i18n("Media")); >- menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1); >- >- int choice = menu.exec(this->mapToGlobal(e->pos())); >- >- if(choice==1) >- { >- preferences(); >- } >+ mpAppletPopup->popup(e->globalPos()); > } > } > >--- kicker/applets/media/preferencesdialog.h (revision 1185150) >+++ kicker/applets/media/preferencesdialog.h (working copy) >@@ -28,10 +28,13 @@ > *@author ervin > */ > >+class MediaPrefsDlg; >+ > class PreferencesDialog : public KDialogBase > { > Q_OBJECT > public: >+ enum {SIZE_AUTO=0}; > PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0); > ~PreferencesDialog(); > >@@ -40,6 +43,9 @@ > > TQStringList excludedMedia(); > void setExcludedMedia(TQStringList excludedList); >+ >+ int iconDim(); >+ void setIconDim(int iconDim); > > protected slots: > void slotDefault(); >@@ -48,6 +54,7 @@ > KListView *mpMediumTypesListView; > KListView *mpMediaListView; > KFileItemList mMedia; >+ MediaPrefsDlg *mpMediaPrefsDlg; > }; > > #endif >--- kicker/applets/media/Makefile.am (revision 1185150) >+++ kicker/applets/media/Makefile.am (working copy) >@@ -1,11 +1,11 @@ > INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes) > > kde_module_LTLIBRARIES = media_panelapplet.la >-media_panelapplet_la_SOURCES = preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp >+media_panelapplet_la_SOURCES = preferences_page.ui preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp mediaprefsdlg.cpp prefs.kcfgc > > METASOURCES = AUTO > >-noinst_HEADERS = mediaapplet.h mediumbutton.h preferencesdialog.h >+noinst_HEADERS = mediaapplet.h mediumbutton.h preferencesdialog.h mediaprefsdlg.h > > lnkdir = $(kde_datadir)/kicker/applets > lnk_DATA = mediaapplet.desktop >--- kicker/applets/media/mediaapplet.h (revision 1185150) >+++ kicker/applets/media/mediaapplet.h (working copy) >@@ -30,11 +30,13 @@ > #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 > { >@@ -48,7 +50,6 @@ > int widthForHeight(int height) const; > int heightForWidth(int width) const; > void about(); >- void preferences(); > > protected: > void arrangeButtons(); >@@ -66,14 +67,23 @@ > void slotNewItems(const KFileItemList &entries); > void slotDeleteItem(KFileItem *fileItem); > void slotRefreshItems(const KFileItemList &entries); >+ void preferences(); > > private: >+ int dimension() const; >+ >+private: > KDirLister *mpDirLister; > MediumButtonList mButtonList; > TQStringList mExcludedTypesList; > TQStringList mExcludedList; > KFileItemList mMedia; >- int mButtonSizeSum; >+ int mButtonSizeSum; >+ >+ int mIconDim; >+ FlowGridManager *m_manager; >+ KAction *mpConfigAction; >+ TQPopupMenu *mpAppletPopup; > }; > > #endif >--- kicker/applets/media/mediumbutton.cpp (revision 1185150) >+++ kicker/applets/media/mediumbutton.cpp (working copy) >@@ -46,7 +46,7 @@ > > MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) > : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, >- "MediumButton::mOpenTimer") >+ "MediumButton::mOpenTimer"), mPopup(NULL) > { > KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), > &mActions, "pasteto"); >@@ -71,6 +71,7 @@ > //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); > > setPopup(new TQPopupMenu()); >+ setDrawArrow(false); > } > > MediumButton::~MediumButton() >@@ -107,15 +108,16 @@ > KParts::BrowserExtension::PopupFlags bef = > KParts::BrowserExtension::DefaultPopupItems; > >- KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, >+ mPopup = new KonqPopupMenu(0L, items, > KURL("media:/"), mActions, 0L, > this, kpf, bef); >- KPopupTitle *title = new KPopupTitle(new_popup); >+ KPopupTitle *title = new KPopupTitle(mPopup); > title->setTitle(mFileItem.text()); > >- new_popup->insertItem(title, -1, 0); >+ mPopup->insertItem(title, -1, 0); > >- setPopup(new_popup); >+ setPopup(mPopup); >+ setDrawArrow(false); > > if (old_popup!=0L) delete old_popup; > } >@@ -123,7 +125,7 @@ > void MediumButton::refreshType() > { > KMimeType::Ptr mime = mFileItem.determineMimeType(); >- TQToolTip::add(this, mime->comment()); >+ TQToolTip::add(this, mFileItem.text() + " (" + mime->comment() + ")"); > setIcon(mFileItem.iconName()); > } > >@@ -171,6 +173,15 @@ > 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(); >@@ -200,4 +211,41 @@ > } > } > >+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" >--- kicker/applets/launcher/quicklauncher.cpp (revision 1185150) >+++ kicker/applets/launcher/quicklauncher.cpp (working copy) >@@ -155,6 +155,7 @@ > m_buttons->deleteContents(); > delete m_buttons; > } >+ delete m_configAction; > } > > // Builds, connects _popup menu >--- kicker/applets/launcher/quicklauncher.h (revision 1185150) >+++ kicker/applets/launcher/quicklauncher.h (working copy) >@@ -31,7 +31,7 @@ > #include <kpanelapplet.h> > #include <map> > >-#include "flowgridmanager.h" >+#include <flowgridmanager.h> > #include "prefs.h" > #include "quickbutton.h" > >--- kicker/applets/launcher/Makefile.am (revision 1185150) >+++ kicker/applets/launcher/Makefile.am (working copy) >@@ -3,10 +3,10 @@ > > kde_module_LTLIBRARIES = launcher_panelapplet.la > >-launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp >+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 flowgridmanager.h popularity.h configdlg.h >+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 >@@ -14,12 +14,15 @@ > EXTRA_DIST = $(lnk_DATA) > > launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined >-launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \ >- ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \ >+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 > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]