summaryrefslogtreecommitdiffstats
path: root/kommander/editor
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor')
-rw-r--r--kommander/editor/CMakeLists.txt83
-rw-r--r--kommander/editor/assoctexteditor.ui3
-rw-r--r--kommander/editor/choosewidget.ui6
-rw-r--r--kommander/editor/connectioneditor.ui16
-rw-r--r--kommander/editor/formsettings.ui9
-rw-r--r--kommander/editor/functions.ui32
-rw-r--r--kommander/editor/mainwindow.cpp10
-rw-r--r--kommander/editor/mainwindowactions.cpp4
-rw-r--r--kommander/editor/pics/CMakeLists.txt4
-rw-r--r--kommander/editor/widgetfactory.cpp4
-rw-r--r--kommander/editor/widgetfactory.h2
11 files changed, 125 insertions, 48 deletions
diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt
new file mode 100644
index 00000000..0fa2d46b
--- /dev/null
+++ b/kommander/editor/CMakeLists.txt
@@ -0,0 +1,83 @@
+add_subdirectory( pics )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kommander/widget
+ ${CMAKE_SOURCE_DIR}/kommander/widgets
+ ${CMAKE_SOURCE_DIR}/kommander/plugin
+ ${CMAKE_SOURCE_DIR}/kommander/factory
+
+)
+
+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( kmdr-editor.desktop )
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..b39a7e7b 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -144,7 +144,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/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 2f1683aa..0a20e4e6 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -404,15 +404,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/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/functions.ui b/kommander/editor/functions.ui
index 005d2261..86d1b74a 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -696,27 +696,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/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 497be25b..3fde775c 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 * )));
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 3800bbbd..20630a19 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>
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/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 6b71979b..76ec00d9 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>
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