kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correction du bug #24 : Qt 4.5 apportant la fonctionnalite "onglets deplacables", il est necessaire de differencier les methodes appelees entre Qt 4.4 et Qt 4.5.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@723 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2009-07-30 20:20:17 +00:00
parent 0adac494c8
commit a2964f5364
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/projectview.cpp
View File

@@ -50,7 +50,7 @@ ProjectView::ProjectView(QETProject *project, QWidget *parent) :
fallback_widget_layout_ -> addWidget(label_widget); fallback_widget_layout_ -> addWidget(label_widget);
tabs_ = new QETTabWidget(); tabs_ = new QETTabWidget();
tabs_ -> setTabsMovable(true); tabs_ -> setMovable(true);
connect(tabs_, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); connect(tabs_, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
connect(tabs_, SIGNAL(tabDoubleClicked(int)), this, SLOT(tabDoubleClicked(int))); connect(tabs_, SIGNAL(tabDoubleClicked(int)), this, SLOT(tabDoubleClicked(int)));
connect(tabs_, SIGNAL(firstTabInserted()), this, SLOT(firstTabInserted())); connect(tabs_, SIGNAL(firstTabInserted()), this, SLOT(firstTabInserted()));

13
sources/qettabbar.cpp
View File

@@ -25,6 +25,7 @@
QETTabBar::QETTabBar(QWidget *parent) : QETTabBar::QETTabBar(QWidget *parent) :
QTabBar(parent), QTabBar(parent),
no_more_tabs_(true), no_more_tabs_(true),
movable_tabs_(false),
moved_tab_(-1) moved_tab_(-1)
{ {
} }
@@ -68,15 +69,23 @@ void QETTabBar::activatePreviousTab() {
/** /**
@param movable true pour que les onglets soient deplacables, false sinon @param movable true pour que les onglets soient deplacables, false sinon
*/ */
void QETTabBar::setTabsMovable(bool movable) { void QETTabBar::setMovable(bool movable) {
#if QT_VERSION < 0x040500
movable_tabs_ = movable; movable_tabs_ = movable;
#else
QTabBar::setMovable(movable);
#endif
} }
/** /**
@return true si les onglets sont deplacables, false sinon @return true si les onglets sont deplacables, false sinon
*/ */
bool QETTabBar::tabsMovable() const { bool QETTabBar::isMovable() const {
#if QT_VERSION < 0x040500
return(movable_tabs_); return(movable_tabs_);
#else
return(QTabBar::isMovable());
#endif
} }
/** /**

9
sources/qettabbar.h
View File

@@ -1,5 +1,4 @@
/* /* Copyright 2006-2009 Xavier Guerrin
Copyright 2006-2009 Xavier Guerrin
This file is part of QElectroTech. This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify QElectroTech is free software: you can redistribute it and/or modify
@@ -41,8 +40,8 @@ class QETTabBar : public QTabBar {
public: public:
void activateNextTab(); void activateNextTab();
void activatePreviousTab(); void activatePreviousTab();
void setTabsMovable(bool); void setMovable(bool);
bool tabsMovable() const; bool isMovable() const;
bool isVertical() const; bool isVertical() const;
bool isHorizontal() const; bool isHorizontal() const;
@@ -58,7 +57,9 @@ class QETTabBar : public QTabBar {
signals: signals:
void lastTabRemoved(); void lastTabRemoved();
void firstTabInserted(); void firstTabInserted();
#if QT_VERSION < 0x040500
void tabMoved(int, int); void tabMoved(int, int);
#endif
void tabDoubleClicked(int); void tabDoubleClicked(int);
private: private:

12
sources/qettabwidget.cpp
View File

@@ -47,15 +47,23 @@ QETTabWidget::~QETTabWidget() {
/** /**
@param movable true pour que les onglets soient deplacables, false sinon @param movable true pour que les onglets soient deplacables, false sinon
*/ */
void QETTabWidget::setTabsMovable(bool movable) { void QETTabWidget::setMovable(bool movable) {
#if QT_VERSION < 0x040500
tab_bar_ -> setTabsMovable(movable); tab_bar_ -> setTabsMovable(movable);
#else
QTabWidget::setMovable(movable);
#endif
} }
/** /**
@return true si les onglets sont deplacables, false sinon @return true si les onglets sont deplacables, false sinon
*/ */
bool QETTabWidget::tabsMovable() { bool QETTabWidget::isMovable() const {
#if QT_VERSION < 0x040500
return(tab_bar_ -> tabsMovable()); return(tab_bar_ -> tabsMovable());
#else
return(QTabWidget::isMovable());
#endif
} }
/** /**

4
sources/qettabwidget.h
View File

@@ -38,8 +38,8 @@ class QETTabWidget : public QTabWidget {
// methodes // methodes
public: public:
void setTabsMovable(bool); void setMovable(bool);
bool tabsMovable(); bool isMovable() const;
protected: protected:
void wheelEvent(QWheelEvent *); void wheelEvent(QWheelEvent *);