diff options
Diffstat (limited to 'kommander/editor')
27 files changed, 204 insertions, 351 deletions
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 48f8a427..87a55c9f 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -452,7 +452,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) 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() ); @@ -1076,7 +1076,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) 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/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 22f30088..72f09daf 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -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() ) { @@ -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 ); 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 757a6197..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() ); @@ -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() ); } } @@ -1644,7 +1644,7 @@ 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 ); @@ -1750,7 +1750,7 @@ 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" ) ) { menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow ); @@ -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 2b57437f..aa1c9f61 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -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 ea76109e..1c294adc 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -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)); 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/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 8fa45d95..026b39f4 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -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() ); } } @@ -212,7 +212,7 @@ void Layout::undoLayout() layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } else { layoutBase->setGeometry( oldGeometry ); } @@ -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; } diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 497be25b..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 * ))); @@ -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; 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 3800bbbd..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() diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 8b35aa77..c1fb461c 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -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/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 58509db1..57d31eed 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -2197,11 +2197,7 @@ void PropertyPaletteItem::getPalette() 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; @@ -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 ); @@ -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 6246498f..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 ); @@ -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 ) @@ -1644,7 +1635,7 @@ 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" ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -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 ) ); } @@ -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; @@ -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(); @@ -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/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index 1418c1a2..a57c74f1 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -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 6b71979b..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> @@ -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 ); @@ -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" ) { diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index c844cfc4..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 |