[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: Moved KActionSelector to KWidgetAddons
From: Aleix Pol <aleixpol () kde ! org>
Date: 2013-06-05 15:43:01
Message-ID: 20130605154301.C2DF5A605A () git ! kde ! org
[Download RAW message or body]
Git commit 46c1f06c05f828a8f775aa7a3697fa4a68e3df42 by Aleix Pol.
Committed on 05/06/2013 at 17:42.
Pushed by apol into branch 'frameworks'.
Moved KActionSelector to KWidgetAddons
REVIEW: 110820
M +0 -2 kdeui/CMakeLists.txt
M +0 -1 kdeui/tests/CMakeLists.txt
M +2 -0 tier1/kwidgetsaddons/src/CMakeLists.txt
R +33 -36 tier1/kwidgetsaddons/src/kactionselector.cpp [from: \
kdeui/widgets/kactionselector.cpp - 092% similarity] R +8 -14 \
tier1/kwidgetsaddons/src/kactionselector.h [from: kdeui/widgets/kactionselector.h - \
098% similarity] M +1 -0 tier1/kwidgetsaddons/tests/CMakeLists.txt
R +2 -4 tier1/kwidgetsaddons/tests/kactionselectortest.cpp [from: \
kdeui/tests/kactionselectortest.cpp - 088% similarity]
http://commits.kde.org/kdelibs/46c1f06c05f828a8f775aa7a3697fa4a68e3df42
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 8e2c067..80387ee 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -150,7 +150,6 @@ set(kdeui_LIB_SRCS
util/kpassivepopup.cpp
util/kpassivepopupmessagehandler.cpp
util/kundoactions.cpp
- widgets/kactionselector.cpp
widgets/kbuttongroup.cpp
widgets/kcharselect.cpp
widgets/kcharselectdata.cpp
@@ -436,7 +435,6 @@ install( FILES
util/kwallet.h
util/kxerrorhandler.h
util/kundoactions.h
- widgets/kactionselector.h
widgets/kdatepicker.h
widgets/kcmodule.h
widgets/kcombobox.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index af65f34..33701b4 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -34,7 +34,6 @@ KDEUI_UNIT_TESTS(
)
KDEUI_EXECUTABLE_TESTS(
- kactionselectortest
kcharselecttest
kassistantdialogtest
kbugreporttest
diff --git a/tier1/kwidgetsaddons/src/CMakeLists.txt \
b/tier1/kwidgetsaddons/src/CMakeLists.txt index 1a2c3e7..ea80787 100644
--- a/tier1/kwidgetsaddons/src/CMakeLists.txt
+++ b/tier1/kwidgetsaddons/src/CMakeLists.txt
@@ -22,6 +22,7 @@ set(kwidgetsaddons_SRCS
kcursor.cpp
kratingwidget.cpp
kratingpainter.cpp
+ kactionselector.cpp
)
set(kwidgetsaddon_UI
@@ -63,6 +64,7 @@ install(FILES
kcursor.h
kratingpainter.h
kratingwidget.h
+ kactionselector.h
${CMAKE_CURRENT_BINARY_DIR}/kwidgetsaddons_export.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
diff --git a/kdeui/widgets/kactionselector.cpp \
b/tier1/kwidgetsaddons/src/kactionselector.cpp similarity index 92%
rename from kdeui/widgets/kactionselector.cpp
rename to tier1/kwidgetsaddons/src/kactionselector.cpp
index 55cfe79..ab327ef 100644
--- a/kdeui/widgets/kactionselector.cpp
+++ b/tier1/kwidgetsaddons/src/kactionselector.cpp
@@ -19,8 +19,6 @@
#include "kactionselector.h"
-#include <klocalizedstring.h>
-#include <kdebug.h>
#include <QApplication>
#include <QToolButton>
#include <QLabel>
@@ -84,10 +82,10 @@ KActionSelector::KActionSelector( QWidget *parent )
{
d->moveOnDoubleClick = true;
d->keyboardEnabled = true;
- d->addIcon = QApplication::isRightToLeft()? "go-previous" : "go-next";
- d->removeIcon = QApplication::isRightToLeft()? "go-next" : "go-previous";
- d->upIcon = "go-up";
- d->downIcon = "go-down";
+ d->addIcon = QLatin1String(QApplication::isRightToLeft()? "go-previous" : \
"go-next"); + d->removeIcon = QLatin1String(QApplication::isRightToLeft()? "go-next" \
: "go-previous"); + d->upIcon = QLatin1String("go-up");
+ d->downIcon = QLatin1String("go-down");
d->availableInsertionPolicy = Sorted;
d->selectedInsertionPolicy = BelowCurrent;
d->showUpDownButtons = true;
@@ -97,7 +95,7 @@ KActionSelector::KActionSelector( QWidget *parent )
QVBoxLayout *loAv = new QVBoxLayout();
lo->addLayout( loAv );
- d->lAvailable = new QLabel( i18n("&Available:"), this );
+ d->lAvailable = new QLabel( tr("&Available:"), this );
loAv->addWidget( d->lAvailable );
d->availableListWidget = new QListWidget( this );
loAv->addWidget( d->availableListWidget );
@@ -114,7 +112,7 @@ KActionSelector::KActionSelector( QWidget *parent )
QVBoxLayout *loS = new QVBoxLayout();
lo->addLayout( loS );
- d->lSelected = new QLabel( i18n("&Selected:"), this );
+ d->lSelected = new QLabel( tr("&Selected:"), this );
loS->addWidget( d->lSelected );
d->selectedListWidget = new QListWidget( this );
loS->addWidget( d->selectedListWidget );
@@ -141,8 +139,8 @@ KActionSelector::KActionSelector( QWidget *parent )
this, SLOT(itemDoubleClicked(QListWidgetItem*)) );
connect( d->selectedListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
this, SLOT(itemDoubleClicked(QListWidgetItem*)) );
- connect( d->availableListWidget, SIGNAL(itemSelectionChanged()), this, \
SLOT(polish()) );
- connect( d->selectedListWidget, SIGNAL(itemSelectionChanged()), this, \
SLOT(polish()) ); + connect( d->availableListWidget, SIGNAL(itemSelectionChanged()), \
this, SLOT(setButtonsEnabled()) ); + connect( d->selectedListWidget, \
SIGNAL(itemSelectionChanged()), this, SLOT(setButtonsEnabled()) );
d->availableListWidget->installEventFilter( this );
d->selectedListWidget->installEventFilter( this );
@@ -189,7 +187,8 @@ void KActionSelector::setButtonIcon( const QString &icon, \
MoveButton button ) d->btnDown->setIcon( QIcon::fromTheme( icon ) );
break;
default:
- kDebug(13001)<<"KActionSelector::setButtonIcon: DAINBREAD!";
+// kDebug(13001)<<"KActionSelector::setButtonIcon: DAINBREAD!";
+ break;
}
}
@@ -210,7 +209,8 @@ void KActionSelector::setButtonIconSet( const QIcon &iconset, \
MoveButton button d->btnDown->setIcon( iconset );
break;
default:
- kDebug(13001)<<"KActionSelector::setButtonIconSet: DAINBREAD!";
+// kDebug(13001)<<"KActionSelector::setButtonIconSet: DAINBREAD!";
+ break;
}
}
@@ -228,15 +228,16 @@ void KActionSelector::setButtonTooltip( const QString &tip, \
MoveButton button ) break;
case ButtonUp:
d->btnUp->setText( tip );
- d->btnUp->setToolTip( tip );
+ d->btnUp->setToolTip( tip );
break;
case ButtonDown:
d->btnDown->setText( tip );
- d->btnDown->setToolTip( tip );
+ d->btnDown->setToolTip( tip );
break;
default:
- kDebug(13001)<<"KActionSelector::setButtonToolTip: DAINBREAD!";
- }
+// kDebug(13001)<<"KActionSelector::setButtonToolTip: DAINBREAD!";
+ break;
+}
}
void KActionSelector::setButtonWhatsThis( const QString &text, MoveButton button )
@@ -256,19 +257,11 @@ void KActionSelector::setButtonWhatsThis( const QString &text, \
MoveButton button d->btnDown->setWhatsThis(text );
break;
default:
- kDebug(13001)<<"KActionSelector::setButtonWhatsThis: DAINBREAD!";
+// kDebug(13001)<<"KActionSelector::setButtonWhatsThis: DAINBREAD!";
+ break;
}
}
-void KActionSelector::setButtonsEnabled()
-{
- d->btnAdd->setEnabled( d->selectedRowIndex(d->availableListWidget) > -1 );
- d->btnRemove->setEnabled( d->selectedRowIndex(d->selectedListWidget) > -1 );
- d->btnUp->setEnabled( d->selectedRowIndex(d->selectedListWidget) > 0 );
- d->btnDown->setEnabled( d->selectedRowIndex(d->selectedListWidget) > -1 &&
- d->selectedRowIndex(d->selectedListWidget) < \
d->selectedListWidget->count() - 1 );
-}
-
//END Public Methods
//BEGIN Properties
@@ -357,9 +350,13 @@ void KActionSelector::setShowUpDownButtons( bool show )
//BEGIN Public Slots
-void KActionSelector::polish()
+void KActionSelector::setButtonsEnabled()
{
- setButtonsEnabled();
+ d->btnAdd->setEnabled( d->selectedRowIndex(d->availableListWidget) > -1 );
+ d->btnRemove->setEnabled( d->selectedRowIndex(d->selectedListWidget) > -1 );
+ d->btnUp->setEnabled( d->selectedRowIndex(d->selectedListWidget) > 0 );
+ d->btnDown->setEnabled( d->selectedRowIndex(d->selectedListWidget) > -1 &&
+ d->selectedRowIndex(d->selectedListWidget) < \
d->selectedListWidget->count() - 1 ); }
//END Public Slots
@@ -441,11 +438,11 @@ void KActionSelectorPrivate::buttonAddClicked()
{
// move all selected items from available to selected listbox
QList<QListWidgetItem *> list = availableListWidget->selectedItems();
- foreach (QListWidgetItem* item, list) {
+ Q_FOREACH (QListWidgetItem* item, list) {
availableListWidget->takeItem( availableListWidget->row( item ) );
selectedListWidget->insertItem( insertionIndex( selectedListWidget, \
selectedInsertionPolicy ), item ); selectedListWidget->setCurrentItem( item );
- emit q->added( item );
+ Q_EMIT q->added( item );
}
if ( selectedInsertionPolicy == KActionSelector::Sorted )
selectedListWidget->sortItems();
@@ -456,11 +453,11 @@ void KActionSelectorPrivate::buttonRemoveClicked()
{
// move all selected items from selected to available listbox
QList<QListWidgetItem *> list = selectedListWidget->selectedItems();
- foreach (QListWidgetItem* item, list) {
+ Q_FOREACH (QListWidgetItem* item, list) {
selectedListWidget->takeItem( selectedListWidget->row( item ) );
availableListWidget->insertItem( insertionIndex( availableListWidget, \
availableInsertionPolicy ), item ); availableListWidget->setCurrentItem( item );
- emit q->removed( item );
+ Q_EMIT q->removed( item );
}
if ( availableInsertionPolicy == KActionSelector::Sorted )
availableListWidget->sortItems();
@@ -475,7 +472,7 @@ void KActionSelectorPrivate::buttonUpClicked()
selectedListWidget->takeItem( c );
selectedListWidget->insertItem( c-1, item );
selectedListWidget->setCurrentItem( item );
- emit q->movedUp( item );
+ Q_EMIT q->movedUp( item );
}
void KActionSelectorPrivate::buttonDownClicked()
@@ -486,7 +483,7 @@ void KActionSelectorPrivate::buttonDownClicked()
selectedListWidget->takeItem( c );
selectedListWidget->insertItem( c+1, item );
selectedListWidget->setCurrentItem( item );
- emit q->movedDown( item );
+ Q_EMIT q->movedDown( item );
}
void KActionSelectorPrivate::itemDoubleClicked( QListWidgetItem *item )
@@ -529,9 +526,9 @@ void KActionSelectorPrivate::moveItem( QListWidgetItem *item )
if ( p == KActionSelector::Sorted )
lbTo->sortItems();
if ( lbTo == selectedListWidget )
- emit q->added( item );
+ Q_EMIT q->added( item );
else
- emit q->removed( item );
+ Q_EMIT q->removed( item );
}
int KActionSelectorPrivate::insertionIndex( QListWidget *lb, \
KActionSelector::InsertionPolicy policy )
diff --git a/kdeui/widgets/kactionselector.h \
b/tier1/kwidgetsaddons/src/kactionselector.h similarity index 98%
rename from kdeui/widgets/kactionselector.h
rename to tier1/kwidgetsaddons/src/kactionselector.h
index 67d7a7a..4de4d7a 100644
--- a/kdeui/widgets/kactionselector.h
+++ b/tier1/kwidgetsaddons/src/kactionselector.h
@@ -19,7 +19,7 @@
#ifndef _KACTION_SELECTOR_H_
#define _KACTION_SELECTOR_H_
-#include <kdeui_export.h>
+#include <kwidgetsaddons_export.h>
#include <QWidget>
class QListWidget;
@@ -77,7 +77,7 @@ class KActionSelectorPrivate;
@author Anders Lund <anders@alweb.dk>
*/
-class KDEUI_EXPORT KActionSelector : public QWidget {
+class KWIDGETSADDONS_EXPORT KActionSelector : public QWidget {
Q_OBJECT
Q_ENUMS( InsertionPolicy MoveButton )
Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE \
setMoveOnDoubleClick ) @@ -260,15 +260,6 @@ public:
*/
void setButtonWhatsThis( const QString &text, MoveButton button );
- /**
- Sets the enabled state of all moving buttons to reflect the current
- options.
-
- Be sure to call this if you add or removes items to either listbox after the
- widget is show()n
- */
- void setButtonsEnabled();
-
Q_SIGNALS:
/**
Emitted when an item is moved to the "selected" listbox.
@@ -297,10 +288,13 @@ Q_SIGNALS:
public Q_SLOTS:
/**
- Reimplemented for internal reasons.
- (calls setButtonsEnabled())
+ Sets the enabled state of all moving buttons to reflect the current
+ options.
+
+ Be sure to call this if you add or removes items to either listbox after the
+ widget is shown
*/
- void polish();
+ void setButtonsEnabled();
protected:
/**
diff --git a/tier1/kwidgetsaddons/tests/CMakeLists.txt \
b/tier1/kwidgetsaddons/tests/CMakeLists.txt index 85a8732..691377c 100644
--- a/tier1/kwidgetsaddons/tests/CMakeLists.txt
+++ b/tier1/kwidgetsaddons/tests/CMakeLists.txt
@@ -20,4 +20,5 @@ kwidgetsaddons_executable_tests(
kpassworddialogtest
keditlistwidgettest
kratingwidgettest
+ kactionselectortest
)
diff --git a/kdeui/tests/kactionselectortest.cpp \
b/tier1/kwidgetsaddons/tests/kactionselectortest.cpp similarity index 88%
rename from kdeui/tests/kactionselectortest.cpp
rename to tier1/kwidgetsaddons/tests/kactionselectortest.cpp
index 60fedd3..b38bdc6 100644
--- a/kdeui/tests/kactionselectortest.cpp
+++ b/tier1/kwidgetsaddons/tests/kactionselectortest.cpp
@@ -19,8 +19,6 @@
#include <kactionselector.h>
-#include <kdebug.h>
-
#include <QApplication>
#include <QListWidget>
@@ -29,8 +27,8 @@ int main( int argc, char *argv[] )
QApplication app( argc, argv );
KActionSelector actionSelector(0);
- actionSelector.availableListWidget()->addItems(QStringList() << "A" << "B" << "C" \
<< "D" << "E");
- actionSelector.selectedListWidget()->addItems(QStringList() << "1" << "2");
+ actionSelector.availableListWidget()->addItems(QStringList() << QLatin1String("A") \
<< QLatin1String("B") << QLatin1String("C") << QLatin1String("D") << \
QLatin1String("E")); + actionSelector.selectedListWidget()->addItems(QStringList() \
<< QLatin1String("1") << QLatin1String("2")); actionSelector.show();
return app.exec();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic