diff options
Diffstat (limited to 'kommander')
70 files changed, 737 insertions, 687 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 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 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/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 2cc912c4..ae8ce00a 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -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/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7211785b..d723f0e2 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -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/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/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/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 e23a206a..6dbb1a10 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -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 c81ec3ad..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 @@ -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" ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); + 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 ); } @@ -728,7 +724,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) co 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" ) { @@ -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 ) @@ -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(); @@ -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" ) { @@ -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" ) { 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/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 dca811e5..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(); } @@ -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/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/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 - |