diff options
Diffstat (limited to 'kommander')
115 files changed, 1330 insertions, 1280 deletions
diff --git a/kommander/CMakeL10n.txt b/kommander/CMakeL10n.txt index 0efe7f6a..008a8578 100644 --- a/kommander/CMakeL10n.txt +++ b/kommander/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kommander" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kommander-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kommander/CMakeLists.txt b/kommander/CMakeLists.txt new file mode 100644 index 00000000..711033df --- /dev/null +++ b/kommander/CMakeLists.txt @@ -0,0 +1,21 @@ +add_subdirectory( icons ) +add_subdirectory( pluginmanager ) +add_subdirectory( plugin ) +add_subdirectory( factory ) +add_subdirectory( widget ) +add_subdirectory( widgets ) +add_subdirectory( editor ) +add_subdirectory( executor ) +add_subdirectory( part ) +add_subdirectory( working ) +add_subdirectory( examples ) +add_subdirectory( kmdrtools ) + + +##### other data + +tde_create_translated_desktop( + SOURCE x-kommander.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + PO_DIR kommander-desktops +) diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt new file mode 100644 index 00000000..098bc825 --- /dev/null +++ b/kommander/editor/CMakeLists.txt @@ -0,0 +1,88 @@ +add_subdirectory( pics ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/widgets + ${CMAKE_SOURCE_DIR}/kommander/plugin + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_definitions( -DKOMMANDER -DTQT_NO_SQL -DDESIGNER ) + + +##### kmdr-editor (executable) + +tde_add_executable( kmdr-editor AUTOMOC + + SOURCES + actioneditor.ui assoctexteditor.ui + connectioneditor.ui createtemplate.ui + formsettings.ui iconvieweditor.ui + listboxeditor.ui listeditor.ui + listvieweditor.ui multilineeditor.ui + newform.ui paletteeditor.ui + paletteeditoradvanced.ui pixmapfunction.ui + preferences.ui previewwidget.ui + tableeditor.ui wizardeditor.ui + choosewidget.ui functions.ui + actiondnd.cpp actioneditorimpl.cpp + assoctexteditorimpl.cpp actionlistview.cpp + asciivalidator.cpp assistproc.cpp + command.cpp connectioneditorimpl.cpp + defs.cpp filechooser.cpp + formfile.cpp formsettingsimpl.cpp + formwindow.cpp hierarchyview.cpp + iconvieweditorimpl.cpp layout.cpp + listboxeditorimpl.cpp listvieweditorimpl.cpp + main.cpp mainwindow.cpp + mainwindowactions.cpp metadatabase.cpp + multilineeditorimpl.cpp newformimpl.cpp + orderindicator.cpp paletteeditoradvancedimpl.cpp + paletteeditorimpl.cpp parser.cpp + pixmapchooser.cpp previewframe.cpp + previewwidgetimpl.cpp propertyeditor.cpp + qcompletionedit.cpp resource.cpp + sizehandle.cpp styledbutton.cpp + tableeditorimpl.cpp widgetdatabase.cpp + widgetfactory.cpp wizardeditorimpl.cpp + workspace.cpp choosewidgetimpl.cpp + functionsimpl.cpp messagelog.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeparts-shared + tdetexteditor-shared + kommanderwidget-shared + kommanderwidgets-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kommander.xml kommander-new.xml + DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax +) + +tde_create_translated_desktop( + SOURCE kmdr-editor.desktop + PO_DIR kommander-desktops +) diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index d07bfebf..87a55c9f 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -47,7 +47,7 @@ bool QDesignerAction::addTo( TQWidget *w ) if ( !widgetToInsert ) return TQAction::addTo( w ); - if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQPopupMenu" ) ) return false; widgetToInsert->reparent( w, TQPoint( 0, 0 ), false ); @@ -125,11 +125,11 @@ QSeparatorAction::QSeparatorAction( TQObject *parent ) bool QSeparatorAction::addTo( TQWidget *w ) { - if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { idx = ( (TQPopupMenu*)w )->count(); ( (TQPopupMenu*)w )->insertSeparator( idx ); return true; @@ -139,10 +139,10 @@ bool QSeparatorAction::addTo( TQWidget *w ) bool QSeparatorAction::removeFrom( TQWidget *w ) { - if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { delete wid; return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { ( (TQPopupMenu*)w )->removeItemAt( idx ); return true; } @@ -202,7 +202,7 @@ void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); } else if ( a->inherits( "QSeparatorAction" ) ) { @@ -222,7 +222,7 @@ static void fixObject( TQObject *&o ) bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { - if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) ) + if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress && @@ -450,9 +450,9 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQApplication::sendPostedEvents(); adjustSize(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); - TQStoredDrag *drag = new TQStoredDrag( type, this ); + TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil drag->setEncodedData( TQCString( s.latin1() ) ); drag->setPixmap( a->iconSet().pixmap() ); @@ -560,7 +560,7 @@ void QDesignerToolBar::reInsert() clear(); for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); @@ -691,7 +691,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; @@ -1074,9 +1074,9 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); - TQStoredDrag *drag = new TQStoredDrag( type, this ); + TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil drag->setEncodedData( TQCString( s.latin1() ) ); drag->setPixmap( a->iconSet().pixmap() ); diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index b71d2c2c..eeb255a2 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -41,7 +41,7 @@ class QDesignerActionGroup : public TQActionGroup public: QDesignerActionGroup( TQObject *parent ) - : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} + : TQActionGroup( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -72,9 +72,9 @@ class QDesignerAction : public TQAction public: QDesignerAction( TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} QDesignerAction( TQWidget *w, TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} TQWidget *widget() const { return wid; } int index() const { return idx; } diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 8dea07ad..72f09daf 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -117,7 +117,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -130,7 +130,7 @@ void ActionEditor::newAction() TQString n = "Action"; formWindow->unify( i->action(), n, true ); i->setText( 0, n ); - i->action()->setName( n ); + i->action()->setName( n.utf8() ); i->action()->setText( i->action()->name() ); if ( actionParent && actionParent->actionGroup() && actionParent->actionGroup()->usesDropDown() ) { @@ -149,7 +149,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -164,7 +164,7 @@ void ActionEditor::newActionGroup() TQString n = "ActionGroup"; formWindow->unify( i->action(), n, true ); i->setText( 0, n ); - i->actionGroup()->setName( n ); + i->actionGroup()->setName( n.utf8() ); i->actionGroup()->setText( i->actionGroup()->name() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "text", true ); MetaDataBase::setPropertyChanged( i->actionGroup(), "name", true ); @@ -186,18 +186,18 @@ void ActionEditor::setFormWindow( FormWindow *fw ) formWindow = fw; if ( !formWindow || !formWindow->mainContainer() || - !formWindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + !formWindow->mainContainer()->inherits( "TQMainWindow" ) ) { setEnabled( false ); } else { setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( a->parent() && a->parent()->inherits( "TQAction" ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { insertChildActions( i ); } } @@ -219,14 +219,14 @@ void ActionEditor::insertChildActions( ActionItem *i ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; TQAction *a = (TQAction*)o; ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); i->setOpen( true ); i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( a->inherits( "TQActionGroup" ) ) insertChildActions( i2 ); } } diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 80d4d94c..78b883b0 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -37,7 +37,7 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) ActionItem::ActionItem( TQListView *lv, TQAction *ac ) : TQListViewItem( lv ), a( 0 ), g( 0 ) { - if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; @@ -47,7 +47,7 @@ ActionItem::ActionItem( TQListView *lv, TQAction *ac ) ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) : TQListViewItem( i ), a( 0 ), g( 0 ) { - if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index 558964c1..b5f74086 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -219,4 +219,7 @@ <slot>AssocTextEditorBase_destroyed(TQObject*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index 60b4ff69..210703ee 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -71,9 +68,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -144,7 +138,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 63343b35..adc74084 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -368,7 +368,7 @@ void DeleteCommand::execute() w->hide(); TQString s = w->name(); s.prepend( "qt_dead_widget_" ); - w->setName( s ); + w->setName( s.utf8() ); formWindow()->selectWidget( TQT_TQOBJECT(w), false ); formWindow()->widgets()->remove( w ); TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) ); @@ -393,7 +393,7 @@ void DeleteCommand::unexecute() w->show(); TQString s = w->name(); s.remove( 0, TQString( "qt_dead_widget_" ).length() ); - w->setName( s ); + w->setName( s.utf8() ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( TQT_TQOBJECT(w) ); TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); @@ -438,7 +438,7 @@ void SetPropertyCommand::execute() PropertyItem *i = (PropertyItem*)editor->propertyList()->currentItem(); if ( !i ) return; - i->setValue( widget->property( propName ) ); + i->setValue( widget->property( propName.latin1() ) ); i->setChanged( false ); editor->refetchData(); editor->emitWidgetChanged(); @@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return true; @@ -532,19 +532,19 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { if ( propName == "hAlign" ) { p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); - align |= p->keyToValue( currentItemText ); + align |= p->keyToValue( currentItemText.utf8() ); widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); - align |= p->keyToValue( currentItemText ); + align |= p->keyToValue( currentItemText.utf8() ); widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { int align = widget->property( "alignment" ).toInt(); @@ -577,18 +577,18 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( p->isSetType() ) { ; } else if ( p->isEnumType() ) { - widget->setProperty( propName, p->keyToValue( currentItemText ) ); + widget->setProperty( propName.latin1(), p->keyToValue( currentItemText.utf8() ) ); } else { TQVariant ov; if ( propName == "name" || propName == "itemName" ) - ov = widget->property( propName ); + ov = widget->property( propName.latin1() ); int oldSerNum = -1; if ( v.type() == TQVariant::Pixmap ) oldSerNum = v.toPixmap().serialNumber(); - widget->setProperty( propName, v ); - if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() ) + widget->setProperty( propName.latin1(), v ); + if ( oldSerNum != -1 && oldSerNum != widget->property( propName.latin1() ).toPixmap().serialNumber() ) MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()), - widget->property( propName ).toPixmap().serialNumber(), + widget->property( propName.latin1() ).toPixmap().serialNumber(), MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) ); if ( propName == "cursor" ) MetaDataBase::setCursor( (TQWidget*)widget, v.toCursor() ); @@ -597,14 +597,14 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( formWindow()->isMainContainer( widget ) ) formWindow()->setName( v.toCString() ); } - if ( propName == "name" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( propName == "name" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)widget ); } - if ( propName == "iconSet" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( propName == "iconSet" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)widget ); } if ( propName == "caption" ) { @@ -751,9 +751,9 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::Grid ) layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); } @@ -1589,7 +1589,7 @@ void AddActionToToolBarCommand::execute() TQString s = ( (QDesignerAction*)action )->widget()->name(); if ( s.startsWith( "qt_dead_widget_" ) ) { s.remove( 0, TQString( "qt_dead_widget_" ).length() ); - ( (QDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s.utf8() ); } } @@ -1605,7 +1605,7 @@ void AddActionToToolBarCommand::execute() toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else @@ -1620,7 +1620,7 @@ void AddActionToToolBarCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; // ### fix it for nested actiongroups if ( o->inherits( "QDesignerAction" ) ) { @@ -1644,13 +1644,13 @@ void AddActionToToolBarCommand::unexecute() if ( action->inherits( "QDesignerAction" ) ) { TQString s = ( (QDesignerAction*)action )->widget()->name(); s.prepend( "qt_dead_widget_" ); - ( (QDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s.utf8() ); } toolBar->removeAction( action ); action->removeFrom( toolBar ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { TQObjectList clo = action->childrenListObject(); @@ -1659,7 +1659,7 @@ void AddActionToToolBarCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( toolBar ); @@ -1680,7 +1680,7 @@ AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow void AddActionToPopupCommand::execute() { - if ( action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( action->inherits( "TQActionGroup" ) ) { if ( ( (TQActionGroup*)action )->usesDropDown() ) { action->addTo( popup ); popup->insertAction( index, action ); @@ -1693,7 +1693,7 @@ void AddActionToPopupCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; QDesignerAction *ac = (QDesignerAction*)o; popup->insertAction( index + (i++), ac ); @@ -1717,7 +1717,7 @@ void AddActionToPopupCommand::unexecute() action->removeFrom( popup ); popup->removeAction( action ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { TQObjectList clo = action->childrenListObject(); @@ -1726,7 +1726,7 @@ void AddActionToPopupCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( popup ); @@ -1750,9 +1750,9 @@ void AddMenuCommand::execute() TQString n = "PopupMenu"; popup = new QDesignerPopupMenu( mainWindow ); formWindow()->unify( TQT_TQOBJECT(popup), n, true ); - popup->setName( n ); + popup->setName( n.utf8() ); } - if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) { + if ( !mainWindow->child( 0, "TQMenuBar" ) ) { menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow ); menuBar->setName( "menubar" ); } else { @@ -1828,7 +1828,7 @@ void AddToolBarCommand::execute() toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; formWindow()->unify( TQT_TQOBJECT(toolBar), n, true ); - toolBar->setName( n ); + toolBar->setName( n.utf8() ); mainWindow->addToolBar( toolBar, n ); } else { toolBar->show(); diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 2f1683aa..19374617 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -216,9 +216,6 @@ <property name="text"> <string>&Disconnect</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -253,9 +250,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -273,9 +267,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string>Alt+C</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -345,9 +336,6 @@ <property name="text"> <string>Co&nnect</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -404,15 +392,9 @@ <slot access="protected">cancelClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 2ca7934d..aa1c9f61 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -105,7 +105,7 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r for (TQPtrDictIterator<TQWidget> it(*m_formWindow->widgets()); it.current(); ++it) { if (it.current()->isVisibleTo(this) && - !it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && + !it.current()->inherits("TQLayoutWidget") && !it.current()->inherits("Spacer") && qstrcmp(it.current()->name(), "central widget") && !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) && @@ -194,8 +194,8 @@ void ConnectionEditor::connectClicked() return; MetaDataBase::Connection conn; conn.sender = m_sender; - conn.signal = signalBox->currentText(); - conn.slot = slotBox->currentText(); + conn.signal = signalBox->currentText().utf8(); + conn.slot = slotBox->currentText().utf8(); conn.receiver = m_receiver; TDEListViewItem *i = new TDEListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(), conn.slot); diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui index e6f7fc15..f0bad338 100644 --- a/kommander/editor/formsettings.ui +++ b/kommander/editor/formsettings.ui @@ -330,9 +330,8 @@ <slot>okClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 70796291..1c294adc 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -165,7 +165,7 @@ void FormWindow::init() this, TQT_SLOT(modificationChanged(bool))); buffer = 0; - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); setMainContainer(w); propertyWidget = TQT_TQOBJECT(w); targetContainer = 0; @@ -297,7 +297,7 @@ void FormWindow::insertWidget() bool useSizeHint = !oldRectValid || (currRect.width() < 2 && currRect.height() < 2); Qt::Orientation orient =Qt::Horizontal; TQString n = WidgetDatabase::className(currTool); - if (useSizeHint && (n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (useSizeHint && (n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar")) { TQPopupMenu m(mainWindow()); m.insertItem(i18n("&Horizontal")); int ver = m.insertItem(i18n("&Vertical")); @@ -333,7 +333,7 @@ void FormWindow::insertWidget() TQString s = w->name(); unify(TQT_TQOBJECT(w), s, true); - w->setName(s); + w->setName(s.utf8()); insertWidget(w); TQRect r(currRect); if (!oldRectValid || (currRect.width() < 2 && currRect.height() < 2)) @@ -415,7 +415,7 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) if (checkName) { TQString s = w->name(); unify(TQT_TQOBJECT(w), s, true); - w->setName(s); + w->setName(s.utf8()); } MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -463,7 +463,7 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w))) w = w->parentWidget(); - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget) { e->accept(); @@ -524,7 +524,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) // unselect its childs if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); setPropertyShowingBlocked(true); for (TQObject *o = l->first(); o; o = l->next()) { @@ -636,7 +636,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) { int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(wid))); if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && - !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + !wid->inherits("TQLayoutWidget") && !wid->inherits("TQSplitter")) { insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; @@ -795,7 +795,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) wid = designerWidget(TQT_TQOBJECT(wid)); if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) newReceiver = wid; - if (newReceiver && (newReceiver->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) + if (newReceiver && (newReceiver->inherits("TQLayoutWidget") || newReceiver->inherits("Spacer"))) newReceiver = (TQWidget*)connectReceiver; drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); @@ -881,15 +881,15 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) for (TQMap < ulong, TQPoint >::Iterator it = moving.begin(); it != moving.end(); ++it) { TQWidget *i = (TQWidget *) it.key(); - if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING)) + if (!emitSelChanged && i->inherits("TQButton")) { - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || - wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup") || + wa->inherits("TQButtonGroup")) emitSelChanged = true; - if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (!wa->inherits("TQButtonGroup")) { MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false); - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup")) ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } } @@ -1061,7 +1061,7 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) } if (!e->isAccepted()) { - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); if (!l) return; if (l->find(TQT_TQOBJECT(w)) != -1) @@ -1096,7 +1096,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) return; } - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && w == ((TQMainWindow *) mainContainer())->centralWidget()) { TQObject *opw = propertyWidget; @@ -1281,7 +1281,7 @@ void FormWindow::endRectDraw() void FormWindow::selectWidgets() { - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1340,7 +1340,7 @@ void FormWindow::redo() void FormWindow::raiseChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (!l || !l->first()) { delete l; @@ -1358,7 +1358,7 @@ void FormWindow::raiseChildSelections(TQWidget * w) void FormWindow::updateChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) { checkedSelectionsForMove = true; - TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *l = w->parentWidget()->queryList("TQWidget", 0, false, false); moving.clear(); if (l) { @@ -1686,7 +1686,7 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete(true); - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); stackedWidgets = MetaDataBase::tabOrder(this); if (l) { @@ -1811,7 +1811,7 @@ static void find_accel(const TQString & txt, TQMap < TQChar, TQWidgetList > &acc void FormWindow::checkAccels() { TQMap < TQChar, TQWidgetList > accels; - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1883,7 +1883,7 @@ void FormWindow::selectAll() { checkedSelectionsForMove = false; blockSignals(true); - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -2041,7 +2041,7 @@ void FormWindow::breakLayout(TQWidget * w) Command *cmd = breakLayoutCommand(w); if (cmd) commands.insert(0, cmd); - if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (!w->inherits("TQLayoutWidget") && !w->inherits("TQSplitter")) break; } w = w->parentWidget(); @@ -2093,7 +2093,7 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const w = WidgetFactory::containerOfWidget(w); if (!w) return false; - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (!l || !l->first()) { delete l; @@ -2291,7 +2291,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) TQAction *a = 0; for (a = actions.first(); a; a = actions.next()) { - TQObjectList *l = a->queryList(TQACTION_OBJECT_NAME_STRING); + TQObjectList *l = a->queryList("TQAction"); al.append(a); for (TQObject *ao = l->first(); ao; ao = l->next()) al.append((TQAction*)ao); @@ -2310,11 +2310,11 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) } } - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (mainContainer()->inherits("TQMainWindow")) { if (!found) { - TQObjectList *l = mainContainer()->queryList(TQDOCKWINDOW_OBJECT_NAME_STRING, 0, true); + TQObjectList *l = mainContainer()->queryList("TQDockWindow", 0, true); for (TQObject *o = l->first(); o; o = l->next()) if (o != w && !qstrcmp(o->name(), s.latin1())) { @@ -2361,7 +2361,7 @@ bool FormWindow::isDatabaseWidgetUsed() const { #ifndef TQT_NO_SQL TQStringList dbClasses; - dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here + dbClasses << "TQDataTable"; // add more here TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current(); ++it) { @@ -2451,9 +2451,9 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) } for (; it.current(); ++it) { - if (it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQLayoutWidget")) continue; - if (it.current()->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQSplitter")) continue; if (!it.current()->isVisibleTo(this)) continue; @@ -2546,7 +2546,7 @@ TQAction *FormWindow::findAction(const TQString &name) { if (TQString(a->name()) == name) return a; - TQAction *ac = (TQAction*)a->child(name.latin1(), TQACTION_OBJECT_NAME_STRING); + TQAction *ac = (TQAction*)a->child(name.latin1(), "TQAction"); if (ac) return ac; } @@ -2555,7 +2555,7 @@ TQAction *FormWindow::findAction(const TQString &name) void FormWindow::killAccels(TQObject *top) { - TQObjectList *l = top->queryList(TQACCEL_OBJECT_NAME_STRING); + TQObjectList *l = top->queryList("TQAccel"); if (!l) return; for (TQObject *o = l->first(); o; o = l->next()) @@ -2565,7 +2565,7 @@ void FormWindow::killAccels(TQObject *top) bool FormWindow::isCentralWidget(TQObject *w) const { - if (!mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (!mainContainer()->inherits("TQMainWindow")) return false; return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget()); } diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 005d2261..707e9921 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -544,9 +544,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -561,9 +558,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -696,27 +690,13 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextbrowser.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index 37ae23ab..c1c3f41d 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -279,7 +279,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (type == TQSTRING_OBJECT_NAME_STRING) + if (type == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -336,7 +336,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) + if (m_function.argumentType(i) == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -362,8 +362,8 @@ TQString FunctionsDialog::params() TQString s = edits[i]->text(); if (!s.isEmpty() || i < m_function.minArg()) { - if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) - || (slotsShown && labels[i]->text().startsWith(TQSTRING_OBJECT_NAME_STRING)) ) ) + if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == "TQString") + || (slotsShown && labels[i]->text().startsWith("TQString")) ) ) s = '"' + s + '"'; pars.append(s); } diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index df8beeb5..116b75a5 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -255,11 +255,11 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } if ( !formWindow->widgets()->find( w ) ) { - if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + if ( w->parent() && w->parent()->inherits( "TQWidgetStack" ) && w->parent()->parent() && - ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { - if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + ( w->parent()->parent()->inherits( "TQTabWidget" ) || + w->parent()->parent()->inherits( "TQWizard" ) ) ) { + if ( w->parent()->parent()->inherits( "TQTabWidget" ) ) ( (TQTabWidget*)w->parent()->parent() )->showPage( w ); else ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); @@ -356,7 +356,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { bool fakeMainWindow = false; - if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( o && o->inherits( "TQMainWindow" ) ) { TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); if ( cw ) { o = cw; @@ -365,7 +365,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) } TQListViewItem *item = 0; TQString className = WidgetFactory::classNameOf( o ); - if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) { + if ( o->inherits( "TQLayoutWidget" ) ) { switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; @@ -387,11 +387,11 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) #endif TQString name = o->name(); - if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + if ( o->parent() && o->parent()->inherits( "TQWidgetStack" ) && o->parent()->parent() ) { - if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( o->parent()->parent()->inherits( "TQTabWidget" ) ) name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); - else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + else if ( o->parent()->parent()->inherits( "TQWizard" ) ) name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } @@ -403,7 +403,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( fakeMainWindow ) { name = o->parent()->name(); - className = TQMAINWINDOW_OBJECT_NAME_STRING; + className = "TQMainWindow"; } if ( !parent ) @@ -412,7 +412,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo ); if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); - else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + else if ( o->inherits( "TQLayoutWidget") ) item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) ); else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). @@ -429,16 +429,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( it.current()->parent() && - ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && - it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + ( it.current()->parent()->inherits( "TQTabWidget" ) || + it.current()->parent()->inherits( "TQWizard" ) ) && + it.current()->inherits( "TQWidgetStack" ) ) { TQObject *obj = it.current(); - TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); + TQObjectList *l2 = obj->queryList( "TQWidget", 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQTabWidget" ) ) tw = (QDesignerTabWidget*)it.current()->parent(); - if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQWizard" ) ) dw = (QDesignerWizard*)it.current()->parent(); TQWidgetStack *stack = (TQWidgetStack*)obj; for ( obj = l2->last(); obj; obj = l2->prev() ) { @@ -495,7 +495,7 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( w->isVisibleTo( formWindow ) ) { - if ( !w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + if ( !w->inherits( "TQTabWidget" ) && !w->inherits( "TQWizard" ) ) { if ( !normalMenu ) normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this ); normalMenu->popup( p ); @@ -514,13 +514,13 @@ void HierarchyList::addTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { TQTabWidget *tw = (TQTabWidget*)w; AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow, wiz, "Page" ); @@ -534,7 +534,7 @@ void HierarchyList::removeTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; @@ -544,7 +544,7 @@ void HierarchyList::removeTabPage() formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; @@ -677,7 +677,7 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & ) void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) { TQWidget *w2 = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w2 = ( (TQMainWindow*)w )->centralWidget(); listview->changeNameOf( w2, w->name() ); } diff --git a/kommander/editor/kmdr-editor.desktop b/kommander/editor/kmdr-editor.desktop index 00362dfa..4ca38a13 100644 --- a/kommander/editor/kmdr-editor.desktop +++ b/kommander/editor/kmdr-editor.desktop @@ -1,129 +1,13 @@ [Desktop Entry] -GenericName=Dynamic Dialog Editor -GenericName[bg]=Редактор за диалогови прозорци -GenericName[ca]=Editor de diàlegs dinàmics -GenericName[cs]=Editor dynamických dialogů -GenericName[da]=Dynamisk dialog-editor -GenericName[de]=Editor für dynamische Dialoge -GenericName[el]=Επεξεργαστής δυναμικών διαλόγων -GenericName[en_GB]=Dynamic Dialogue Editor -GenericName[es]=Editor de cuadros de diálogo dinámicos -GenericName[et]=Dünaamiliste dialoogide redaktor -GenericName[eu]=Elkarrizketa editore dinamikoa -GenericName[fa]=ویرایشگر محاورۀ پویا -GenericName[fi]=Dynaamisten dialogien editori -GenericName[fr]=Éditeur dynamique de boîtes de dialogue -GenericName[gl]=Editor de diálogos dinámicos -GenericName[hi]=गतिशील संवाद संपादक -GenericName[hu]=Párbeszédablak-szerkesztő -GenericName[is]=Dynamic Dialog ritillinn -GenericName[it]=Editor per le maschere dinamiche -GenericName[ja]=動的ダイアログエディタ -GenericName[ka]=დინამიურ დიალოგთა რედაქტორი -GenericName[lt]=Dinaminė dialogų rengyklė -GenericName[ms]=Penyunting Dialog Dinamik -GenericName[nds]=Editor för dünaamsch Dialogen -GenericName[ne]=गतिशील संवाद सम्पादक -GenericName[nl]=Dynamische dialoog-editor -GenericName[pl]=Edytor do dynamicznych okien dialogowych -GenericName[pt]=Editor de Diálogos Dinâmicos -GenericName[pt_BR]=Editor de Diálogo Dinâmico -GenericName[ru]=Редактор диалогов -GenericName[sk]=Dynamický editor dialógov -GenericName[sl]=Urejevalnik dinamičnih pogovornih oken -GenericName[sr]=Уређивач динамичких дијалога -GenericName[sr@Latn]=Uređivač dinamičkih dijaloga -GenericName[sv]=Editor för dynamiska dialogrutor -GenericName[ta]=நிகழும் உரையாடல் திருத்தி -GenericName[tg]=Муҳаррири диалоги динамика -GenericName[tr]=Dinamik Diyalog Düzenleyicisi -GenericName[uk]=Динамічний редактор вікон -GenericName[zh_CN]=动态对话框编辑器 -GenericName[zh_HK]=動態對話盒編輯器 -GenericName[zh_TW]=動態對話盒編輯器 Name=Kommander Editor -Name[br]=Aozer Kommander -Name[ca]=Editor Kommander -Name[cs]=Editor Kommanderu -Name[da]=Kommander-editor -Name[de]=Kommander-Editor -Name[el]=Επεξεργαστής Kommander -Name[et]=Redaktor Kommander -Name[eu]=Kommander editorea -Name[fa]=ویرایشگر Kommander -Name[fi]=Komentoeditori -Name[fr]=Éditeur Kommander -Name[ga]=Eagarthóir Kommander -Name[hi]=कमांडर संपादक -Name[hu]=Kommander -Name[is]=Kommander ritillinn -Name[it]=Editor Kommander -Name[ja]=Kommander エディタ -Name[lt]=Kommander rengyklė -Name[ms]=Penyunting Kommander -Name[nds]=Kommander-Editor -Name[ne]=आदेश सम्पादक -Name[pa]=Kommander ਸੰਪਾਦਕ -Name[pl]=Edytor Kommander -Name[pt]=Editor do Kommander -Name[pt_BR]=Editor Kommander -Name[ru]=Редактор Kommander -Name[sl]=Urejevalnik Kommander -Name[sr]=Kommander уређивач -Name[sr@Latn]=Kommander uređivač -Name[sv]=Kommander editor -Name[ta]=Kகட்டளைத் திருத்தி -Name[tg]=Муҳаррири Kommander -Name[tr]=Kommander Düzenleyici -Name[uk]=Редактор Kommander -Name[zh_CN]=Kommander 编辑器 -Name[zh_HK]=Kommander 編輯器 -Name[zh_TW]=Kommander 編輯器 + +GenericName=Dynamic Dialog Editor + +Comment=Dynamic Dialog Editor + +Type=Application Exec=kmdr-editor %F Icon=kommander -Type=Application -Comment=Dynamic Dialog Editor -Comment[bg]=Редактор за диалогови прозорци -Comment[ca]=Editor de diàlegs dinàmics -Comment[cs]=Editor dynamických dialogů -Comment[da]=Dynamisk dialog-editor -Comment[de]=Editor für dynamische Dialoge -Comment[el]=Επεξεργαστής δυναμικών διαλόγων -Comment[en_GB]=Dynamic Dialogue Editor -Comment[es]=Editor de cuadros de diálogo dinámicos -Comment[et]=Dünaamiliste dialoogide redaktor -Comment[eu]=Elkarrizketa editore dinamikoa -Comment[fa]=ویرایشگر محاورۀ پویا -Comment[fi]=Dynaamisten dialogien editori -Comment[fr]=Éditeur dynamique de boîtes de dialogue -Comment[gl]=Editor de diálogos dinámicos -Comment[hi]=गतिशील संवाद संपादक -Comment[hu]=Párbeszédablak-szerkesztő -Comment[is]=Dynamic Dialog ritillinn -Comment[it]=Editor per le maschere dinamiche -Comment[ja]=動的ダイアログエディタ -Comment[ka]=დინამიურ დიალოგთა რედაქტორი -Comment[lt]=Dinaminė dialogų rengyklė -Comment[ms]=Penyunting Dialog Dinamik -Comment[nds]=Editor för dünaamsch Dialogen -Comment[ne]=गतिशील संवाद सम्पादक -Comment[nl]=Dynamische dialoog-editor -Comment[pl]=Edytor do dynamicznych okien dialogowych -Comment[pt]=Editor de diálogos dinâmicos -Comment[pt_BR]=Editor de Diálogo Dinâmico -Comment[ru]=Динамический редактор диалогов -Comment[sk]=Dynamický editor dialógov -Comment[sl]=Urejevalnik dinamičnih pogovornih oken -Comment[sr]=Уређивач динамичких дијалога -Comment[sr@Latn]=Uređivač dinamičkih dijaloga -Comment[sv]=Editor för dynamiska dialogrutor -Comment[ta]=நிகழும் உரையாடல் திருத்தி -Comment[tg]=Муҳаррири диалоги динамика -Comment[tr]=Dinamik Diyalog Düzenleyicisi -Comment[uk]=Динамічний редактор вікон -Comment[zh_CN]=动态对话框编辑器 -Comment[zh_HK]=動態對話盒編輯器 -Comment[zh_TW]=動態對話盒編輯器 MimeType=application/x-kommander; X-DocPath=kommander/index.html Categories=Qt;TDE;Development; diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 8c35f8e6..026b39f4 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -159,13 +159,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + needReparent = needMove || layoutBase->inherits( "TQLayoutWidget" ) || layoutBase->inherits( "TQSplitter" ); if ( !layoutBase ) { if ( !useSplitter ) - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -191,7 +191,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout ) TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } } @@ -208,11 +208,11 @@ void Layout::undoLayout() } formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } else { layoutBase->setGeometry( oldGeometry ); } @@ -231,11 +231,11 @@ void Layout::breakLayout() rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || - qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; + bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) @@ -254,7 +254,7 @@ void Layout::breakLayout() parent = layoutBase->parentWidget(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } else { parent = layoutBase; } @@ -313,13 +313,13 @@ void HorizontalLayout::doLayout() layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( layoutBase->inherits( "TQSplitter" ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); finishLayout( needMove, layout ); @@ -377,13 +377,13 @@ void VerticalLayout::doLayout() layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( layoutBase->inherits( "TQSplitter" ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); finishLayout( needMove, layout ); @@ -749,7 +749,7 @@ void GridLayout::doLayout() } else { layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 0abb7de2..5ff1b6fb 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -18,6 +18,14 @@ **********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef TQTDOCDIR +#define TQTDOCDIR "/usr/share/tqt3/doc/html" +#endif + #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> @@ -118,7 +126,7 @@ static TQString textNoAccel(const TQString& text) MainWindow::MainWindow(bool asClient) : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader), grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true), - docPath("$TQTDIR/doc/html"), client(asClient), databaseAutoEdit(false), previewing(false) + docPath(TQTDOCDIR), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); @@ -179,16 +187,16 @@ MainWindow::MainWindow(bool asClient) readConfig(); // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQWIDGET_OBJECT_NAME_STRING), this, 0, false); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQWidget"), this, 0, false); delete w; w = WidgetFactory::create(WidgetDatabase::idFromClassName("Dialog"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQLABEL_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQLabel"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQTABWIDGET_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQTabWidget"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false); delete w; assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath()); @@ -463,70 +471,6 @@ void MainWindow::runForm() } -void MainWindow::runForm4() -{ - if (previewing) - { - KMessageBox::information(this, i18n("There is a dialog already running."), i18n("Run")); - return; - } - FormWindow* form = activeForm(); - if (!form || !form->formFile()) - return; - - TQObjectList *editors = queryList("AssocTextEditor"); - TQObjectListIt it(*editors); - TQObject *editor; - - while ((editor = it.current()) != 0L) - { - ++it; - static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save(); - } - delete editors; - - if (form->formFile()->hasTempFileName()) - { - if (!form->formFile()->saveAs()) - return; - } - - m_fileName = form->formFile()->fileName(); - m_backupName = m_fileName + ".running"; - m_modified = form->formFile()->isModified(); - - bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); - struct stat statbuf; - ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName)); - return; - } - form->formFile()->setFileName(m_fileName); - if (!readOnlyFile || m_modified) - form->formFile()->setModified(true); - if (form->formFile()->save(false)) - { - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup")); - } - ::chmod(m_fileName.local8Bit(), S_IRWXU); - TDEProcess* process = new TDEProcess; - process->setUseShell(true); - (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); - messageLog->clear(MessageLog::All); - previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); - } -} - - void MainWindow::closeRunningForm(TDEProcess* process) { previewing = false; @@ -630,28 +574,28 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || - (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && + (o->inherits("TQComboBox") || o->inherits("TQToolButton") || o->inherits("QDesignerToolBarSeparator")) && o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; - if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) + if (w->inherits("TQToolButton") || w->inherits("TQComboBox") || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); if (!o->inherits("QDesignerToolBar")) - return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); + return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") && + !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator"); } pw = pw->parentWidget(); } } - if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) + if (o && (o->inherits("QDesignerToolBar") || o->inherits("TQDockWindowHandle")) && e->type() == TQEvent::ContextMenu) break; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -677,7 +621,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) lastPressWidget = 0; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -694,10 +638,10 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) w = isAFormWindowChild(o); if (lastPressWidget != (TQWidget*)o && w && !o->inherits("SizeHandle") && !o->inherits("OrderIndicator") && - !o->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + !o->inherits("TQPopupMenu") && !o->inherits("TQMenuBar") && + !o->inherits("TQSizeGrip")) return true; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (lastPressWidget != (TQWidget*)o || (!w || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))) @@ -718,8 +662,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { - if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + if (o && o->inherits("TQToolButton") && ((TQToolButton*)o)->isOn() && + o->parent() && o->parent()->inherits("TQToolBar") && formWindow()) formWindow()->setToolFixed(); break; } @@ -808,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->parent() && o->parent()->inherits("TQWizard") && !o->inherits("TQPushButton")) return 0; while (o) { if (o->inherits("FormWindow")) @@ -1013,18 +957,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w) { const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); - if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (text && qstrcmp(text->type(), "TQString") != 0) text = 0; const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); - if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (title && qstrcmp(title->type(), "TQString") != 0) title = 0; const TQMetaProperty* pagetitle = w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); - if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (pagetitle && qstrcmp(pagetitle->type(), "TQString") != 0) pagetitle = 0; const TQMetaProperty* pixmap = w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); - if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) + if (pixmap && qstrcmp(pixmap->type(), "TQPixmap") != 0) pixmap = 0; if (text && text->designable(w) || @@ -1038,7 +982,7 @@ void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> ids << (id = rmbWidgets->insertItem(i18n("Choose Pixmap..."), -1, 0)); props.insert("pixmap", id); } - if (text && text->designable(w) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) { + if (text && text->designable(w) && !w->inherits("TQTextEdit")) { ids << (id = rmbWidgets->insertItem(i18n("Edit Text..."), -1, 0)); props.insert("text", id); } @@ -1068,7 +1012,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((QDesignerTabWidget*)w)->count() > 1) { @@ -1078,7 +1022,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((TQToolBox*)w)->count() > 1) { @@ -1113,7 +1057,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); @@ -1131,7 +1075,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbFormWindow->insertItem(i18n("Edit Pages..."), -1, 0)); commands.insert("edit", id); - } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); ids << (id = rmbFormWindow->insertItem(i18n("Add Menu Item"), -1, 0)); @@ -1146,7 +1090,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg if (id == props[ "text" ]) { bool ok = false; TQString text; - if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { @@ -1211,7 +1155,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands editor->show(); } - if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { TQTabWidget *tw = (TQTabWidget*)w; if (id == commands[ "add" ]) { AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1229,7 +1173,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } } } - if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { TQToolBox *tw = (TQToolBox*)w; if (id == commands[ "add" ]) { AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1264,7 +1208,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } - if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if (id == commands[ "add" ]) { AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(), @@ -1297,7 +1241,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands cmd->execute(); } } - } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if (id == commands[ "add_toolbar" ]) { AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw); @@ -1632,7 +1576,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) if (text && text->designable(w)) { bool ok = false; TQString text; - if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 69f06c5f..16c143f6 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -192,7 +192,6 @@ public slots: void configureEditor(); void runForm(); - void runForm4(); private slots: void activeWindowChanged( TQWidget *w ); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index eb8fd6b3..0cb60acc 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -19,10 +19,6 @@ #include "mainwindow.h" -#ifdef QT_NO_SQL -#define TQT_NO_SQL -#endif // QT_NO_SQL - #include <tqapplication.h> #include <tqclipboard.h> #include <tqfileinfo.h> @@ -480,14 +476,6 @@ void MainWindow::setupRunActions() connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(menu); - // add KDE4 executor - - TDEAction* b = new TDEAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT(runForm4()), actionCollection(), "run4"); - b->setToolTip(i18n("Executes dialog in KDE4")); - b->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), b, TQT_SLOT(setEnabled(bool))); - b->plug(menu); } void MainWindow::setupWindowActions() @@ -785,7 +773,7 @@ void MainWindow::fileCreateTemplate() for (i = 0; i < WidgetDatabase::count(); ++i) { if (WidgetDatabase::isContainer(i) && !WidgetDatabase::isForm(i) && - WidgetDatabase::className(i) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::widgetGroup(i) != "Temp") + WidgetDatabase::className(i) != "TQTabWidget" && WidgetDatabase::widgetGroup(i) != "Temp") { dia.listClass->insertItem(WidgetDatabase::className(i)); } diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 23e97618..c1fb461c 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -280,7 +280,7 @@ int MetaDataBase::spacing( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQMainWindow" ) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); if ( !r || !o->isWidgetType() ) { @@ -318,7 +318,7 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQMainWindow" ) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { @@ -477,7 +477,7 @@ void MetaDataBase::doConnections( TQObject *o ) slotList.find( conn.slot ) == -1 ) continue; - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } } @@ -1019,7 +1019,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true ); - if ( slotList.find( normalizeSlot( slot ) ) != -1 ) + if ( slotList.find( normalizeSlot(slot).utf8() ) != -1 ) return true; for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 7b8e330b..5aeafc5d 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -56,7 +56,7 @@ void FormItem::insert() TQString n = "Form" + TQString::number(++_forms); FormWindow *fw = 0; FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true); - fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n); + fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n.utf8()); MetaDataBase::addEntry(TQT_TQOBJECT(fw)); TQWidget *w = 0L; if (fType == Dialog) @@ -107,7 +107,7 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace) int i = 1; while (lst.findIndex(n) != -1) n = origName + TQString::number(i++); - fw->setName(n); + fw->setName(n.utf8()); fw->setCaption(n); } diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index cadcb3f5..ceabd80d 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -510,9 +510,8 @@ <slot access="protected">paletteSelected(int)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>previewframe.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">previewframe.h</include> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui index 78fcb222..3e0cab3b 100644 --- a/kommander/editor/paletteeditoradvanced.ui +++ b/kommander/editor/paletteeditoradvanced.ui @@ -758,9 +758,7 @@ <slot>showHelp()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/pics/CMakeLists.txt b/kommander/editor/pics/CMakeLists.txt new file mode 100644 index 00000000..04f2e9ba --- /dev/null +++ b/kommander/editor/pics/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES kommandersplash.png toolbox.png tdefontcombo.png + DESTINATION ${DATA_INSTALL_DIR}/kommander/pics +) diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index 224bbe72..7a2bd85e 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -1016,7 +1016,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.contains( ext ) ) { + if ( fmts.contains( ext.utf8() ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 98cfd39c..6ac39c22 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -25,7 +25,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) : PreviewWidgetBase( parent, name ) { // install event filter on child widgets - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); TQObjectListIt it(*l); TQObject * obj; while ((obj = it.current()) != 0) { diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index f105a4e8..57d31eed 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -842,7 +842,7 @@ TQDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new TQDateEdit( listview->viewport() ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -919,7 +919,7 @@ TQTimeEdit *PropertyTimeItem::lined() lin = new TQTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -994,7 +994,7 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() lin = new TQDateTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -1163,7 +1163,7 @@ TQSpinBox *PropertyIntItem::spinBox() spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() ); spinBx->hide(); spinBx->installEventFilter( listview ); - TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -1256,7 +1256,7 @@ TQComboBox *PropertyListItem::combo() this, TQT_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { - TQObjectList *ol = comb->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = comb->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -2194,14 +2194,10 @@ void PropertyPaletteItem::getPalette() return; bool ok = false; TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); - if ( w->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQScrollView" ) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), -#if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->topLevelWidget(), -#else w->backgroundMode(), listview, -#endif "choose_palette", listview->propertyEditor()->formWindow() ); if ( !ok ) return; @@ -2500,7 +2496,7 @@ static TQVariant::Type type_to_variant( const TQString &s ) #ifndef TQT_NO_SQL static bool parent_is_data_aware( TQObject *o ) { - if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQWidget" ) ) return false; TQWidget *w = (TQWidget*)o; TQWidget *p = w->parentWidget(); @@ -2575,7 +2571,7 @@ void PropertyList::setupProperties() continue; if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) { + if ( w->inherits( "TQLayoutWidget" ) || w->inherits( "Spacer" ) ) { if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -2618,7 +2614,7 @@ void PropertyList::setupProperties() continue; } } - if ( w->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQActionGroup" ) ) { if ( qstrcmp( p->name(), "usesDropDown" ) == 0 ) continue; if ( qstrcmp( p->name(), "toggleAction" ) == 0 ) @@ -2635,7 +2631,7 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + !editor->widget()->parent()->inherits( "TQButtonGroup" ) ) continue; } @@ -2654,7 +2650,7 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) item->setChanged( true, false ); - if ( !editor->widget()->inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) ) { + if ( !editor->widget()->inherits( "TQMultiLineEdit" ) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) @@ -2665,7 +2661,7 @@ void PropertyList::setupProperties() if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) item->setChanged( true, false ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); - if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQGroupBox" ) ) item->setVisible( false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) @@ -2702,7 +2698,7 @@ void PropertyList::setupProperties() } } - if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && + if ( !w->inherits( "TQSplitter" ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyIntItem( this, item, 0, "layoutSpacing", true ); setPropertyValue( item ); @@ -2713,7 +2709,7 @@ void PropertyList::setupProperties() } - if ( !w->inherits( "Spacer" ) && !w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( !w->inherits( "Spacer" ) && !w->inherits( "TQLayoutWidget" ) && !w->inherits( "TQAction" ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) ) { item = new PropertyTextItem( this, item, 0, "toolTip", true, false ); setPropertyValue( item ); @@ -2726,15 +2722,15 @@ void PropertyList::setupProperties() } #ifndef TQT_NO_SQL - if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) && - !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) { + if ( !editor->widget()->inherits( "TQDataTable" ) && !editor->widget()->inherits( "TQDataBrowser" ) && + !editor->widget()->inherits( "TQDataView" ) && parent_is_data_aware( editor->widget() ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) item->setChanged( true, false ); } - if ( editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) ) { + if ( editor->widget()->inherits( "TQDataTable" ) || editor->widget()->inherits( "TQDataBrowser" ) || editor->widget()->inherits( "TQDataView" ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -2780,7 +2776,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, switch ( t ) { case TQVariant::String: item = new PropertyTextItem( this, item, 0, name, true, - editor->widget()->inherits( TQLABEL_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQTEXTVIEW_OBJECT_NAME_STRING ) ); + editor->widget()->inherits( "TQLabel" ) || editor->widget()->inherits( "TQTextView" ) ); break; case TQVariant::CString: item = new PropertyTextItem( this, item, 0, @@ -2885,7 +2881,7 @@ void PropertyList::valueChanged( PropertyItem *i ) TQString pn( i18n("Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, - i->name(), WidgetFactory::property( editor->widget(), i->name() ), + i->name(), WidgetFactory::property( editor->widget(), i->name().latin1() ), i->value(), i->currentItem(), i->currentItemFromObject() ); cmd->execute(); editor->formWindow()->commandHistory()->addCommand( cmd, true ); @@ -2928,8 +2924,8 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); return true; - } else if ( ( !o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || - ( o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !o->inherits( "TQLineEdit" ) || + ( o->inherits( "TQLineEdit" ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || @@ -2939,12 +2935,12 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) i->setOpen( false ); - } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( "TQComboBox" ) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); return true; } - } else if ( e->type() == TQEvent::FocusOut && o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && editor->formWindow() ) { + } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { TQMouseEvent *me; @@ -3062,7 +3058,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( i->name(), true), true ); + property( editor->widget()->metaObject()->findProperty( i->name().latin1(), true), true ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "alignment" ).toInt(); @@ -3101,9 +3097,9 @@ void PropertyList::setPropertyValue( PropertyItem *i ) if ( p->isSetType() ) ; else if ( p->isEnumType() ) - ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name() ).toInt() ) ); + ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name().latin1() ).toInt() ) ); else - i->setValue( editor->widget()->property( i->name() ) ); + i->setValue( editor->widget()->property( i->name().latin1() ) ); } void PropertyList::setCurrentProperty( const TQString &n ) diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index d9d3fa7d..7aafdbb7 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -303,17 +303,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (TQT_NON_COMMERCIAL) - bool previewMode = MainWindow::self->isPreviewing(); - TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self); - if ( !w ) - return false; - if ( previewMode ) - w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), true ); -#else if ( !createObject( widget, formwindow) ) return false; -#endif if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -363,7 +354,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) slot.returnType = n.attribute( "returnType", "void" ); if ( slot.returnType.isEmpty() ) slot.returnType = "void"; - slot.slot = n.firstChild().toText().data(); + slot.slot = n.firstChild().toText().data().utf8(); if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); @@ -440,13 +431,13 @@ bool Resource::save( TQIODevice* dev ) ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); - if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); - if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); @@ -615,9 +606,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea return; } - if ( obj->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQTabWidget" ) ) { TQTabWidget* tw = (TQTabWidget*) obj; - TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); + TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { @@ -678,7 +669,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</widget>" << endl; } } - else if ( obj->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQWizard" ) ) { TQWizard* wiz = (TQWizard*)obj; for ( int i = 0; i < wiz->pageCount(); ++i ) { TQWidget *w = wiz->page( i ); if ( !w ) @@ -702,7 +693,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( obj->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQMainWindow" ) ) { saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); } else { saveChildrenOf( obj, ts, indent ); @@ -714,9 +705,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) { - if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || obj->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQListBox" ) || obj->inherits( "TQComboBox" ) ) { TQListBox *lb = 0; - if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQListBox" ) ) lb = (TQListBox*)obj; else lb = ( (TQComboBox*)obj )->listBox(); @@ -734,7 +725,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQIconView" ) ) { TQIconView *iv = (TQIconView*)obj; TQIconViewItem *i = iv->firstItem(); @@ -750,7 +741,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQListView" ) ) { TQListView *lv = (TQListView*)obj; int i; for ( i = 0; i < lv->header()->count(); ++i ) { @@ -779,11 +770,11 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) saveItem( lv->firstChild(), ts, indent - 1 ); } #ifndef TQT_NO_TABLE - else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)obj; int i; TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); - bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); + bool isDataTable = table->inherits( "TQDataTable" ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { if ( !table->horizontalHeader()->label( i ).isNull() && table->horizontalHeader()->label( i ).toInt() != i + 1 || @@ -798,7 +789,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( table->horizontalHeader()->iconSet( i ) ) pix.append( new TQPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); - if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !columnFields.isEmpty() ) { + if ( table->inherits( "TQDataTable" ) && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; @@ -937,7 +928,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer TQLayout *layout = 0; QDesignerGridLayout* grid = 0; - if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && + if ( !obj->inherits( "TQSplitter" ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { @@ -989,7 +980,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( !changed.contains( "geometry" ) ) changed << "geometry"; } - } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) + } else if ( w->inherits( "TQLayout" ) ) { // #### should be cleaner (RS) changed << "margin" << "spacing"; } @@ -1017,7 +1008,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) property( w->metaObject()->findProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; - if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && + if ( w->inherits( "TQLabel" ) && qstrcmp( p->name(), "pixmap" ) == 0 && ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; if ( w->inherits( "QDesignerMenuBar" ) && @@ -1066,8 +1057,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); - TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true ); + TQStrList l( p->valueToKeys( w->property( name.latin1() ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { v += l.at( i ); @@ -1079,8 +1070,8 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); - ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true ); + ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name.latin1() ).toInt() ) << "</enum>" << endl; } void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ) @@ -1106,7 +1097,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::Int: num = value.toInt(); - if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); else if ( name == "margin" ) @@ -1124,7 +1115,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::UInt: unum = value.toUInt(); - if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); else if ( name == "margin" ) @@ -1332,7 +1323,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( colspan < 1 ) colspan = 1; - TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); + TQString className = e.attribute( "class", "TQWidget" ); if ( !className.isNull() ) { obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false )); @@ -1344,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay mainContainerSet = true; } w = (TQWidget*)obj; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch ( WidgetFactory::layoutType( layout ) ) { @@ -1368,9 +1359,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay layout = 0; if ( w && formwindow ) { - if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !parent || ( !parent->inherits( "TQToolBox" ) && !parent->inherits( "TQTabWidget" ) && !parent->inherits( "TQWizard" ) ) ) formwindow->insertWidget( w, pasting ); - else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + else if ( parent && ( parent->inherits( "TQToolBox" ) || parent->inherits( "TQTabWidget" ) || parent->inherits( "TQWizard" ) ) ) MetaDataBase::addEntry( TQT_TQOBJECT(w) ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); @@ -1402,14 +1393,14 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, v.toString() ); } @@ -1436,7 +1427,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1470,7 +1461,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)widget; bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1537,14 +1528,14 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ) return; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1553,7 +1544,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } else { new TQListBoxText( lb, txt ); } - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1562,7 +1553,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); - } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1630,7 +1621,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, @@ -1644,9 +1635,9 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true ); - if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) + if ( !obj->inherits( "TQLayout" ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -1720,13 +1711,13 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD v = TQPalette( p ); } else if ( e.tagName() == "enum" && p && p->isEnumType() ) { TQString key( v.toString() ); - v = TQVariant( p->keyToValue( key ) ); + v = TQVariant( p->keyToValue( key.utf8() ) ); } else if ( e.tagName() == "set" && p && p->isSetType() ) { TQString keys( v.toString() ); TQStringList lst = TQStringList::split( '|', keys ); TQStrList l; for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) - l.append( *it ); + l.append( (*it).utf8() ); v = TQVariant( p->keysToValue( l ) ); } @@ -1754,7 +1745,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } } - if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQLayout" ) ) { if ( prop == "spacing" ) { MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); return; @@ -1769,7 +1760,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( pasting ) { TQString s = v.toString(); formwindow->unify( TQT_TQOBJECT(obj), s, true ); - obj->setName( s ); + obj->setName( s.utf8() ); return; } else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { formwindow->setName( v.toCString() ); @@ -1781,7 +1772,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD sp.setHeightForWidth( ( (TQWidget*)obj )->sizePolicy().hasHeightForWidth() ); } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } @@ -1876,7 +1867,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 ); img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" ); } else { - img.loadFromData( (const uchar*)ba, data.length() / 2, format ); + img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() ); } delete [] ba; @@ -1955,7 +1946,7 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQString lang = formwindow->project()->language(); LanguageInterface *iface = langIface; if ( iface && MetaDataBase::hasEvents( lang ) ) { - TQObjectList *l = formwindow->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = formwindow->queryList( "TQWidget" ); l->append( formwindow ); TQPtrList<TQAction> lst = formwindow->actionList(); for ( TQAction *a = lst.first(); a; a = lst.next() ) @@ -1994,12 +1985,12 @@ void Resource::loadConnections( const TQDomElement &e ) if ( n2.tagName() == "sender" ) { conn.sender = 0; TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { + if ( name == "this" || toplevel->name() == name ) { conn.sender = TQT_TQOBJECT(toplevel); } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2009,13 +2000,13 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = formwindow->findAction( name ); } } else if ( n2.tagName() == "signal" ) { - conn.signal = n2.firstChild().toText().data(); + conn.signal = n2.firstChild().toText().data().utf8(); } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { + if ( name == "this" || toplevel->name() == name ) { conn.receiver = TQT_TQOBJECT(toplevel); } else { - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2023,7 +2014,7 @@ void Resource::loadConnections( const TQDomElement &e ) } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } @@ -2060,7 +2051,7 @@ void Resource::loadConnections( const TQDomElement &e ) slot.returnType = n.attribute( "returnType", "void" ); if ( slot.returnType.isEmpty() ) slot.returnType = "void"; - slot.slot = n.firstChild().toText().data(); + slot.slot = n.firstChild().toText().data().utf8(); if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); @@ -2233,7 +2224,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) TQString name = n.firstChild().toText().data(); if ( name.isEmpty() ) continue; - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -2374,10 +2365,10 @@ void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; TQAction *ac = (TQAction*)o; - bool isGroup = ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); + bool isGroup = ac->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2406,7 +2397,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts TQPtrListIterator<TQAction> it( actions ); while ( it.current() ) { TQAction *a = it.current(); - bool isGroup = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); + bool isGroup = a->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2450,7 +2441,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); @@ -2472,7 +2463,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } } @@ -2539,7 +2530,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) { - if ( !mw->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) + if ( !mw->child( 0, "TQMenuBar" ) ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; @@ -2611,7 +2602,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { QDesignerPopupMenu *popup = new QDesignerPopupMenu( mw ); - popup->setName( n.attribute( "name" ) ); + popup->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 25883793..cb07cd7c 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -33,14 +33,14 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); - if ( !editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( !editTable->inherits( "TQDataTable" ) ) { labelFields->hide(); comboFields->hide(); labelTable->hide(); labelTableValue->hide(); } #ifndef TQT_NO_SQL - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { // ## why does this behave weird? // TabWidget->removePage( rows_tab ); // rows_tab->hide(); @@ -48,7 +48,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f TabWidget->setTabEnabled( rows_tab, false ); } - if ( formWindow->project() && editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( formWindow->project() && editTable->inherits( "TQDataTable" ) ) { TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { TQStringList fields; @@ -131,7 +131,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) editColumnText->blockSignals( false ); #ifndef TQT_NO_TABLE - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); @@ -215,7 +215,7 @@ void TableEditor::newColumnClicked() TQListBoxItem *item = listColumns->item( listColumns->count() - 1 ); listColumns->setCurrentItem( item ); listColumns->setSelected( item, true ); - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { comboFields->setFocus(); } else { editColumnText->setFocus(); diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index e3ab6de0..a57c74f1 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -134,35 +134,35 @@ void WidgetDatabase::setupDataBase( int id ) /* Designer widgets */ r = new WidgetDatabaseRecord; r->iconName = "pushbutton.xpm"; - r->name = TQPUSHBUTTON_OBJECT_NAME_STRING; + r->name = "TQPushButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Push Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "toolbutton.xpm"; - r->name = TQTOOLBUTTON_OBJECT_NAME_STRING; + r->name = "TQToolButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Tool Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "radiobutton.xpm"; - r->name = TQRADIOBUTTON_OBJECT_NAME_STRING; + r->name = "TQRadioButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Radio Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "checkbox.xpm"; - r->name = TQCHECKBOX_OBJECT_NAME_STRING; + r->name = "TQCheckBox"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Check Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "groupbox.xpm"; - r->name = TQGROUPBOX_OBJECT_NAME_STRING; + r->name = "TQGroupBox"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Group Box"); r->isContainer = true; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "buttongroup.xpm"; - r->name = TQBUTTONGROUP_OBJECT_NAME_STRING; + r->name = "TQButtonGroup"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Button Group"); r->isContainer = true; @@ -178,7 +178,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "frame.xpm"; - r->name = TQFRAME_OBJECT_NAME_STRING; + r->name = "TQFrame"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Frame"); r->isContainer = true; @@ -186,7 +186,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "tabwidget.xpm"; - r->name = TQTABWIDGET_OBJECT_NAME_STRING; + r->name = "TQTabWidget"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Tabwidget"); r->isContainer = true; @@ -194,14 +194,14 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "listbox.xpm"; - r->name = TQLISTBOX_OBJECT_NAME_STRING; + r->name = "TQListBox"; r->group = widgetGroup("Views"); r->toolTip = i18n("List Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "listview.xpm"; - r->name = TQLISTVIEW_OBJECT_NAME_STRING; + r->name = "TQListView"; r->group = widgetGroup("Views"); r->toolTip = i18n("List View"); append(r); @@ -209,7 +209,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconName = "iconview.xpm"; - r->name = TQICONVIEW_OBJECT_NAME_STRING; + r->name = "TQIconView"; r->group = widgetGroup("Views"); r->toolTip = i18n("Icon View"); append(r); @@ -218,7 +218,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconName = "table.xpm"; - r->name = TQTABLE_OBJECT_NAME_STRING; + r->name = "TQTable"; r->group = widgetGroup("Views"); r->toolTip = i18n("Table"); append(r); @@ -228,7 +228,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datatable.xpm"; r->includeFile = "tqdatatable.h"; - r->name = TQDATATABLE_OBJECT_NAME_STRING; + r->name = "TQDataTable"; r->group = widgetGroup("Database"); r->toolTip = i18n("Data Table"); append(r); @@ -236,21 +236,21 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "lineedit.xpm"; - r->name = TQLINEEDIT_OBJECT_NAME_STRING; + r->name = "TQLineEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "spinbox.xpm"; - r->name = TQSPINBOX_OBJECT_NAME_STRING; + r->name = "TQSpinBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Spin Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dateedit.xpm"; - r->name = TQDATEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -258,7 +258,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "timeedit.xpm"; - r->name = TQTIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datetimeedit.xpm"; - r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date-Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -274,77 +274,77 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "multilineedit.xpm"; - r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING; + r->name = "TQMultiLineEdit"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Multi Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "richtextedit.xpm"; - r->name = TQTEXTEDIT_OBJECT_NAME_STRING; + r->name = "TQTextEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Rich Text Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "combobox.xpm"; - r->name = TQCOMBOBOX_OBJECT_NAME_STRING; + r->name = "TQComboBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Combo Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "slider.xpm"; - r->name = TQSLIDER_OBJECT_NAME_STRING; + r->name = "TQSlider"; r->group = widgetGroup("Input"); r->toolTip = i18n("Slider"); append(r); r = new WidgetDatabaseRecord; r->iconName = "scrollbar.xpm"; - r->name = TQSCROLLBAR_OBJECT_NAME_STRING; + r->name = "TQScrollBar"; r->group = widgetGroup("Input"); r->toolTip = i18n("Scrollbar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dial.xpm"; - r->name = TQDIAL_OBJECT_NAME_STRING; + r->name = "TQDial"; r->group = widgetGroup("Input"); r->toolTip = i18n("Dial"); append(r); r = new WidgetDatabaseRecord; r->iconName = "label.xpm"; - r->name = TQLABEL_OBJECT_NAME_STRING; + r->name = "TQLabel"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Label"); append(r); r = new WidgetDatabaseRecord; r->iconName = "lcdnumber.xpm"; - r->name = TQLCDNUMBER_OBJECT_NAME_STRING; + r->name = "TQLCDNumber"; r->group = widgetGroup("Display"); r->toolTip = i18n("LCD Number"); append(r); r = new WidgetDatabaseRecord; r->iconName = "progress.xpm"; - r->name = TQPROGRESSBAR_OBJECT_NAME_STRING; + r->name = "TQProgressBar"; r->group = widgetGroup("Display"); r->toolTip = i18n("Progress Bar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textview.xpm"; - r->name = TQTEXTVIEW_OBJECT_NAME_STRING; + r->name = "TQTextView"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Text View"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textbrowser.xpm"; - r->name = TQTEXTBROWSER_OBJECT_NAME_STRING; + r->name = "TQTextBrowser"; r->group = widgetGroup("Display"); r->toolTip = i18n("Text Browser"); append(r); @@ -359,19 +359,19 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQWIDGET_OBJECT_NAME_STRING; + r->name = "TQWidget"; r->isForm = true; r->group = widgetGroup("Forms"); append(r); r = new WidgetDatabaseRecord; - r->name = TQDIALOG_OBJECT_NAME_STRING; + r->name = "TQDialog"; r->group = widgetGroup("Forms"); r->isForm = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQWIZARD_OBJECT_NAME_STRING; + r->name = "TQWizard"; r->group = widgetGroup("Forms"); r->isContainer = true; append(r); @@ -383,14 +383,14 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING; + r->name = "TQLayoutWidget"; r->group = widgetGroup("Temp"); r->includeFile = ""; r->isContainer = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQSPLITTER_OBJECT_NAME_STRING; + r->name = "TQSplitter"; r->group = widgetGroup("Temp"); r->includeFile = "tqsplitter.h"; r->isContainer = true; @@ -419,7 +419,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = ""; - r->name = TQMAINWINDOW_OBJECT_NAME_STRING; + r->name = "TQMainWindow"; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup("Temp"); r->isContainer = true; @@ -427,7 +427,7 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; - r->name = TQDATABROWSER_OBJECT_NAME_STRING; + r->name = "TQDataBrowser"; r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup("Database"); r->toolTip = "Data Browser"; @@ -436,7 +436,7 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQDATAVIEW_OBJECT_NAME_STRING; + r->name = "TQDataView"; r->includeFile = "tqdataview.h"; r->group = widgetGroup("Database"); r->toolTip = "Data View"; @@ -849,7 +849,7 @@ TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); TQString n = className( id ); - if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + if ( n == "TQLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' ) n = n.mid( 1 ); @@ -871,7 +871,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); + return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); i = className2Id->find( name ); @@ -916,8 +916,8 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->find( g ) == -1 ) - wGroups->append( g ); + if ( wGroups->find( g.utf8() ) == -1 ) + wGroups->append( g.utf8() ); return g; } @@ -957,7 +957,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->find( g ) == -1; + return invisibleGroups->find( g.utf8() ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 15f9ad1d..339e78d0 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -18,6 +18,10 @@ ** **********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdelocale.h> #include <kommanderfactory.h> @@ -677,29 +681,29 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; - if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && + if ( widget && !widget->inherits( "TQLayoutWidget" ) && ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); gb->layout()->setMargin( 0 ); @@ -811,13 +815,13 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); delete widget->layout(); } @@ -832,7 +836,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { - if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) + if (className == "TQPushButton") { TQPushButton *b = 0; if (init) @@ -844,9 +848,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare b = new QDesignerPushButton(parent, name); } TQWidget *w = find_formwindow(b); - b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING)); + b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits("TQDialog")); return b; - } else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + } else if (className == "TQToolButton") { if (init) { @@ -855,7 +859,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return tb; } return new QDesignerToolButton(parent, name); - } else if (className == TQCHECKBOX_OBJECT_NAME_STRING) + } else if (className == "TQCheckBox") { if (init) { @@ -864,7 +868,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return cb; } return new QDesignerCheckBox(parent, name); - } else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) + } else if (className == "TQRadioButton") { if (init) { @@ -873,17 +877,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return rb; } return new QDesignerRadioButton(parent, name); - } else if (className == TQGROUPBOX_OBJECT_NAME_STRING) + } else if (className == "TQGroupBox") { if (init) return new TQGroupBox(TQString::fromLatin1(name), parent, name); return new TQGroupBox(parent, name); - } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + } else if (className == "TQButtonGroup") { if (init) return new TQButtonGroup(TQString::fromLatin1(name), parent, name); return new TQButtonGroup(parent, name); - } else if (className == TQICONVIEW_OBJECT_NAME_STRING) + } else if (className == "TQIconView") { #if !defined(TQT_NO_ICONVIEW) TQIconView *iv = new TQIconView(parent, name); @@ -893,7 +897,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare #else return 0; #endif - } else if (className == TQTABLE_OBJECT_NAME_STRING) + } else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) if (init) @@ -903,20 +907,20 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return 0; #endif #ifndef TQT_NO_SQL - } else if (className == TQDATATABLE_OBJECT_NAME_STRING) + } else if (className == "TQDataTable") { return new TQDataTable(parent, name); #endif //TQT_NO_SQL - } else if (className == TQDATEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateEdit") { return new TQDateEdit(parent, name); - } else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQTimeEdit") { return new TQTimeEdit(parent, name); - } else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateTimeEdit") { return new TQDateTimeEdit(parent, name); - } else if (className == TQLISTBOX_OBJECT_NAME_STRING) + } else if (className == "TQListBox") { TQListBox *lb = new TQListBox(parent, name); if (init) @@ -925,7 +929,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lb->setCurrentItem(0); } return lb; - } else if (className == TQLISTVIEW_OBJECT_NAME_STRING) + } else if (className == "TQListView") { TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); @@ -935,17 +939,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lv->setCurrentItem(new TQListViewItem(lv, i18n("New Item"))); } return lv; - } else if (className == TQLINEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQLineEdit") return new TQLineEdit(parent, name); - else if (className == TQSPINBOX_OBJECT_NAME_STRING) + else if (className == "TQSpinBox") return new TQSpinBox(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); - else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") { QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) @@ -955,9 +959,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true); } return l; - } else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQLayoutWidget") return new TQLayoutWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") { TQTabWidget *tw = new QDesignerTabWidget(parent, name); if (init) @@ -972,14 +976,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(w)); } return tw; - } else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) + } else if (className == "TQComboBox") { return new TQComboBox(false, parent, name); - } else if (className == TQWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQWidget") { if (parent && - (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING) - || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) + (parent->inherits("FormWindow") || parent->inherits("TQWizard") + || parent->inherits("TQTabWidget") || parent->inherits("TQToolBox") || parent->inherits("TQMainWindow"))) { FormWindow *fw = find_formwindow(parent); if (fw) @@ -990,7 +994,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } } return new TQWidget(parent, name); - } else if (className == TQDIALOG_OBJECT_NAME_STRING) + } else if (className == "TQDialog") { TQDialog *dia = 0; if (parent && parent->inherits("FormWindow")) @@ -1000,7 +1004,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (parent && !parent->inherits("MainWindow")) dia->reparent(parent, TQPoint(0, 0), true); return dia; - } else if (className == TQWIZARD_OBJECT_NAME_STRING) + } else if (className == "TQWizard") { TQWizard *wiz = new QDesignerWizard(parent, name); if (parent && !parent->inherits("MainWindow")) @@ -1030,17 +1034,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else s->setOrientation(Qt::Horizontal); return s; - } else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) + } else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); - else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) + else if (className == "TQProgressBar") return new TQProgressBar(parent, name); - else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) + else if (className == "TQTextView") return new TQTextView(parent, name); - else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) + else if (className == "TQTextBrowser") return new TQTextBrowser(parent, name); - else if (className == TQDIAL_OBJECT_NAME_STRING) + else if (className == "TQDial") return new TQDial(parent, name); - else if (className == TQSLIDER_OBJECT_NAME_STRING) + else if (className == "TQSlider") { TQSlider *s = new TQSlider(parent, name); if (!r) @@ -1052,7 +1056,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(s)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); return s; - } else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) + } else if (className == "TQScrollBar") { TQScrollBar *s = new TQScrollBar(parent, name); if (!r) @@ -1064,7 +1068,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(s)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); return s; - } else if (className == TQFRAME_OBJECT_NAME_STRING) + } else if (className == "TQFrame") { if (!init) return new TQFrame(parent, name); @@ -1085,7 +1089,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else if (r->width() < r->height()) l->setOrientation(Qt::Vertical); return l; - } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) + } else if (className == "TQMainWindow") { TQMainWindow *mw = new KmdrMainWindow(parent, name, 0); mw->setDockEnabled(TQt::DockMinimized, false); @@ -1098,13 +1102,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return mw; } #ifndef TQT_NO_SQL - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") { TQWidget *w = new QDesignerDataBrowser(parent, name); if (parent) w->reparent(parent, TQPoint(0, 0), true); return w; - } else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + } else if (className == "TQDataView") { TQWidget *w = new QDesignerDataView(parent, name); if (parent) @@ -1266,37 +1270,37 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay { layout = 0; - if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQTabWidget" ) ) w = ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) w = ((TQToolBox*)w)->currentItem(); - if ( w && w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWizard" ) ) w = ((TQWizard*)w)->currentPage(); - if ( w && w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQMainWindow" ) ) w = ((TQMainWindow*)w)->centralWidget(); - if ( w && w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWidgetStack" ) ) w = ((TQWidgetStack*)w)->visibleWidget(); - if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQSplitter" ) ) return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); - if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); + if ( w->inherits( "TQGroupBox" ) ) { + TQObjectList *l = TQT_TQOBJECT(lay)->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( lay->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( lay->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( lay->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1306,11 +1310,11 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay */ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1349,15 +1353,15 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQTabWidget" ) ) return ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) return ((TQToolBox*)w)->currentItem(); - if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWizard" ) ) return ((TQWizard*)w)->currentPage(); - if ( w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWidgetStack" ) ) return ((TQWidgetStack*)w)->visibleWidget(); - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) return ((TQMainWindow*)w)->centralWidget(); return w; } @@ -1372,7 +1376,7 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w->parentWidget() && w->parentWidget()->inherits( "TQWidgetStack" ) ) w = w->parentWidget(); while ( w ) { if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || @@ -1391,19 +1395,19 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) + if ( o->inherits( "TQTabBar" ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) return true; - else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQSizeGrip" ) ) return true; - else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQToolButton" ) && o->parent() && o->parent()->inherits( "TQTabBar" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQWizard" ) && o->inherits( "TQPushButton" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQMainWindow" ) && o->inherits( "TQMenuBar" ) ) return true; - else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQDockWindowHandle" ) ) return true; - else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQHideDock" ) ) return true; return false; @@ -1416,7 +1420,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) const char* WidgetFactory::classNameOf( TQObject* o ) { if (o->inherits("QDesignerTabWidget")) - return TQTABWIDGET_OBJECT_NAME_STRING; + return "TQTabWidget"; #ifdef KOMMANDER else if (o->inherits("EditorTabWidget")) return "TabWidget"; @@ -1424,34 +1428,34 @@ const char* WidgetFactory::classNameOf( TQObject* o ) return "ToolBox"; #endif else if (o->inherits("QDesignerDialog")) - return TQDIALOG_OBJECT_NAME_STRING; + return "TQDialog"; else if (o->inherits("QDesignerWidget")) - return TQWIDGET_OBJECT_NAME_STRING; + return "TQWidget"; else if (o->inherits("CustomWidget")) return ((CustomWidget *) o)->realClassName().latin1(); else if (o->inherits("QDesignerLabel")) - return TQLABEL_OBJECT_NAME_STRING; + return "TQLabel"; else if (o->inherits("QDesignerWizard")) - return TQWIZARD_OBJECT_NAME_STRING; + return "TQWizard"; else if (o->inherits("EditorWizard")) return "Wizard"; else if (o->inherits("QDesignerPushButton")) - return TQPUSHBUTTON_OBJECT_NAME_STRING; + return "TQPushButton"; else if (o->inherits("QDesignerToolButton")) - return TQTOOLBUTTON_OBJECT_NAME_STRING; + return "TQToolButton"; else if (o->inherits("QDesignerRadioButton")) - return TQRADIOBUTTON_OBJECT_NAME_STRING; + return "TQRadioButton"; else if (o->inherits("QDesignerCheckBox")) - return TQCHECKBOX_OBJECT_NAME_STRING; + return "TQCheckBox"; else if (o->inherits("QDesignerMenuBar")) - return TQMENUBAR_OBJECT_NAME_STRING; + return "TQMenuBar"; else if (o->inherits("QDesignerToolBar")) - return TQTOOLBAR_OBJECT_NAME_STRING; + return "TQToolBar"; #ifndef TQT_NO_SQL else if (o->inherits("QDesignerDataBrowser")) - return TQDATABROWSER_OBJECT_NAME_STRING; + return "TQDataBrowser"; else if (o->inherits("QDesignerDataView")) - return TQDATAVIEW_OBJECT_NAME_STRING; + return "TQDataView"; #endif else if (o->inherits("EditorDialog")) return "Dialog"; @@ -1469,23 +1473,23 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( !o->inherits( "QDesignerToolBar" ) && !o->inherits( "QDesignerMenuBar" ) ) MetaDataBase::setPropertyChanged( o, "geometry", true ); - if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) ) MetaDataBase::setPropertyChanged( o, "text", true ); else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); MetaDataBase::setPropertyChanged( o, "textPosition", TRUE ); - } else if ( o->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) + } else if ( o->inherits( "TQGroupBox" ) ) MetaDataBase::setPropertyChanged( o, "title", true ); - else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + else if ( o->isA( "TQFrame" ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", true ); MetaDataBase::setPropertyChanged( o, "frameShape", true ); - } else if ( o->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || o->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTabWidget" ) || o->inherits( "TQWizard" ) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", true ); MetaDataBase::setPropertyChanged( o, "pageName", true ); #ifndef TQT_NO_TABLE - } else if ( o->inherits( TQTABLE_OBJECT_NAME_STRING ) && !o->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTable" ) && !o->inherits( "TQDataTable" ) ) { MetaDataBase::setPropertyChanged( o, "numRows", true ); MetaDataBase::setPropertyChanged( o, "numCols", true ); TQTable *t = (TQTable*)o; @@ -1501,7 +1505,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MetaDataBase::setPropertyChanged( o, "itemIconSet", true ); MetaDataBase::setPropertyChanged( o, "itemToolTip", true ); MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", true ); - } else if ( o->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQSplitter" ) ) { MetaDataBase::setPropertyChanged( o, "orientation", true ); } else if ( o->inherits( "QDesignerToolBar" ) ) { MetaDataBase::setPropertyChanged( o, "label", true ); @@ -1528,7 +1532,7 @@ bool WidgetFactory::hasSpecialEditor( int id ) return true; if (className.mid(1) == "IconView") return true; - if (className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + if (className == "TQTextEdit" || className == "TQMultiLineEdit") return true; if (className.contains("Table")) return true; @@ -1557,7 +1561,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #ifdef KOMMANDER if (className == "ComboBox") { - if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) return; TQComboBox *cb = (TQComboBox *) editWidget; @@ -1579,7 +1583,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "TreeWidget") { - if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1589,7 +1593,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "ListBox") { - if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1599,7 +1603,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #endif if (className.mid(1) == "ListBox") { - if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1609,7 +1613,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ComboBox") { - if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) return; TQComboBox *cb = (TQComboBox *) editWidget; ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); @@ -1621,7 +1625,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ListView") { - if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1632,7 +1636,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "IconView") { - if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQIconView")) return; IconViewEditor *e = new IconViewEditor(parent, editWidget, fw); e->exec(); @@ -1640,7 +1644,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, return; } - if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) + if (className == "TQMultiLineEdit" || className == "TQTextEdit") { MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); @@ -1669,7 +1673,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> - findProperty( propName, true ), true ); + findProperty( propName.latin1(), true ), true ); if (!p ) return false; return p->reset( w ); @@ -1687,7 +1691,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) } else if ( propName == "frameworkCode" ) { return TQVariant( true, 0 ); } else if ( propName == "layoutMargin" ) { - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) return TQVariant( 0 ); else if ( MainWindow::self->formWindow() ) return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() ); @@ -1702,7 +1706,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()-> - property( w->metaObject()->findProperty( propName, true ), true ); + property( w->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1751,7 +1755,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; @@ -1825,15 +1829,15 @@ void TQLayoutWidget::updateSizePolicy() TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { parentLayout = ((TQWidget *)parent())->layout(); - if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + if ( parentLayout && parentLayout->mainWidget()->inherits("TQLayoutWidget") ) parentLayout = 0; } TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( layout()->inherits("TQVBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1853,8 +1857,8 @@ void TQLayoutWidget::updateSizePolicy() if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + } else if ( layout()->inherits("TQHBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1874,13 +1878,13 @@ void TQLayoutWidget::updateSizePolicy() if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + } else if ( layout()->inherits("TQGridLayout") ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; - else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + else if ( parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 2341b676..ff0d9c60 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -168,7 +168,7 @@ private: bool mousePressed; }; -class EditorToolBox : public ToolBox +class KDE_EXPORT EditorToolBox : public ToolBox { Q_OBJECT @@ -381,13 +381,13 @@ public: : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -405,13 +405,13 @@ public: : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -430,13 +430,13 @@ public: : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -455,13 +455,13 @@ public: : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } diff --git a/kommander/examples/CMakeLists.txt b/kommander/examples/CMakeLists.txt new file mode 100644 index 00000000..9af8ae8b --- /dev/null +++ b/kommander/examples/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory( current ) +add_subdirectory( old ) +add_subdirectory( tutorial ) diff --git a/kommander/examples/current/CMakeLists.txt b/kommander/examples/current/CMakeLists.txt new file mode 100644 index 00000000..cb28f2a2 --- /dev/null +++ b/kommander/examples/current/CMakeLists.txt @@ -0,0 +1,7 @@ +##### other data + +install( + FILES a1.kmdr b1.kmdr editor-poc.kmdr keyvaluecombo.kmdr + kpartmwframe.kmdr kpartpart.kmdr passvariables.kmdr tableselect.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/current +) diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr index 3b81701d..6e069e9e 100644 --- a/kommander/examples/current/a1.kmdr +++ b/kommander/examples/current/a1.kmdr @@ -49,7 +49,7 @@ debug("pid="+pid)</string> <cstring>StatusBar8</cstring> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -121,7 +121,7 @@ debug("pid="+pid)</string> <string>and again</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout83</cstring> </property> @@ -185,7 +185,7 @@ StatusBar8.setText("Returned: "+b)</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout84</cstring> </property> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 3713cb84..ae8ce00a 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KEdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KEdemo</cstring> </property> @@ -331,7 +331,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <property name="spacing"> <number>6</number> </property> - <widget class=TQSPLITTER_OBJECT_NAME_STRING row="0" column="0" rowspan="2" colspan="2"> + <widget class="TQSplitter" row="0" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>Splitter5</cstring> </property> @@ -586,9 +586,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -603,9 +600,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -620,9 +614,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -634,9 +625,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -651,9 +639,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -665,9 +650,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -682,9 +664,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -699,9 +678,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -716,9 +692,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -733,9 +706,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -750,9 +720,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -767,9 +734,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -781,9 +745,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -795,9 +756,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -809,9 +767,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -840,9 +795,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -871,9 +823,6 @@ TextEdit5.setColor(color)</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr index 489c4f6d..a318d185 100644 --- a/kommander/examples/current/keyvaluecombo.kmdr +++ b/kommander/examples/current/keyvaluecombo.kmdr @@ -63,7 +63,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout27</cstring> </property> @@ -100,7 +100,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout30</cstring> </property> @@ -122,7 +122,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <string>Right click for menu</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>Layout24</cstring> </property> @@ -164,7 +164,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout23</cstring> </property> @@ -227,7 +227,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout31</cstring> </property> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7d15aecf..d723f0e2 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KKPdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KKPdemo</cstring> </property> @@ -58,7 +58,7 @@ </sizepolicy> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -218,9 +218,6 @@ endif</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -235,9 +232,6 @@ endif</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -252,9 +246,6 @@ endif</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -266,9 +257,6 @@ endif</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -283,9 +271,6 @@ endif</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -297,9 +282,6 @@ endif</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -314,9 +296,6 @@ endif</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -331,9 +310,6 @@ endif</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -348,9 +324,6 @@ endif</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -365,9 +338,6 @@ endif</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -382,9 +352,6 @@ endif</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -399,9 +366,6 @@ endif</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -413,9 +377,6 @@ endif</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -427,9 +388,6 @@ endif</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -441,9 +399,6 @@ endif</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -472,9 +427,6 @@ endif</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -503,9 +455,6 @@ endif</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index d6e83b95..c7fc0dbb 100644 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -51,7 +51,7 @@ Because of all this and the fact that the Actions on the unsupported MainWindow This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout70</cstring> </property> diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr index 3d4b848d..96a83fdb 100644 --- a/kommander/examples/current/passvariables.kmdr +++ b/kommander/examples/current/passvariables.kmdr @@ -279,7 +279,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5) </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="7"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr index a7d84367..c227acf0 100644 --- a/kommander/examples/current/tableselect.kmdr +++ b/kommander/examples/current/tableselect.kmdr @@ -51,7 +51,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="3" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -99,7 +99,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/CMakeLists.txt b/kommander/examples/old/CMakeLists.txt new file mode 100644 index 00000000..8b860d42 --- /dev/null +++ b/kommander/examples/old/CMakeLists.txt @@ -0,0 +1,10 @@ +##### other data + +install( + FILES checkmail.kmdr execprogram.kmdr form1.kmdr form3.kmdr + form5.kmdr populate.kmdr selectedwidgettext.kmdr simplelist.kmdr + tidy.kmdr wizard.kmdr ex1.kmdr firstform.kmdr.kmdr form2.kmdr + form4.kmdr newfile.kmdr resize.kmdr settings.kmdr tar.kmdr + widgetgenerator.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/old +) diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr index ea7e9dad..67914305 100644 --- a/kommander/examples/old/execprogram.kmdr +++ b/kommander/examples/old/execprogram.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/old/firstform.kmdr.kmdr b/kommander/examples/old/firstform.kmdr.kmdr index df90066e..454c2a67 100644 --- a/kommander/examples/old/firstform.kmdr.kmdr +++ b/kommander/examples/old/firstform.kmdr.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form2.kmdr b/kommander/examples/old/form2.kmdr index 23e8e372..272c9b7e 100644 --- a/kommander/examples/old/form2.kmdr +++ b/kommander/examples/old/form2.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -73,7 +73,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr index 7a5abe1a..db66649e 100644 --- a/kommander/examples/old/form4.kmdr +++ b/kommander/examples/old/form4.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr index ceba4883..ef7127c2 100644 --- a/kommander/examples/old/form5.kmdr +++ b/kommander/examples/old/form5.kmdr @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -152,7 +152,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> diff --git a/kommander/examples/old/newfile.kmdr b/kommander/examples/old/newfile.kmdr index d74528a0..8fd01660 100644 --- a/kommander/examples/old/newfile.kmdr +++ b/kommander/examples/old/newfile.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Quick Start</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -31,7 +31,7 @@ <string>Title:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/populate.kmdr b/kommander/examples/old/populate.kmdr index 644faadc..565ba3ee 100644 --- a/kommander/examples/old/populate.kmdr +++ b/kommander/examples/old/populate.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr index 92f9806b..7ab76276 100644 --- a/kommander/examples/old/resize.kmdr +++ b/kommander/examples/old/resize.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -65,7 +65,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -73,7 +73,7 @@ <string>Source directory:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -83,7 +83,7 @@ </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -115,7 +115,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -152,7 +152,7 @@ </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr index ddb6d0ba..c91629c9 100644 --- a/kommander/examples/old/selectedwidgettext.kmdr +++ b/kommander/examples/old/selectedwidgettext.kmdr @@ -50,7 +50,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr index b7037ea9..988dc3f9 100644 --- a/kommander/examples/old/settings.kmdr +++ b/kommander/examples/old/settings.kmdr @@ -35,7 +35,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -49,7 +49,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -83,7 +83,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -158,7 +158,7 @@ Items") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/old/simplelist.kmdr b/kommander/examples/old/simplelist.kmdr index 6435f181..f1123039 100644 --- a/kommander/examples/old/simplelist.kmdr +++ b/kommander/examples/old/simplelist.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr index 128f324d..840ac02c 100644 --- a/kommander/examples/old/tar.kmdr +++ b/kommander/examples/old/tar.kmdr @@ -131,7 +131,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -288,7 +288,7 @@ </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -329,7 +329,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -343,7 +343,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -358,7 +358,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -372,7 +372,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -390,7 +390,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index 785b9dcf..e8641450 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -29,7 +29,7 @@ <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -51,7 +51,7 @@ <property name="title"> <string>Non Tidy Option</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -119,7 +119,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -356,7 +356,7 @@ instances of Quanta running.</string> </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -373,7 +373,7 @@ instances of Quanta running.</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -477,7 +477,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -541,7 +541,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -613,7 +613,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -889,7 +889,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index 45f441fa..d4ebfc78 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -274,7 +274,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -288,7 +288,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -296,7 +296,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Author:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -304,7 +304,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Email:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -312,7 +312,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Description:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -320,7 +320,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Date started:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -328,7 +328,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -336,7 +336,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Base class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -346,7 +346,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout36</cstring> </property> diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr index ed07ab03..352aaef3 100644 --- a/kommander/examples/old/wizard.kmdr +++ b/kommander/examples/old/wizard.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>Wizard1</class> -<widget class=TQWIZARD_OBJECT_NAME_STRING> +<widget class="TQWizard"> <property name="name"> <cstring>Wizard1</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Demo Wizard</string> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -132,7 +132,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -189,7 +189,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> diff --git a/kommander/examples/tutorial/CMakeLists.txt b/kommander/examples/tutorial/CMakeLists.txt new file mode 100644 index 00000000..0d344518 --- /dev/null +++ b/kommander/examples/tutorial/CMakeLists.txt @@ -0,0 +1,10 @@ +##### other data + +install( + FILES append.kmdr calc.kmdr dcop.kmdr globals.kmdr loop.kmdr + progressbar.kmdr slots.kmdr strings.kmdr tree.kmdr arrays.kmdr + cmdline.kmdr dialogs.kmdr initialize.kmdr picview.kmdr + settings.kmdr statusbar.kmdr table.kmdr widgets.kmdr + README + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/tutorial +) diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr index d9c07451..b30c318c 100644 --- a/kommander/examples/tutorial/append.kmdr +++ b/kommander/examples/tutorial/append.kmdr @@ -40,7 +40,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr index d0ae1d5e..b4a0ec5d 100644 --- a/kommander/examples/tutorial/arrays.kmdr +++ b/kommander/examples/tutorial/arrays.kmdr @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -93,7 +93,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr index cfe7233f..3308b2e3 100644 --- a/kommander/examples/tutorial/calc.kmdr +++ b/kommander/examples/tutorial/calc.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -138,7 +138,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -146,7 +146,7 @@ <string>Expression:</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr index a4fe69fc..0d591cf5 100644 --- a/kommander/examples/tutorial/dcop.kmdr +++ b/kommander/examples/tutorial/dcop.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr index cb3c81e2..fd5b678f 100644 --- a/kommander/examples/tutorial/dialogs.kmdr +++ b/kommander/examples/tutorial/dialogs.kmdr @@ -85,7 +85,7 @@ ListBox1.setText(a) </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr index 33d5dd40..d4d92d89 100644 --- a/kommander/examples/tutorial/globals.kmdr +++ b/kommander/examples/tutorial/globals.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr index 9dde0bfc..96239366 100644 --- a/kommander/examples/tutorial/initialize.kmdr +++ b/kommander/examples/tutorial/initialize.kmdr @@ -35,7 +35,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -98,7 +98,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" </spacer> </hbox> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>OpenLabel</cstring> </property> @@ -106,7 +106,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <string>Opened:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>CloseLabel</cstring> </property> diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr index a415a103..d5672338 100644 --- a/kommander/examples/tutorial/loop.kmdr +++ b/kommander/examples/tutorial/loop.kmdr @@ -79,7 +79,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -93,7 +93,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index c01a10e9..1617b53d 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -52,7 +52,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr index f4aaa0b1..d59d1bcf 100644 --- a/kommander/examples/tutorial/settings.kmdr +++ b/kommander/examples/tutorial/settings.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -69,7 +69,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr index 6bbf7d5f..d4f2b524 100644 --- a/kommander/examples/tutorial/slots.kmdr +++ b/kommander/examples/tutorial/slots.kmdr @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -44,7 +44,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -68,7 +68,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -82,7 +82,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -105,7 +105,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr index 0b4af608..53f3908f 100644 --- a/kommander/examples/tutorial/strings.kmdr +++ b/kommander/examples/tutorial/strings.kmdr @@ -81,7 +81,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -95,7 +95,7 @@ fi <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -121,7 +121,7 @@ fi </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr index ff8982d4..8b219269 100644 --- a/kommander/examples/tutorial/table.kmdr +++ b/kommander/examples/tutorial/table.kmdr @@ -77,7 +77,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -170,7 +170,7 @@ </spacer> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr index 0e5d76df..72410f79 100644 --- a/kommander/examples/tutorial/tree.kmdr +++ b/kommander/examples/tutorial/tree.kmdr @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -109,7 +109,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -130,7 +130,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout3</cstring> </property> diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr index 5f283e49..03123265 100644 --- a/kommander/examples/tutorial/widgets.kmdr +++ b/kommander/examples/tutorial/widgets.kmdr @@ -82,7 +82,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -96,7 +96,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt new file mode 100644 index 00000000..f3095915 --- /dev/null +++ b/kommander/executor/CMakeLists.txt @@ -0,0 +1,63 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/widgets + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### instance (static) + +tde_add_library( instance STATIC_PIC AUTOMOC + + SOURCES + instance.cpp + dcopkommanderif.skel + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kommanderplugin-shared + kommanderwidget-shared +) + + +##### kmdr-executor (executable) + +tde_add_executable( kmdr-executor AUTOMOC + + SOURCES + main.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + instance-static + kommanderwidget-shared + kommanderwidgets-shared + kommanderfactory-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kmdr-executor.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden + PO_DIR kommander-desktops +) diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 863b0153..6dbb1a10 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -158,9 +158,9 @@ bool Instance::run() return false; // Handle both dialogs and main windows - if (m_instance->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (m_instance->inherits("TQDialog")) dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); - else if (m_instance->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (m_instance->inherits("TQMainWindow")) { kapp->setMainWidget(m_instance); dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show(); @@ -234,14 +234,14 @@ bool Instance::isFileValid(const KURL& fname) const void Instance::setEnabled(const TQString& widgetName, bool enable) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((TQWidget*)child)->setEnabled(enable); } void Instance::setVisible(const TQString& widgetName, bool visible) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((TQWidget*)child)->setShown(visible); } @@ -250,7 +250,7 @@ void Instance::setText(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setText, text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) { TQLabel* label = (TQLabel*)child; if (label->pixmap()) @@ -269,7 +269,7 @@ TQString Instance::text(const TQString& widgetName) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) return ((TQLabel*)child)->text(); return TQString(); } @@ -279,7 +279,7 @@ void Instance::setSelection(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setSelection, text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) ((TQLabel*)child)->setText(text); } @@ -426,7 +426,7 @@ TQStringList Instance::associatedText(const TQString &widgetName) TQString Instance::type(const TQString& widget) { TQObject* child = stringToWidget(widget); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) return child->className(); return TQString(); } @@ -438,9 +438,9 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObjectList* widgets; if (!child) child = TQT_TQOBJECT(m_instance); - if (child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child->inherits("TQWidget")) { - widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive); + widgets = child->queryList("TQWidget", 0, false, recursive); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && kommanderWidget(w)) matching.append(w->name()); @@ -606,7 +606,7 @@ void Instance::setGlobal(const TQString& variableName, const TQString& value) TQObject* Instance::stringToWidget(const TQString& name) { - return m_instance->child(name); + return m_instance->child(name.utf8()); } KommanderWidget* Instance::kommanderWidget(TQObject* object) diff --git a/kommander/executor/kmdr-executor.desktop b/kommander/executor/kmdr-executor.desktop index 705c67f7..6a714063 100644 --- a/kommander/executor/kmdr-executor.desktop +++ b/kommander/executor/kmdr-executor.desktop @@ -1,81 +1,10 @@ [Desktop Entry] +Name=Kommander Executor + +Comment=Executor for Kommander dialogs + Type=Application Exec=kmdr-executor %F Icon=kommander -Comment=Executor for Kommander dialogs -Comment[bg]=Изпълнение на диалогови прозорци -Comment[ca]=Executor per a diàlegs de Kommander -Comment[cs]=Spouštěč dialogů Kommanderu -Comment[da]=Udfører Kommanders dialoger -Comment[de]=Stellt Kommander-Dialoge dar -Comment[el]=Εκτελεστής για διαλόγους Kommander -Comment[en_GB]=Executor for Kommander dialogues -Comment[es]=Lanzador de cuadros de diálogo de Kommander -Comment[et]=Kommanderi dialoogide rakendaja -Comment[eu]=Kommander-en elkarrizketen exekutatzailea -Comment[fa]=مجری محاورههای Kommander -Comment[fi]=Komentodialogien rakentaja -Comment[fr]=Exécuteur de boîtes de dialogue de Kommander -Comment[gl]=Executor para os diálogos de Kommander -Comment[hi]=कमांडर संवादों हेतु कार्यपालक -Comment[hu]=Megjelenítőprogram Kommander-párbeszédablakokhoz -Comment[is]=Executor fyrir Kommander glugga -Comment[it]=Esecutore per maschere di Kommander -Comment[ja]=Kommander ダイアログ用の Executor -Comment[ka]=Kommander-ის დიალოგის შემსრულებელნი -Comment[lt]=Kommander dialogų vykdyklė -Comment[ms]=Pelaksana untuk dialog Kommander -Comment[nds]=Föhrt Kommander-Dialogen ut -Comment[ne]=आदेश संवादका लागि निर्वाहक -Comment[nl]=Kommander-dialogen uitvoeren -Comment[pl]=Uruchamianie z okien dialogowych Kommandera -Comment[pt]=Executor dos diálogos do Kommander -Comment[pt_BR]=Executor para diálogos do Kommander -Comment[ru]=Выполнение диалогов Kommander -Comment[sk]=Spúštač pre Kommander dialógy -Comment[sl]=Izvajalnik za pogovorna okna Kommanderja -Comment[sr]=Извршавач за Kommander-ове дијалоге -Comment[sr@Latn]=Izvršavač za Kommander-ove dijaloge -Comment[sv]=Körning av Kommander-dialogrutor -Comment[ta]=Kகட்டளை உரையாடல் நிகழ்த்துபவர் -Comment[tg]=Иҷрокунанда барои диалогҳои Kommander -Comment[tr]=Kommander diyalogları için çalıştırıcı -Comment[uk]=Запускач для вікон Kommander -Comment[zh_CN]=Kommander 对话框执行器 -Comment[zh_HK]=Kommander 對話盒的運行程式 -Comment[zh_TW]=Kommander 對話盒的運行程式 Terminal=false -Name=Kommander Executor -Name[br]=Aozer Kommander -Name[ca]=Executor Kommander -Name[cs]=Spouštěč Kommanderu -Name[de]=Kommander-Exekutor -Name[el]=Εκτελεστής Kommander -Name[eu]=Kommander exekutatzailea -Name[fa]=مجری Kommander -Name[fi]=Komennon suorittaja -Name[fr]=Exécuteur de Kommander -Name[gl]=Executor de Kommander -Name[hi]=कमांडर कार्यपालक -Name[it]=Esecutore per Kommander -Name[lt]=Kommander vykdyklė -Name[ms]=Pelaksana Kommander -Name[nds]=Kommander-Executor -Name[ne]=आदेश निर्वाहक -Name[nl]=Kommander Uitvoerder -Name[pl]=Kommander: uruchamianie -Name[pt]=Executor do Kommander -Name[pt_BR]=Executor do Kommander -Name[ru]=Kommander -Name[sk]=Kommander spúštač -Name[sl]=Izvajalnik Kommander -Name[sr]=Kommander извршавач -Name[sr@Latn]=Kommander izvršavač -Name[ta]=Kகட்டளை நிகழ்த்துபவர் -Name[tg]=Иҷрокунандаи Kommander -Name[tr]=Kommander Çalıştırıcısı -Name[uk]=Запускач Kommander -Name[zh_CN]=Kommander 执行器 -Name[zh_HK]=Kommander 執行器 -Name[zh_TW]=Kommander 執行器 MimeType=application/x-kommander diff --git a/kommander/factory/CMakeLists.txt b/kommander/factory/CMakeLists.txt new file mode 100644 index 00000000..d33ff52e --- /dev/null +++ b/kommander/factory/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_definitions( -DTQT_NO_SQL ) + + +##### kommanderfactory (static) + +tde_add_library( kommanderfactory STATIC_PIC AUTOMOC + + SOURCES + kommanderfactory.cpp + domtool.cpp + LINK + kommanderplugin-shared +) + + +###### headers + +install( + FILES kommanderfactory.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp index 40190ff1..25030fe5 100644 --- a/kommander/factory/domtool.cpp +++ b/kommander/factory/domtool.cpp @@ -169,7 +169,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = TQVariant( TQCString( e.firstChild().toText().data() ) ); + v = TQVariant( e.firstChild().toText().data().utf8() ); } else if ( e.tagName() == "number" ) { bool ok = true; v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 3f7b91c3..146c5f2b 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -25,10 +25,6 @@ #include "kommanderfactory.h" #include <kommanderplugin.h> -#ifdef QT_NO_SQL -#define TQT_NO_SQL -#endif // QT_NO_SQL - #include <tqfeatures.h> #include "config.h" #ifndef TQT_NO_SQL @@ -217,7 +213,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg if ( !imageCollection.isNull() ) widgetFactory->loadImageCollection( imageCollection ); - widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = widgetFactory->toplevel; if ( !w ) { delete widgetFactory; @@ -266,7 +262,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { - TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING ); + TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) @@ -292,8 +288,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().utf8(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).utf8(), "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -315,77 +311,77 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi TQString className = literalClassName; // create widgets we know - if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) + if (className == "TQPushButton") return new TQPushButton(parent, name); - else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + else if (className == "TQToolButton") return new TQToolButton(parent, name); - else if (className == TQCHECKBOX_OBJECT_NAME_STRING) + else if (className == "TQCheckBox") return new TQCheckBox(parent, name); - else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if (className == "TQRadioButton") return new TQRadioButton(parent, name); - else if (className == TQGROUPBOX_OBJECT_NAME_STRING) + else if (className == "TQGroupBox") return new TQGroupBox(parent, name); - else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + else if (className == "TQButtonGroup") return new TQButtonGroup(parent, name); - else if (className == TQICONVIEW_OBJECT_NAME_STRING) + else if (className == "TQIconView") { #if !defined(TQT_NO_ICONVIEW) return new TQIconView(parent, name); #endif } - else if (className == TQTABLE_OBJECT_NAME_STRING) + else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) return new TQTable(parent, name); #endif } - else if (className == TQLISTBOX_OBJECT_NAME_STRING) + else if (className == "TQListBox") return new TQListBox(parent, name); - else if (className == TQLISTVIEW_OBJECT_NAME_STRING) + else if (className == "TQListView") return new TQListView(parent, name); - else if (className == TQLINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQLineEdit") return new TQLineEdit(parent, name); - else if (className == TQSPINBOX_OBJECT_NAME_STRING) + else if (className == "TQSpinBox") return new TQSpinBox(parent, name); - else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") return new TQLabel(parent, name); - else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + else if (className == "TQLayoutWidget") return new TQWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") return new TQTabWidget(parent, name); - else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) + else if (className == "TQComboBox") return new TQComboBox(false, parent, name); - else if (className == TQWIDGET_OBJECT_NAME_STRING) + else if (className == "TQWidget") { if (!qwf_stays_on_top) return new TQWidget(parent, name); return new TQWidget(parent, name, TQt::WStyle_StaysOnTop); } - else if (className == TQDIALOG_OBJECT_NAME_STRING) + else if (className == "TQDialog") { if (!qwf_stays_on_top) return new TQDialog(parent, name); return new TQDialog(parent, name, false, TQt::WStyle_StaysOnTop); } - else if (className == TQWIZARD_OBJECT_NAME_STRING) + else if (className == "TQWizard") return new TQWizard(parent, name); - else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) + else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); - else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) + else if (className == "TQProgressBar") return new TQProgressBar(parent, name); - else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) + else if (className == "TQTextView") return new TQTextView(parent, name); - else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) + else if (className == "TQTextBrowser") return new TQTextBrowser(parent, name); - else if (className == TQDIAL_OBJECT_NAME_STRING) + else if (className == "TQDial") return new TQDial(parent, name); - else if (className == TQSLIDER_OBJECT_NAME_STRING) + else if (className == "TQSlider") return new TQSlider(parent, name); - else if (className == TQFRAME_OBJECT_NAME_STRING) + else if (className == "TQFrame") return new TQFrame(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); else if (className == "Line") { @@ -393,21 +389,21 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); return f; } - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - else if (className == TQDATEEDIT_OBJECT_NAME_STRING) + else if (className == "TQDateEdit") return new TQDateEdit(parent, name); - else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) + else if (className == "TQTimeEdit") return new TQTimeEdit(parent, name); - else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) + else if (className == "TQDateTimeEdit") return new TQDateTimeEdit(parent, name); - else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) + else if (className == "TQScrollBar") return new TQScrollBar(parent, name); - else if (className == TQPOPUPMENU_OBJECT_NAME_STRING) + else if (className == "TQPopupMenu") return new TQPopupMenu(parent, name); - else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if (className == "TQWidgetStack") return new TQWidgetStack(parent, name); - else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) + else if (className == "TQMainWindow") { TQMainWindow *mw = 0; if (!qwf_stays_on_top) @@ -420,11 +416,11 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi return mw; } #if !defined(TQT_NO_SQL) - else if (className == TQDATATABLE_OBJECT_NAME_STRING) + else if (className == "TQDataTable") return new TQDataTable(parent, name); - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") return new QDesignerDataBrowser2(parent, name); - else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + else if (className == "TQDataView") return new QDesignerDataView2(parent, name); #endif @@ -515,9 +511,9 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( colspan < 1 ) colspan = 1; if ( !className.isEmpty() ) { - if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) - className = TQWIDGET_OBJECT_NAME_STRING; - if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + if ( !layout && className == "TQLayoutWidget" ) + className = "TQWidget"; + if ( layout && className == "TQLayoutWidget" ) { // hide layout widgets w = parent; } else { @@ -529,7 +525,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { @@ -559,39 +555,39 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { TQMap< TQString, TQString> *oldDbControls = dbControls; - createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { @@ -599,14 +595,14 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) ); - }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + }else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, translate(v.toString()) ); } @@ -627,18 +623,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L int spacing = defSpacing; int margin = defMargin; - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); gb->layout()->setMargin( 0 ); @@ -717,18 +713,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const { - if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -767,8 +763,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) ); } #ifndef TQT_NO_SQL - if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) - && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { + if ( prop == "database" && !obj->inherits( "TQDataView" ) + && !obj->inherits( "TQDataBrowser" ) ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); if ( lst.count() > 2 ) { if ( dbControls ) @@ -778,7 +774,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } } else if ( prop == "database" ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); - if ( lst.count() == 2 && obj->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) { + if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; @@ -792,7 +788,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } @@ -820,13 +816,13 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T v = TQPalette( p ); } else if ( e.tagName() == "enum" && p && p->isEnumType() ) { TQString key( v.toString() ); - v = TQVariant( p->keyToValue( key ) ); + v = TQVariant( p->keyToValue( key.utf8() ) ); } else if ( e.tagName() == "set" && p && p->isSetType() ) { TQString keys( v.toString() ); TQStringList lst = TQStringList::split( '|', keys ); TQStrList l; for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) - l.append( *it ); + l.append( (*it).utf8() ); v = TQVariant( p->keysToValue( l ) ); } @@ -837,7 +833,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) @@ -887,7 +883,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, @@ -924,7 +920,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 ); img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" ); } else { - img.loadFromData( (const uchar*)ba, data.length() / 2, format ); + img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() ); } delete [] ba; @@ -1025,12 +1021,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { + if ( name == "this" || name == toplevel->name() ) { conn.sender = TQT_TQOBJECT(toplevel); } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -1040,13 +1036,13 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect if ( !conn.sender ) conn.sender = findAction( name ); } else if ( n2.tagName() == "signal" ) { - conn.signal = n2.firstChild().toText().data(); + conn.signal = n2.firstChild().toText().data().utf8(); } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { + if ( name == "this" || name == toplevel->name() ) { conn.receiver = TQT_TQOBJECT(toplevel); } else { - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -1054,7 +1050,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } @@ -1112,7 +1108,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect n = n.nextSibling().toElement(); continue; } - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } else { EventFunction ef = eventMap[ conn.sender ]; ef.events.append( conn.signal ); @@ -1134,7 +1130,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { TQString name = n.firstChild().toText().data(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -1151,7 +1147,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1185,10 +1181,10 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)widget; #ifndef TQT_NO_SQL - bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING )); + bool isSql = (widget->inherits( "TQDataTable" )); #endif bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1273,14 +1269,14 @@ void KommanderFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1290,7 +1286,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi new TQListBoxText( lb, txt ); } #ifndef TQT_NO_ICONVIEW - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1300,7 +1296,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); #endif - } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1361,7 +1357,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new TQActionGroup( parent ); @@ -1378,7 +1374,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } if ( a ) @@ -1408,7 +1404,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); tb = new TQToolBar( TQString(), mw, dock ); tb->setLabel( n.attribute( "label" ) ); - tb->setName( n.attribute( "name" ) ); + tb->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1418,7 +1414,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "separator" ) { tb->addSeparator(); } else if ( n2.tagName() == "widget" ) { - (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); } @@ -1437,7 +1433,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { TQPopupMenu *popup = new TQPopupMenu( mw ); - popup->setName( n.attribute( "name" ) ); + popup->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1463,7 +1459,7 @@ TQAction *KommanderFactory::findAction( const TQString &name ) for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( TQString( a->name() ) == name ) return a; - TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } diff --git a/kommander/icons/CMakeLists.txt b/kommander/icons/CMakeLists.txt new file mode 100644 index 00000000..a0a4d713 --- /dev/null +++ b/kommander/icons/CMakeLists.txt @@ -0,0 +1,9 @@ +##### icons + +tde_install_icons( kommander ) + +install( + FILES hi22-action-arrow.png + DESTINATION ${DATA_INSTALL_DIR}/kommander/icons/hicolor/22x22/actions + RENAME arrow.png +) diff --git a/kommander/kmdrtools/CMakeLists.txt b/kommander/kmdrtools/CMakeLists.txt new file mode 100644 index 00000000..12f913d5 --- /dev/null +++ b/kommander/kmdrtools/CMakeLists.txt @@ -0,0 +1,7 @@ +##### other data + +install( + FILES dcoptool-oldparser.kmdr examples.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor +) + diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index f4d758ca..6a21755a 100644 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -131,7 +131,7 @@ args(QString,QString,QString,QString)") <string></string> </stringlist> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -224,7 +224,7 @@ args(QString,QString,QString,QString)") </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -247,7 +247,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -269,7 +269,7 @@ args(QString,QString,QString,QString)") <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -326,7 +326,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -578,7 +578,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr index b5a5f5d7..ae3a8ad4 100644 --- a/kommander/kmdrtools/examples.kmdr +++ b/kommander/kmdrtools/examples.kmdr @@ -75,7 +75,7 @@ end <number>0</number> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout90</cstring> </property> diff --git a/kommander/part/CMakeLists.txt b/kommander/part/CMakeLists.txt new file mode 100644 index 00000000..22b08144 --- /dev/null +++ b/kommander/part/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/executor + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkommander_part (kpart) + +tde_add_kpart( libkommander_part AUTOMOC + + SOURCES + kommander_part.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kjs-shared + tdeparts-shared + tdehtml-shared + kommanderwidget-shared + kommanderplugin-shared + instance-static + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kommander_part.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kommander-desktops +) diff --git a/kommander/part/kommander_part.desktop b/kommander/part/kommander_part.desktop index 239f4f25..024e8885 100644 --- a/kommander/part/kommander_part.desktop +++ b/kommander/part/kommander_part.desktop @@ -1,15 +1,7 @@ [Desktop Entry] Name=KommanderPart -Name[ca]=Part del Kommander -Name[de]=Kommander-Komponente -Name[et]=Kommanderi komponent -Name[nds]=Kommander-Komponent -Name[nl]=Kommander-component -Name[pl]=Moduł Kommandera -Name[ru]=Компонент Kommander -Name[sv]=Kommander-delprogram -Name[zh_TW]=Kommander 部件 + +Type=Service MimeType=application/x-kommander; X-TDE-ServiceTypes=KParts/ReadOnlyPart X-TDE-Library=libkommander_part -Type=Service diff --git a/kommander/plugin/CMakeLists.txt b/kommander/plugin/CMakeLists.txt new file mode 100644 index 00000000..44a70077 --- /dev/null +++ b/kommander/plugin/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderplugin (shared) + +tde_add_library( kommanderplugin SHARED AUTOMOC + + SOURCES + kommanderplugin.cpp + specialinformation.cpp + LINK + tdecore-shared + tdeui-shared + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) + + +##### headers + +install( + FILES kommanderplugin.h specials.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index 0a80dd85..4a1d8903 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -12,7 +12,9 @@ * (at your option) any later version. * * * ***************************************************************************/ - +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "specials.h" #include "specialinformation.h" @@ -63,7 +65,7 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr } -TQString SpecialFunction::prototype(uint prototypeFlags) const +TQString KDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const { if (!m_types.count()) return m_function; @@ -82,21 +84,21 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const return TQString("%1(%2)").arg(m_function).arg(params.join(", ")); } -TQString SpecialFunction::argumentName(uint i) const +TQString KDE_EXPORT SpecialFunction::argumentName(uint i) const { if (i < m_args.count()) return m_args[i]; return TQString(); } -TQString SpecialFunction::argumentType(uint i) const +TQString KDE_EXPORT SpecialFunction::argumentType(uint i) const { if (i < m_types.count()) return m_types[i]; return TQString(); } -int SpecialFunction::argumentCount() const +int KDE_EXPORT SpecialFunction::argumentCount() const { return m_types.count(); } @@ -104,7 +106,7 @@ int SpecialFunction::argumentCount() const -int SpecialInformation::function(int group, const TQString& fname) +int KDE_EXPORT SpecialInformation::function(int group, const TQString& fname) { TQString f = fname.lower(); if (m_functions.contains(group) && m_functions[group].contains(f)) @@ -114,13 +116,13 @@ int SpecialInformation::function(int group, const TQString& fname) return -1; } -SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname) +KDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname) { int gid = group(gname); return m_specials[gid][function(gid, fname)]; } -int SpecialInformation::group(const TQString& gname) +int KDE_EXPORT SpecialInformation::group(const TQString& gname) { if (m_groups.contains(gname)) return m_groups[gname]; @@ -137,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname) return function(group(gname), fname) != -1; } -bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p) +bool KDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p) { return m_specials.contains(gname) && m_specials[gname].contains(fname) && m_specials[gname][fname].isSupported(p); @@ -151,14 +153,14 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname, return f != -1 && m_specials[g][f].isSupported(p); } -int SpecialInformation::minArg(int gname, int fname) +int KDE_EXPORT SpecialInformation::minArg(int gname, int fname) { if (isValid(gname, fname)) return m_specials[gname][fname].minArg(); return -1; } -int SpecialInformation::maxArg(int gname, int fname) +int KDE_EXPORT SpecialInformation::maxArg(int gname, int fname) { if (isValid(gname, fname)) return m_specials[gname][fname].maxArg(); @@ -186,7 +188,7 @@ TQString SpecialInformation::description(int gname, int fname) return TQString(); } -TQString SpecialInformation::prototype(int gname, int fname, uint flags) +TQString KDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags) { if (isValid(gname, fname)) return m_specials[gname][fname].prototype(flags); @@ -246,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin } } -TQString SpecialInformation::parserGroupName(const TQString& name) +TQString KDE_EXPORT SpecialInformation::parserGroupName(const TQString& name) { if (m_parserGroups.contains(name)) return m_parserGroups[name]; @@ -254,12 +256,12 @@ TQString SpecialInformation::parserGroupName(const TQString& name) return name; } -TQStringList SpecialInformation::groups() +TQStringList KDE_EXPORT SpecialInformation::groups() { return m_groups.keys(); } -TQStringList SpecialInformation::functions(const TQString& g) +TQStringList KDE_EXPORT SpecialInformation::functions(const TQString& g) { int gid = group(g); if (gid == -1) @@ -279,7 +281,7 @@ bool SpecialFunction::isSupported(ParserType p) const return (m_parserTypes & p); } -void SpecialInformation::registerSpecials() +void KDE_EXPORT SpecialInformation::registerSpecials() { insertGroup(Group::DCOP, "DCOP", ""); insert(DCOP::addUniqueItem, "addUniqueItem(TQString widget, TQString item)", diff --git a/kommander/pluginmanager/CMakeLists.txt b/kommander/pluginmanager/CMakeLists.txt new file mode 100644 index 00000000..d65e78ff --- /dev/null +++ b/kommander/pluginmanager/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kmdr-plugins (executable) + +tde_add_executable( kmdr-plugins AUTOMOC + + SOURCES + main.cpp + mainwindow.cpp + pluginmanager.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt new file mode 100644 index 00000000..866a0dfd --- /dev/null +++ b/kommander/widget/CMakeLists.txt @@ -0,0 +1,49 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/plugin + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderwidget (shared) + +tde_add_library( kommanderwidget SHARED AUTOMOC + + SOURCES + expression.cpp function.cpp + functionlib.cpp invokeclass.cpp + kmdrmainwindow.cpp kommanderfunctions.cpp + kommanderwidget.cpp kommanderwindow.cpp + myprocess.cpp parsenode.cpp + parser.cpp parserdata.cpp + LINK + tdecore-shared + tdeio-shared + tdeui-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) + + +##### headers + +install( + FILES kommanderwidget.h kommander_export.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index cd7b6f4c..49e5f7b0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params) static ParseNode f_stringRound(Parser*, const ParameterList& params) { TQString s; - s.sprintf("%."+params[1].toString()+"f", params[0].toDouble()); + s.sprintf("%.*f", params[1].toInt(), params[0].toDouble()); return s; } @@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params) static ParseNode f_debug(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cerr << params[i].toString(); + std::cerr << params[i].toString().local8Bit(); std::cerr << "\n"; fflush(stderr); return ParseNode(); @@ -181,7 +181,7 @@ static ParseNode f_debug(Parser*, const ParameterList& params) static ParseNode f_echo(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cout << params[i].toString(); + std::cout << params[i].toString().local8Bit(); fflush(stdout); return ParseNode(); } @@ -353,7 +353,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteDataStream << params[i++].toDouble(); else if (*it == "bool") byteDataStream << (bool)params[i++].toInt(); - else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (*it == "TQStringList") if (params[i].toString().find('\n') != -1) byteDataStream << TQStringList::split("\n", params[i++].toString(), true); else @@ -371,7 +371,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) return ParseNode(); } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -389,7 +389,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteReplyStream >> b; return b; } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params) static ParseNode f_i18n(Parser*, const ParameterList& params) { - return TDEGlobal::locale()->translate(params[0].toString()); + return TDEGlobal::locale()->translate(params[0].toString().utf8()); } static ParseNode f_env(Parser*, const ParameterList& params) @@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params) TQStringList keys = P->array(name).keys(); TQValueList<ParseNode> values = P->array(name).values(); - TQStringList::Iterator it = keys.begin(); + TQStringList::Iterator it = keys.begin(); TQValueList<ParseNode>::Iterator itval = values.begin(); - while (*it) + for (; it != keys.end(); ++it, ++itval) { array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString()); - ++it; - ++itval; } return array; } diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 5805c58d..845cc905 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "kmdrmainwindow.h" #include <tqtimer.h> diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index 91be985d..cc1b57d3 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -17,7 +17,7 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class KmdrMainWindow : public TDEMainWindow +class KDE_EXPORT KmdrMainWindow : public TDEMainWindow { Q_OBJECT diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 3d580f88..59aaec07 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL case Kommander::env: return TQString(getenv(args[0].latin1())); case Kommander::i18n: - return TDEGlobal::locale()->translate(args[0]); + return TDEGlobal::locale()->translate(args[0].utf8()); case Kommander::global: return global(args[0]); case Kommander::setGlobal: diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 7d80c8db..5ccb8375 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -295,7 +295,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteDataStream << a_query[i+3].toDouble(); else if (argTypes[i] == "bool") byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0"); - else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (argTypes[i] == "TQStringList") if (a_query[i+3].find('\n') != -1) byteDataStream << TQStringList::split("\n", a_query[i+3], true); else @@ -312,7 +312,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -330,7 +330,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteReplyStream >> b; return TQString::number(b); } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parentDialog()->inherits("TQDialog")) { parentDialog()->close(); exit(-1); } - else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (parentDialog()->inherits("TQMainWindow")) kapp->quit(); } } @@ -655,7 +655,7 @@ TQWidget* KommanderWidget::parentDialog() const while (superParent->parent()) { superParent = superParent->parent(); - if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (superParent->inherits("TQDialog") || superParent->inherits("TQMainWindow")) break; } return (TQWidget*)superParent; @@ -695,7 +695,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg case DCOP::children: { TQStringList matching; - TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); + TQObjectList* widgets = current->queryList("TQWidget", 0, false, args.count() == 0 || args[0] != "false"); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && (dynamic_cast<KommanderWidget*>(w))) matching.append(w->name()); diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt new file mode 100644 index 00000000..a3e2d641 --- /dev/null +++ b/kommander/widgets/CMakeLists.txt @@ -0,0 +1,52 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderwidgets (shared) + +tde_add_library( kommanderwidgets SHARED AUTOMOC + + SOURCES + aboutdialog.cpp buttongroup.cpp + checkbox.cpp closebutton.cpp + combobox.cpp datepicker.cpp dialog.cpp + execbutton.cpp fileselector.cpp + fontdialog.cpp groupbox.cpp + konsole.cpp label.cpp + lineedit.cpp listbox.cpp + pixmaplabel.cpp plugin.cpp + popupmenu.cpp progressbar.cpp + radiobutton.cpp richtexteditor.cpp + scriptobject.cpp slider.cpp + spinboxint.cpp statusbar.cpp + subdialog.cpp table.cpp + tabwidget.cpp textbrowser.cpp + textedit.cpp timer.cpp + toolbox.cpp treewidget.cpp + wizard.cpp + LINK + tdeio-shared + kommanderwidget-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index a9a8f77f..05be2dfe 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqfile.h> #include "aboutdialog.h" @@ -119,8 +124,8 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_appName = appName; m_icon = icon; m_copyright = copyright; - m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); - m_aboutData->setCopyrightStatement(m_copyright); + m_aboutData = new TDEAboutData(m_appName.utf8(), m_appName.utf8(), m_version.utf8()); + m_aboutData->setCopyrightStatement(m_copyright.utf8()); if (!m_icon.isEmpty()) m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage()); } @@ -133,7 +138,7 @@ void AboutDialog::addAuthor(const TQString& author, const TQString &task, const m_emails.append(email); m_tasks.append(task); m_addresses.append(webAddress); - m_aboutData->addAuthor(author, task, email, webAddress); + m_aboutData->addAuthor(author.utf8(), task.utf8(), email.utf8(), webAddress.utf8()); } void AboutDialog::addTranslator(const TQString& author, const TQString& email) @@ -142,7 +147,7 @@ void AboutDialog::addTranslator(const TQString& author, const TQString& email) return; m_authors.append(author); m_emails.append(email); - m_aboutData->setTranslator(author, email); + m_aboutData->setTranslator(author.utf8(), email.utf8()); } void AboutDialog::setDescription(const TQString& description) @@ -150,7 +155,7 @@ void AboutDialog::setDescription(const TQString& description) if (!m_aboutData) return; m_description = description; - m_aboutData->setShortDescription(m_description); + m_aboutData->setShortDescription(m_description.utf8()); } void AboutDialog::setHomepage(const TQString &homepage) @@ -158,7 +163,7 @@ void AboutDialog::setHomepage(const TQString &homepage) if (!m_aboutData) return; m_homepage = homepage; - m_aboutData->setHomepage(m_homepage); + m_aboutData->setHomepage(m_homepage.utf8()); } void AboutDialog::setBugAddress(const TQString &bugAddress) @@ -166,7 +171,7 @@ void AboutDialog::setBugAddress(const TQString &bugAddress) if (!m_aboutData) return; m_bugaddress = bugAddress; - m_aboutData->setBugAddress(m_bugaddress); + m_aboutData->setBugAddress(m_bugaddress.utf8()); } void AboutDialog::setLicense(const TQString &key) @@ -195,7 +200,7 @@ void AboutDialog::setLicense(const TQString &key) { if (!key.isEmpty()) m_license = key; - m_aboutData->setLicenseText(m_license); + m_aboutData->setLicenseText(m_license.utf8()); } else { @@ -204,9 +209,9 @@ void AboutDialog::setLicense(const TQString &key) if (!key.isEmpty()) file = key; } - m_aboutData->setLicenseTextFile(file); - } - + m_aboutData->setLicenseTextFile(file.utf8()); + } + } void AboutDialog::setPopulationText(const TQString& a_text) diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 440541c8..37dedec4 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -21,7 +21,7 @@ class TDEAboutData; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class AboutDialog : public TQLabel, public KommanderWidget +class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index eeb2c79f..30426eb8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -45,7 +45,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) while (parent->parent() != 0) { parent = parent->parent(); - if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parent->inherits("TQDialog")) break; } connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index 4f73cedc..242d4ba4 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -13,6 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef KMDR_EXECUTOR_PATH +#define KMDR_EXECUTOR_PATH "/usr/bin/kmdr-executor" +#endif + /* KDE INCLUDES */ #include <tdelocale.h> @@ -50,7 +59,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); m_useShebang = false; - m_shebang = "#!/usr/bin/kmdr-executor"; + m_shebang = "#!" KMDR_EXECUTOR_PATH; m_firstShow = true; KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1); diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index fa535813..d4969444 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -126,7 +126,7 @@ void ExecButton::startProcess() { TDEApplication::restoreOverrideCursor(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; } setEnabled(enabledStatus); } @@ -160,7 +160,7 @@ void ExecButton::processExited(MyProcess* p) { m_output = p->output(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; delete p; } } diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 419fc8d2..59a1e372 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "fontdialog.h" #include "kommanderplugin.h" diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index c9e9e7ba..375e6cea 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -20,7 +20,7 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class FontDialog : public TQLabel, public KommanderWidget +class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 343526ae..7a570dd3 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "popupmenu.h" #include "specials.h" diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 7d691ff0..4bf073b8 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -22,7 +22,7 @@ class TDEPopupMenu; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class PopupMenu : public TQLabel, public KommanderWidget +class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 49ea5c19..252dbcee 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -57,11 +57,11 @@ Table::Table(TQWidget *a_parent, const char *a_name) KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(TQString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(TQString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); - KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); + KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses"), 5); KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(TQString widget, int row)", i18n("Select the row with the zero based index."), 2); - KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); - KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index."), 2); + KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index."), 3); + KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index."), 3); KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(TQString widget)", i18n("Returns the number of rows of the table"), 1); KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(TQString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(TQString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 9e466c5e..4abaa706 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -121,7 +121,7 @@ TQString TextBrowser::handleDCOP(int function, const TQStringList& args) case DCOP::selection: return selectedText(); case TBR_setNotifyClick: - KTextBrowser::setNotifyClick(args[0]); + KTextBrowser::setNotifyClick(args[0].utf8()); break; case TBR_isNotifyClick: return TQString::number(KTextBrowser::isNotifyClick()); diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 6dfc8b89..4df6b78e 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "toolbox.h" #include "kommanderplugin.h" #include "specials.h" diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index 1d253c90..b1563c13 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -18,7 +18,8 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class ToolBox : public TQToolBox, public KommanderWidget + +class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/widgets.desktop b/kommander/widgets/widgets.desktop index f24396de..e0ac75a9 100644 --- a/kommander/widgets/widgets.desktop +++ b/kommander/widgets/widgets.desktop @@ -1,36 +1,6 @@ [Desktop Entry] Name=Widgets -Name[bg]=Графични обекти -Name[br]=Widgetoù -Name[ca]=Estris -Name[cs]=Widgety -Name[cy]=Celfigion -Name[da]=Kontroller -Name[el]=Γραφικά συστατικά -Name[et]=Elemendid -Name[fa]=عناصر -Name[fi]=Elementit -Name[fr]=Éléments graphiques -Name[ga]=Giuirléidí -Name[hi]=विजेट्स -Name[hu]=Grafikai elemek -Name[ja]=ウィジェット -Name[lt]=Valdikliai -Name[ms]=Wijet -Name[ne]=विजेट -Name[pl]=Elementy interfejsu -Name[pt]=Elementos -Name[pt_BR]=Janelas -Name[ru]=Виджеты -Name[sl]=Gradniki -Name[sr]=Контроле -Name[sr@Latn]=Kontrole -Name[sv]=Grafiska komponenter -Name[ta]=சின்னப் படங்கள் -Name[tg]=Васеъкуниҳо -Name[tr]=Bileşenler -Name[uk]=Віджети -Name[zh_CN]=部件 -Exec=widgets %i %m -caption "%c" + Type=Application +Exec=widgets %i %m -caption "%c" Terminal=false diff --git a/kommander/working/CMakeLists.txt b/kommander/working/CMakeLists.txt new file mode 100644 index 00000000..d03e032a --- /dev/null +++ b/kommander/working/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory( plugintemplate ) + +install( + PROGRAMS kmdr2po extractkmdr + DESTINATION ${DATA_INSTALL_DIR}/kommander/translating +) diff --git a/kommander/working/plugintemplate/CMakeLists.txt b/kommander/working/plugintemplate/CMakeLists.txt new file mode 100644 index 00000000..1d4f4aac --- /dev/null +++ b/kommander/working/plugintemplate/CMakeLists.txt @@ -0,0 +1,17 @@ +##### other data + +install( + FILES kommanderplugin.png + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard +) + +install( + FILES kommanderplugin.tdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates +) + +tde_create_tarball( + TARGET kommanderplugin.tar.gz + FILES src-Makefile.am plugin.cpp widget.h widget.cpp app.tdevelop + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard +) diff --git a/kommander/x-kommander.desktop b/kommander/x-kommander.desktop index 656cad13..ea0a716b 100644 --- a/kommander/x-kommander.desktop +++ b/kommander/x-kommander.desktop @@ -1,50 +1,8 @@ [Desktop Entry] Comment=Kommander File -Comment[bg]=Файл на Kommander -Comment[br]=Restr Kommander -Comment[ca]=Fitxer de Kommander -Comment[cs]=Soubor Kommanderu -Comment[da]=Kommander-fil -Comment[de]=Kommander-Datei -Comment[el]=Αρχείο Kommander -Comment[es]=Archivo de Kommander -Comment[et]=Kommanderi fail -Comment[eu]=Kommander fitxategiak -Comment[fa]=پروندۀ Kommander -Comment[fi]=Komentotiedosto -Comment[fr]=Fichier de Kommander -Comment[ga]=Comhad Kommander -Comment[gl]=Ficheiro de Kommander -Comment[hi]=कमांडर फ़ाइल -Comment[hu]=Kommander-fájl -Comment[is]=Kommander skrá -Comment[it]=File di Kommander -Comment[ja]=Kommander ファイル -Comment[ka]=Kommander-ის ფაილი -Comment[lt]=Kommander byla -Comment[ms]=Fail Kommander -Comment[nds]=Kommander-Datei -Comment[ne]=आदेश फाइल -Comment[nl]=Kommander-dialoogbestand -Comment[pa]=Kommander ਫਾਇਲ -Comment[pl]=Plik Kommandera -Comment[pt]=Ficheiro do Kommander -Comment[pt_BR]=Arquivo do Kommander -Comment[ru]=Файл Kommander -Comment[sk]=Kommander súbor -Comment[sl]=Datoteka Kommanderja -Comment[sr]=Kommander-ов фајл -Comment[sr@Latn]=Kommander-ov fajl -Comment[sv]=Kommander-fil -Comment[ta]=Kகட்டளை கோப்பு -Comment[tg]=Файли Kommander -Comment[tr]=Kommander Dosyası -Comment[uk]=Файл Kommander -Comment[zh_CN]=Kommander 文件 -Comment[zh_HK]=Kommander 檔案 -Comment[zh_TW]=Kommander 檔案 -Icon=application-x-designer + Type=MimeType +Icon=application-x-designer MimeType=application/x-kommander Patterns=*.kmdr; X-TDE-IsAlso=application/x-executable-script @@ -52,4 +10,3 @@ X-TDE-IsAlso=application/x-executable-script [Property::X-TDE-text] Type=bool Value=true - |