| -rw-r--r-- | libopie2/opieui/opopupmenu.h | 2 | ||||
| -rw-r--r-- | libopie2/opieui/otimepicker.h | 3 | ||||
| -rw-r--r-- | libopie2/opieui/oversatileview.h | 48 |
3 files changed, 25 insertions, 28 deletions
diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h index 419a954..294edcc 100644 --- a/libopie2/opieui/opopupmenu.h +++ b/libopie2/opieui/opopupmenu.h @@ -189,76 +189,76 @@ public: * Defaults to off. * @since 3.1 */ void setKeyboardShortcutsExecute(bool enable); /** * Obsolete method provided for backwards compatibility only. Use the * normal constructor and insertTitle instead. */ OPopupMenu(const QString &title, QWidget *parent=0, const char *name=0); /** * Obsolete method provided for backwards compatibility only. Use * insertTitle and changeTitle instead. */ void setTitle(const QString &title); /** * Returns the context menu associated with this menu * @since 3.2 */ QPopupMenu* contextMenu(); /** * Hides the context menu if shown * @since 3.2 */ void cancelContextMenuShow(); /** * Returns the OPopupMenu associated with the current context menu * @since 3.2 */ static OPopupMenu* contextMenuFocus(); /** * returns the ID of the menuitem associated with the current context menu * @since 3.2 */ static int contextMenuFocusItem(); signals: /** * connect to this signal to be notified when a context menu is about to be shown * @param menu The menu that the context menu is about to be shown for * @param menuItem The menu item that the context menu is currently on * @param ctxMenu The context menu itself * @since 3.2 */ - void aboutToShowContextMenu(OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu); + void aboutToShowContextMenu(Opie::Ui::OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu); protected: virtual void closeEvent(QCloseEvent *); virtual void keyPressEvent(QKeyEvent* e); virtual bool eventFilter(QObject* obj, QEvent* event); virtual void hideEvent(QHideEvent*); virtual void virtual_hook( int id, void* data ); protected slots: /// @since 3.1 QString underlineText(const QString& text, uint length); /// @since 3.1 void resetKeyboardVars(bool noMatches = false); void itemHighlighted(int whichItem); void showCtxMenu(QPoint pos); void ctxMenuHiding(); private: class OPopupMenuPrivate; OPopupMenuPrivate *d; }; } } #endif diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h index 01bb557..fb20781 100644 --- a/libopie2/opieui/otimepicker.h +++ b/libopie2/opieui/otimepicker.h @@ -80,53 +80,50 @@ private: private slots: void slotHour(bool b); void slotMinute(bool b); signals: /** * gets emitted when the time got changed by the user */ void timeChanged(const QTime &); }; /** * * @short A small dialog to pick a time * @version 1.0 * @author Stefan Eilers * **/ class OTimePickerDialog: public OTimePickerDialogBase { Q_OBJECT public: OTimePickerDialog ( QWidget* parent = 0, const char* name = NULL, WFlags fl = 0 ); ~OTimePickerDialog() { }; QTime time()const; public slots: void setTime( const QTime& time ); void setHour( const QString& hour ); void setMinute( const QString& minute ); private: OTimePicker *m_timePicker; QTime m_time; class Private; Private* d; }; } } /* for Qt2 */ #if ( QT_VERSION-0 >= 0x030000 ) #error "Fix the UI File to use namespaces" -#else -typedef Opie::Ui::OTimePicker OUIOTimePicker; #endif #endif - diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h index 61b61db..8cba65c 100644 --- a/libopie2/opieui/oversatileview.h +++ b/libopie2/opieui/oversatileview.h @@ -102,298 +102,298 @@ class OVersatileView : public QWidgetStack int _viewmode; bool _synchronization; mutable int _warningpolicy; OListView* _listview; QIconView* _iconview; QPixmap _treeleaf; QPixmap _treeopened; QPixmap _treeclosed; QPixmap _iconleaf; QPixmap _iconopened; QPixmap _iconclosed; QPopupMenu* _contextmenu; int _iconstyle; int _treestyle; private slots: void contextMenuRequested( QListViewItem*, const QPoint&, int ); void contextMenuRequested( QIconViewItem*, const QPoint& ); // type converting signal forwarders void selectionChanged( QListViewItem * ); void currentChanged( QListViewItem * ); void clicked( QListViewItem * ); void pressed( QListViewItem * ); void doubleClicked( QListViewItem * ); void returnPressed( QListViewItem * ); void onItem( QListViewItem * ); void selectionChanged( QIconViewItem * ); void currentChanged( QIconViewItem * ); void clicked( QIconViewItem * ); void pressed( QIconViewItem * ); void doubleClicked( QIconViewItem * ); void returnPressed( QIconViewItem * ); void onItem( QIconViewItem * ); void expanded( QListViewItem * item ); // QListView void collapsed( QListViewItem * item ); // QListView signals: - void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col ); + void contextMenuRequested( Opie::Ui::OVersatileViewItem * item, const QPoint& pos, int col ); /*#ifndef QT_NO_DRAGANDDROP void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView #endif void itemRenamed( OVersatileViewItem *item, const QString & ); // QIconView void itemRenamed( OVersatileViewItem *item ); // QIconView */ //==============================================================================================// // "Derived" API - Case 1: Methods existing either only in QListView or only in QIconView //==============================================================================================// public: /* enum Arrangement { // QIconView LeftToRight = 0, TopToBottom }; enum ResizeMode { // QIconView Fixed = 0, Adjust }; enum ItemTextPos { // QIconView Bottom = 0, Right }; */ // // only in QListView // int treeStepSize() const; // QListView virtual void setTreeStepSize( int ); // QListView QHeader * header() const; // QListView virtual int addColumn( const QString &label, int size = -1); // QListView virtual int addColumn( const QIconSet& iconset, const QString &label, int size = -1); // QListView void removeColumn( int index ); // #### make virtual in next major release! // QListView virtual void setColumnText( int column, const QString &label ); // QListView virtual void setColumnText( int column, const QIconSet& iconset, const QString &label ); // QListView QString columnText( int column ) const; // QListView virtual void setColumnWidth( int column, int width ); // QListView int columnWidth( int column ) const; // QListView enum WidthMode { Manual, Maximum }; // QListView virtual void setColumnWidthMode( int column, WidthMode ); // QListView WidthMode columnWidthMode( int column ) const; // QListView int columns() const; // QListView virtual void setColumnAlignment( int, int ); // QListView int columnAlignment( int ) const; // QListView OVersatileViewItem * itemAt( const QPoint & screenPos ) const; // QListView QRect itemRect( const OVersatileViewItem * ) const; // QListView int itemPos( const OVersatileViewItem * ); // QListView bool isSelected( const OVersatileViewItem * ) const; // QListView // also in QIconViewItem but not in QIconView *shrug* virtual void setMultiSelection( bool enable ); // QListView bool isMultiSelection() const; // QListView OVersatileViewItem * selectedItem() const; // QListView virtual void setOpen( OVersatileViewItem *, bool ); // QListView bool isOpen( const OVersatileViewItem * ) const; // QListView OVersatileViewItem * firstChild() const; // QListView int childCount() const; // QListView virtual void setAllColumnsShowFocus( bool ); // QListView bool allColumnsShowFocus() const; // QListView virtual void setItemMargin( int ); // QListView int itemMargin() const; // QListView virtual void setRootIsDecorated( bool ); // QListView bool rootIsDecorated() const; // QListView void setShowSortIndicator( bool show ); // QListView bool showSortIndicator() const; // QListView int index( const OVersatileViewItem *item ) const; // QIconView public slots: void triggerUpdate(); // QListView signals: - void expanded( OVersatileViewItem *item ); // QListView - void collapsed( OVersatileViewItem *item ); // QListView + void expanded( Opie::Ui::OVersatileViewItem *item ); // QListView + void collapsed( Opie::Ui::OVersatileViewItem *item ); // QListView // // only in QIconView // public: uint count() const; // QIconView OVersatileViewItem *firstItem() const; // QIconView OVersatileViewItem *lastItem() const; // QIconView OVersatileViewItem *findItem( const QPoint &pos ) const; // QIconView OVersatileViewItem *findItem( const QString &text ) const; // QIconView OVersatileViewItem* findFirstVisibleItem( const QRect &r ) const; // QIconView OVersatileViewItem* findLastVisibleItem( const QRect &r ) const; // QIconView virtual void setGridX( int rx ); // QIconView virtual void setGridY( int ry ); // QIconView int gridX() const; // QIconView int gridY() const; // QIconView virtual void setSpacing( int sp ); // QIconView int spacing() const; // QIconView virtual void setItemTextPos( QIconView::ItemTextPos pos ); // QIconView QIconView::ItemTextPos itemTextPos() const; // QIconView virtual void setItemTextBackground( const QBrush &b ); // QIconView QBrush itemTextBackground() const; // QIconView virtual void setArrangement( QIconView::Arrangement am ); // QIconView QIconView::Arrangement arrangement() const; // QIconView virtual void setResizeMode( QIconView::ResizeMode am ); // QIconView QIconView::ResizeMode resizeMode() const; // QIconView virtual void setMaxItemWidth( int w ); // QIconView int maxItemWidth() const; // QIconView virtual void setMaxItemTextLength( int w ); // QIconView int maxItemTextLength() const; // QIconView virtual void setAutoArrange( bool b ); // QIconView bool autoArrange() const; // QIconView virtual void setShowToolTips( bool b ); // QIconView bool showToolTips() const; // QIconView bool sorting() const; // QIconView bool sortDirection() const; // QIconView virtual void setItemsMovable( bool b ); // QIconView bool itemsMovable() const; // QIconView virtual void setWordWrapIconText( bool b ); // QIconView bool wordWrapIconText() const; // QIconView public slots: virtual void arrangeItemsInGrid( const QSize &grid, bool update = TRUE ); // QIconView virtual void arrangeItemsInGrid( bool update = TRUE ); // QIconView virtual void updateContents(); // QIconView signals: /*#ifndef QT_NO_DRAGANDDROP void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView #endif */ void moved(); // QIconView - void itemRenamed( OVersatileViewItem *item, const QString & ); // QIconView - void itemRenamed( OVersatileViewItem *item ); // QIconView + void itemRenamed( Opie::Ui::OVersatileViewItem *item, const QString & ); // QIconView + void itemRenamed( Opie::Ui::OVersatileViewItem *item ); // QIconView //==============================================================================================// // "Derived" API - Case 2: Methods existing in QListView and QIconView with the same signatures //==============================================================================================// public: enum SelectionMode { Single = 0, Multi, Extended, NoSelection }; virtual void clear(); virtual void setFont( const QFont & ); virtual void setPalette( const QPalette & ); virtual void takeItem( OVersatileViewItem * ); void setSelectionMode( SelectionMode mode ); SelectionMode selectionMode() const; virtual void selectAll( bool select ); virtual void clearSelection(); virtual void invertSelection(); void ensureItemVisible( const OVersatileViewItem * ); virtual void repaintItem( const OVersatileViewItem * ) const; virtual void setCurrentItem( OVersatileViewItem * ); OVersatileViewItem * currentItem() const; // bool eventFilter( QObject * o, QEvent * ); // use QWidgetStack implementation // QSize minimumSizeHint() const; // use QWidgetStack implementation // QSizePolicy sizePolicy() const; // use QWidgetStack implementation // QSize sizeHint() const; // use QWidgetStack implementation signals: void selectionChanged(); - void selectionChanged( OVersatileViewItem * ); - void currentChanged( OVersatileViewItem * ); - void clicked( OVersatileViewItem * ); - void pressed( OVersatileViewItem * ); + void selectionChanged( Opie::Ui::OVersatileViewItem * ); + void currentChanged( Opie::Ui::OVersatileViewItem * ); + void clicked( Opie::Ui::OVersatileViewItem * ); + void pressed( Opie::Ui::OVersatileViewItem * ); - void doubleClicked( OVersatileViewItem * ); - void returnPressed( OVersatileViewItem * ); + void doubleClicked( Opie::Ui::OVersatileViewItem * ); + void returnPressed( Opie::Ui::OVersatileViewItem * ); - void onItem( OVersatileViewItem * ); + void onItem( Opie::Ui::OVersatileViewItem * ); void onViewport(); //==============================================================================================// // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures //==============================================================================================// /* public: virtual void insertItem( OVersatileViewItem * ); // QListView virtual void insertItem( OVersatileViewItem *item, OVersatileViewItem *after = 0L ); // QIconView virtual void setSelected( OVersatileViewItem *, bool ); // QListView virtual void setSelected( OVersatileViewItem *item, bool s, bool cb = FALSE ); // QIconView virtual void setSorting( int column, bool increasing = TRUE ); // QListView void setSorting( bool sort, bool ascending = TRUE ); // QIconView void sort(); // #### make virtual in next major release // QListView virtual void sort( bool ascending = TRUE ); // QIconView */ signals: - void clicked( OVersatileViewItem *, const QPoint &, int ); // QListView - void clicked( OVersatileViewItem *, const QPoint & ); // QIconView + void clicked( Opie::Ui::OVersatileViewItem *, const QPoint &, int ); // QListView + void clicked( Opie::Ui::OVersatileViewItem *, const QPoint & ); // QIconView - void pressed( OVersatileViewItem *, const QPoint &, int ); // QListView - void pressed( OVersatileViewItem *, const QPoint & ); // QIconView + void pressed( Opie::Ui::OVersatileViewItem *, const QPoint &, int ); // QListView + void pressed( Opie::Ui::OVersatileViewItem *, const QPoint & ); // QIconView - void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos ); // QIconView - void rightButtonClicked( OVersatileViewItem *, const QPoint&, int ); // QListView + void rightButtonClicked( Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView + void rightButtonClicked( Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView - void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos ); // QIconView - void rightButtonPressed( OVersatileViewItem *, const QPoint&, int ); // QListView + void rightButtonPressed( Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView + void rightButtonPressed( Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView - void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int ); // QListView - void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos ); // QIconView + void mouseButtonPressed( int, Opie::Ui::OVersatileViewItem *, const QPoint& , int ); // QListView + void mouseButtonPressed( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView - void mouseButtonClicked( int, OVersatileViewItem *, const QPoint&, int ); // QListView - void mouseButtonClicked( int button, OVersatileViewItem* item, const QPoint& pos ); // QIconView + void mouseButtonClicked( int, Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView + void mouseButtonClicked( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView }; } } #endif |