diff options
Diffstat (limited to 'kexi/formeditor/widgetlibrary.cpp')
| -rw-r--r-- | kexi/formeditor/widgetlibrary.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 23991774..f5da30e1 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -217,7 +217,7 @@ WidgetLibrary::lookupFactories() } const uint factoryVersion = ptr->property("X-KFormDesigner-WidgetFactoryVersion").toUInt(); if (KFormDesigner::version()!=factoryVersion) { - kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" + kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" " has version '%2' but required Widget Factory version is '%3'\n" " -- skipping this factory!").arg(ptr->library()).arg(factoryVersion) .arg(KFormDesigner::version()) << endl; @@ -319,7 +319,7 @@ WidgetLibrary::createXML() }*/ ActionList -WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, +WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, TQObject *receiver, const char *slot) { loadFactories(); @@ -338,8 +338,8 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p ActionList actions; for (TQAsciiDictIterator<WidgetInfo> it(d->widgets); it.current(); ++it) { - LibActionWidget *a = new LibActionWidget(it.current(), - it.current()->factory()->m_guiClient + LibActionWidget *a = new LibActionWidget(it.current(), + it.current()->factory()->m_guiClient ? it.current()->factory()->m_guiClient->actionCollection() : parent); connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot); actions.append(a); @@ -353,7 +353,7 @@ WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col) for (TQAsciiDictIterator<WidgetFactory> it(d->factories); it.current(); ++it) { it.current()->createCustomActions( - it.current()->m_guiClient + it.current()->m_guiClient ? it.current()->m_guiClient->actionCollection() : col); } } @@ -730,13 +730,13 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( if (textHorizontal.isEmpty() && wclass->inheritedClass()) iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:horizontalText"); if (textHorizontal.isEmpty()) //default - textHorizontal = i18n("InsertQt::Horizontal Widget", "InsertQt::Horizontal"); + textHorizontal = i18n("Insert Horizontal Widget", "Insert Horizontal"); TQString textVertical = wclass->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText"); if (textVertical.isEmpty() && wclass->inheritedClass()) iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText"); if (textVertical.isEmpty()) //default - textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical"); + textVertical = i18n("Insert Vertical Widget", "Insert Vertical"); TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup"); popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name())); |