summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-28 20:39:22 (UTC)
committer zecke <zecke>2004-03-28 20:39:22 (UTC)
commitb4c5da4a6cf51753e8d2da505197326e05323d73 (patch) (side-by-side diff)
tree6b9814683e717f8445496dc0d4c8d23eda223dc3
parent4cbd5ad37e51b7bc9c749f8eda2e46a806d904b0 (diff)
downloadopie-b4c5da4a6cf51753e8d2da505197326e05323d73.zip
opie-b4c5da4a6cf51753e8d2da505197326e05323d73.tar.gz
opie-b4c5da4a6cf51753e8d2da505197326e05323d73.tar.bz2
From yesterday. Some sort of GUI loading
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp20
-rw-r--r--libopie2/opieui/okeyconfigwidget.h2
2 files changed, 19 insertions, 3 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index 2ea0bd5..273f15b 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -535,13 +535,12 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
int mod = e->state();
/*
* virtual keyboard
* else change the button mod only
*/
- qWarning( "handleKeyEvent...." );
if ( key == 0 ) {
key = e->ascii();
if ( key > 96 && key < 123)
key -= 32;
}else{
int new_mod = 0;
@@ -604,12 +603,18 @@ void OKeyConfigManager::removeKeyConfig( const OKeyConfigItem& item ) {
*/
void OKeyConfigManager::clearKeyConfig() {
m_keys.clear();
delete m_map; m_map = 0;
}
+/**
+ *
+ */
+Opie::Ui::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{
+ return m_keys;
+}
/**
* Add this OKeyPair to the blackList.
* Internal lists will be destroyed
*/
void OKeyConfigManager::addToBlackList( const OKeyPair& key) {
@@ -750,17 +755,17 @@ namespace Private {
return m_item;
}
OKeyConfigManager* OKeyListViewItem::manager() {
return m_manager;
}
void OKeyListViewItem::setItem( const OKeyConfigItem& item ) {
+ m_item = item;
setPixmap( 0, m_item.pixmap() );
setText ( 1, m_item.text() );
setText ( 2, keyToString( m_item.keyPair() ) );
setText ( 3, keyToString( m_item.defaultKeyPair() ) );
- m_item = item;
}
QString keyToString( const OKeyPair& pair ) {
int mod = 0;
if ( pair.modifier() & Qt::ShiftButton )
mod |= Qt::SHIFT;
@@ -850,13 +855,12 @@ void OKeyConfigWidget::initUi() {
/*
* GROUP with button info
*/
QGroupBox *box = new QGroupBox( this );
- box ->setEnabled( false );
box ->setTitle( tr("Shortcut for Selected Action") );
box ->setFrameStyle( QFrame::Box | QFrame::Sunken );
layout->addWidget( box, 1 );
gridLay = new QGridLayout( box, 3, 4 );
gridLay->addRowSpacing( 0, fontMetrics().lineSpacing() );
@@ -926,14 +930,21 @@ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
/**
* loads the items and allows editing them
*/
void OKeyConfigWidget::load() {
+ Opie::Ui::Private::OKeyConfigWidgetPrivateList::Iterator it;
+ for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+ OListViewItem *item = new OListViewItem( m_view, (*it).name );
+ OKeyConfigItem::List list = (*it).manager->keyConfigList();
+ for (OKeyConfigItem::List::Iterator keyIt = list.begin(); keyIt != list.end();++keyIt )
+ (void )new Opie::Ui::Private::OKeyListViewItem(*keyIt, (*it).manager, item );
}
+}
/**
* Saves if in Queue Mode. It'll update the supplied
* OKeyConfigManager objects.
* If in Queue mode it'll just return
*/
@@ -968,12 +979,13 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
m_def ->setChecked( false );
}
}
}
void OKeyConfigWidget::slotNoKey() {
+ qWarning( "No Key" );
m_none->setChecked( true );
m_cus ->setChecked( false );
m_btn ->setEnabled( false );
m_def ->setChecked( false );
if ( !m_view->currentItem() || m_view->currentItem()->parent() )
@@ -992,12 +1004,13 @@ void OKeyConfigWidget::slotNoKey() {
if ( m_mode == Imediate )
item->manager()->addKeyConfig( item->item() );
}
void OKeyConfigWidget::slotDefaultKey() {
+ qWarning( "Slot Default Key" );
m_none->setChecked( true );
m_cus ->setChecked( false );
m_btn ->setEnabled( false );
m_def ->setChecked( false );
if ( !m_view->currentItem() || m_view->currentItem()->parent() )
@@ -1015,12 +1028,13 @@ void OKeyConfigWidget::slotDefaultKey() {
if ( m_mode == Imediate )
item->manager()->addKeyConfig( item->item() );
}
void OKeyConfigWidget::slotCustomKey() {
+ qWarning( "SlotCustom Key" );
m_cus ->setChecked( true );
m_btn ->setEnabled( true );
m_def ->setChecked( false );
m_none->setChecked( false );
if ( !m_view->currentItem() || m_view->currentItem()->parent() )
diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h
index b3309af..a7a5f48 100644
--- a/libopie2/opieui/okeyconfigwidget.h
+++ b/libopie2/opieui/okeyconfigwidget.h
@@ -177,12 +177,14 @@ public:
void clearBlackList();
OKeyPair::List blackList()const;
void handleWidget( QWidget* );
bool eventFilter( QObject*, QEvent* );
+
+ OKeyConfigItem::List keyConfigList()const;
signals:
/**
* The Signals are triggered on KeyPress and KeyRelease!
* You can check the isDown of the QKeyEvent
* @see QKeyEvent
*/