wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port to QListWidget and remove some tabs.

Browse Source 
svn path=/trunk/KDE/kdepim/; revision=700480
wilder-work
Thomas McGuire 19 years ago
parent cd3fa71145
commit d8df174cb9
3 changed files with 46 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kmedit.h
  2. 116
      simplestringlisteditor.cpp
  3. 14
      simplestringlisteditor.h

1
kmedit.h
Unescape View File

@ -94,7 +94,6 @@ public:
/** set cursor to absolute position pos */
void setCursorPositionFromStart(unsigned int pos);
signals:
void spellcheck_done( int result );
void attachPNGImageData( const QByteArray &image );

116
simplestringlisteditor.cpp
Unescape View File

@ -37,24 +37,14 @@
#include <kdebug.h>
#include <kpushbutton.h>
#include <QLayout>
//Added by qt3to4:
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <Q3ListBox>
#include <QListWidget>
//********************************************************
// SimpleStringListEditor
//********************************************************
// small helper function:
static inline Q3ListBoxItem * findSelectedItem( Q3ListBox * lb ) {
Q3ListBoxItem * item = 0;
for ( item = lb->firstItem() ; item && !item->isSelected() ;
item = item->next() ) ;
return item;
}
SimpleStringListEditor::SimpleStringListEditor( QWidget * parent,
ButtonCode buttons,
const QString & addLabel,
@ -71,7 +61,7 @@ SimpleStringListEditor::SimpleStringListEditor( QWidget * parent,
hlay->setSpacing( KDialog::spacingHint() );
hlay->setMargin( 0 );
mListBox = new Q3ListBox( this );
mListBox = new QListWidget( this );
hlay->addWidget( mListBox, 1 );
if ( buttons == None )
@ -114,7 +104,7 @@ SimpleStringListEditor::SimpleStringListEditor( QWidget * parent,
vlay->addWidget( mModifyButton );
connect( mModifyButton, SIGNAL(clicked()),
this, SLOT(slotModify()) );
connect( mListBox, SIGNAL( doubleClicked( Q3ListBoxItem* ) ),
connect( mListBox, SIGNAL( itemDoubleClicked( QListWidgetItem* ) ),
this, SLOT( slotModify() ) );
}
@ -148,29 +138,28 @@ SimpleStringListEditor::SimpleStringListEditor( QWidget * parent,
vlay->addStretch( 1 ); // spacer
connect( mListBox, SIGNAL(selectionChanged()),
connect( mListBox, SIGNAL(itemSelectionChanged()),
this, SLOT(slotSelectionChanged()) );
}
void SimpleStringListEditor::setStringList( const QStringList & strings ) {
mListBox->clear();
mListBox->insertStringList( strings );
mListBox->addItems( strings );
}
void SimpleStringListEditor::appendStringList( const QStringList & strings ) {
mListBox->insertStringList( strings );
mListBox->addItems( strings );
}
QStringList SimpleStringListEditor::stringList() const {
QStringList result;
for ( Q3ListBoxItem * item = mListBox->firstItem() ;
item ; item = item->next() )
result << item->text();
for ( int i = 0; i < mListBox->count(); i++ )
result << ( mListBox->item( i )->text() );
return result;
}
void SimpleStringListEditor::setButtonText( ButtonCode button,
const QString & text ) {
const QString & text ) {
switch ( button ) {
case Add:
if ( !mAddButton ) break;
@ -187,14 +176,14 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
case Up:
case Down:
kDebug(5006) <<"SimpleStringListEditor: Cannot change text of"
"Up and Down buttons: they don't contains text!";
"Up and Down buttons: they don't contains text!";
return;
default:
if ( button & All )
kDebug(5006) <<"SimpleStringListEditor::setButtonText: No such button!";
else
kDebug(5006) <<"SimpleStringListEditor::setButtonText: Can only set"
"text for one button at a time!";
"text for one button at a time!";
return;
}
@ -206,91 +195,64 @@ void SimpleStringListEditor::slotAdd() {
bool ok = false;
QString newEntry = KInputDialog::getText( i18n("New Value"),
mAddDialogLabel, QString(),
&ok, this );
&ok, this );
// let the user verify the string before adding
emit aboutToAdd( newEntry );
if ( ok && !newEntry.isEmpty() )
mListBox->insertItem( newEntry );
mListBox->addItem( newEntry );
emit changed();
}
void SimpleStringListEditor::slotRemove() {
delete findSelectedItem( mListBox ); // delete 0 is well-behaved...
emit changed();
if ( mListBox->currentItem() ) {
delete mListBox->takeItem( mListBox->currentRow() );
emit changed();
}
}
void SimpleStringListEditor::slotModify() {
Q3ListBoxItem * item = findSelectedItem( mListBox );
QListWidgetItem* item = mListBox->currentItem();
if ( !item ) return;
bool ok = false;
QString newText = KInputDialog::getText( i18n("Change Value"),
mAddDialogLabel, item->text(),
&ok, this );
&ok, this );
emit aboutToAdd( newText );
if ( !ok || newText.isEmpty() || newText == item->text() ) return;
int index = mListBox->index( item );
delete item;
mListBox->insertItem( newText, index );
mListBox->setCurrentItem( index );
item->setText( newText );
emit changed();
}
void SimpleStringListEditor::slotUp() {
Q3ListBoxItem * item = findSelectedItem( mListBox );
if ( !item || !item->prev() ) return;
// find the item that we want to insert after:
Q3ListBoxItem * pprev = item->prev()->prev();
// take the item from it's current position...
mListBox->takeItem( item );
// ...and insert it after the above mentioned item:
mListBox->insertItem( item, pprev );
// make sure the old item is still the current one:
QListWidgetItem *item = mListBox->currentItem();
int row = mListBox->currentRow();
if ( !item || row == 0 ) return;
mListBox->takeItem( row );
mListBox->insertItem( row - 1, item );
mListBox->setCurrentItem( item );
// enable and disable controls:
if ( mRemoveButton )
mRemoveButton->setEnabled( true );
if ( mModifyButton )
mModifyButton->setEnabled( true );
if ( mUpButton )
mUpButton->setEnabled( item->prev() );
if ( mDownButton )
mDownButton->setEnabled( true );
emit changed();
}
void SimpleStringListEditor::slotDown() {
Q3ListBoxItem * item = findSelectedItem( mListBox );
if ( !item || !item->next() ) return;
// find the item that we want to insert after:
Q3ListBoxItem * next = item->next();
// take the item from it's current position...
mListBox->takeItem( item );
// ...and insert it after the above mentioned item:
if ( next )
mListBox->insertItem( item, next );
else
mListBox->insertItem( item );
// make sure the old item is still the current one:
QListWidgetItem *item = mListBox->currentItem();
int row = mListBox->currentRow();
if ( !item || row >= mListBox->count() - 1 ) return;
mListBox->takeItem( row );
mListBox->insertItem( row + 1, item );
mListBox->setCurrentItem( item );
// enable and disable controls:
if ( mRemoveButton )
mRemoveButton->setEnabled( true );
if ( mModifyButton )
mModifyButton->setEnabled( true );
if ( mUpButton )
mUpButton->setEnabled( true );
if ( mDownButton )
mDownButton->setEnabled( item->next() );
emit changed();
}
void SimpleStringListEditor::slotSelectionChanged() {
// try to find a selected item:
Q3ListBoxItem * item = findSelectedItem( mListBox );
QListWidgetItem * item = mListBox->currentItem();
int row = mListBox->currentRow();
// if there is one, item will be non-null (ie. true), else 0
// (ie. false):
@ -299,9 +261,9 @@ void SimpleStringListEditor::slotSelectionChanged() {
if ( mModifyButton )
mModifyButton->setEnabled( item );
if ( mUpButton )
mUpButton->setEnabled( item && item->prev() );
mUpButton->setEnabled( item && row > 0 );
if ( mDownButton )
mDownButton->setEnabled( item && item->next() );
mDownButton->setEnabled( item && row < mListBox->count() - 1 );
}

14
simplestringlisteditor.h
Unescape View File

@ -36,7 +36,7 @@
#include <QStringList>
#include <QString>
class Q3ListBox;
class QListWidget;
class QPushButton;
//
@ -58,11 +58,11 @@ public:
/** Constructor. Populates the list with @p strings. */
SimpleStringListEditor( QWidget * parent=0,
ButtonCode buttons=Unsorted,
const QString & addLabel=QString(),
const QString & removeLabel=QString(),
const QString & modifyLabel=QString(),
const QString & addDialogLabel=QString() );
ButtonCode buttons=Unsorted,
const QString & addLabel=QString(),
const QString & removeLabel=QString(),
const QString & modifyLabel=QString(),
const QString & addDialogLabel=QString() );
/** Sets the list of strings displayed to @p strings */
void setStringList( const QStringList & strings );
@ -91,7 +91,7 @@ protected slots:
void slotSelectionChanged();
protected:
Q3ListBox *mListBox;
QListWidget *mListBox;
QPushButton *mAddButton;
QPushButton *mRemoveButton;
QPushButton *mModifyButton;

Write Preview
Loading…
Cancel
Save