[Uml-devel] branches/KDE/3.5/kdesdk/umbrello
Gaël de Chalendar
kleag at free.fr
Thu Jun 29 20:46:20 UTC 2006
SVN commit 556295 by kleag:
Withdraw of freeze-breaking changes. Sorry...
M +0 -20 configure.in.in
M +3 -5 umbrello/Makefile.am
D umbrello/common.ent
D umbrello/docgenerators (directory)
M +3 -1 umbrello/main.cpp
M +0 -5 umbrello/umbrelloui.rc
M +7 -11 umbrello/uml.cpp
M +15 -11 umbrello/uml.h
D umbrello/xmi2docbook.xsl
--- branches/KDE/3.5/kdesdk/umbrello/configure.in.in #556294:556295
@@ -41,23 +41,3 @@
dnl #endif
dnl ])
-AC_LANG_SAVE
-AC_LANG_C
-
-AC_CHECK_HEADER(libxml2/libxml/xmlmemory.h,
- [have_libxml2=yes],
- [have_libxml2=no])
-
-if test "$have_libxml2" = "no"; then
- DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-fi
-
-AC_CHECK_HEADER(libxslt/xslt.h,
- [have_libxslt=yes],
- [have_libxslt=no])
-
-if test "$have_libxslt" = "no"; then
- DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-fi
-
-AC_LANG_RESTORE
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #556294:556295
@@ -120,19 +120,17 @@
worktoolbar.cpp
#umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
-umbrello_LDADD = -lxml2 -lxslt ./docgenerators/libdocgenerators.la \
- ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la \
- ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
+umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
## See section "dnl Not GPL compatible" in ../configure.in.in
# SUBDIRS = $(AUTOLAYOUT_DIR) classparser dialogs clipboard pics codegenerators headings refactoring
SUBDIRS = classparser dialogs clipboard pics codegenerators headings \
- refactoring docgenerators
+ refactoring
KDE_ICON=AUTO
appdir=$(kde_datadir)/umbrello
-app_DATA = tips umbrelloui.rc xmi2docbook.xsl common.ent
+app_DATA = tips umbrelloui.rc
xdg_apps_DATA = umbrello.desktop
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/main.cpp #556294:556295
@@ -32,7 +32,9 @@
I18N_NOOP("Umbrello UML Modeller");
// INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
-
+/**
+ * @todo Add options to use the documentation generators from command line.
+ */
static KCmdLineOptions options[] =
{
{ "+[File]", I18N_NOOP("File to open"), 0 },
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umbrelloui.rc #556294:556295
@@ -1,11 +1,6 @@
<!DOCTYPE kpartgui>
<kpartgui name="umbrello" version="11">
<MenuBar>
- <Menu name="file"><text>&File</text>
- <Menu name="file_export"><text>&Export</text>
- <Action name="file_export_docbook"/>
- </Menu>
- </Menu>
<Menu name="edit"><text>&Edit</text>
<Action name="delete_selected"/>
</Menu>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #556294:556295
@@ -77,8 +77,6 @@
#include "cmdlineexportallviewsevent.h"
-#include "docgenerators/docbookgenerator.h"
-
UMLApp::UMLApp(QWidget* , const char* name):KDockMainWindow(0, name) {
s_instance = this;
m_pDocWindow = 0;
@@ -92,6 +90,7 @@
m_codegen = 0;
m_policyext = 0;
m_commoncodegenpolicy = 0;
+ m_xhtmlGenerator = 0;
m_activeLanguage = Uml::pl_Reserved;
///////////////////////////////////////////////////////////////////
// call inits to invoke all other construction parts
@@ -181,9 +180,6 @@
#endif
selectAll = KStdAction::selectAll(this, SLOT( slotSelectAll() ), actionCollection());
- fileExportDocbook = new KAction(i18n("&Export model to docbook"),0,this,SLOT(slotFileExportDocbook()),
- actionCollection(),"file_export_docbook");
-
classWizard = new KAction(i18n("&New Class Wizard..."),0,this,SLOT(slotClassWizard()),
actionCollection(),"class_wizard");
new KAction(i18n("&Add Default Datatypes for Active Language"), 0, this,
@@ -207,7 +203,6 @@
fileClose->setToolTip(i18n("Closes the document"));
filePrint ->setToolTip(i18n("Prints out the document"));
fileQuit->setToolTip(i18n("Quits the application"));
- fileExportDocbook->setToolTip(i18n("Exports the model to the docbook format"));
editCut->setToolTip(i18n("Cuts the selected section and puts it to the clipboard"));
editCopy->setToolTip(i18n("Copies the selected section to the clipboard"));
editPaste->setToolTip(i18n("Pastes the contents of the clipboard"));
@@ -810,11 +805,6 @@
slotStatusMsg(i18n("Ready."));
}
-void UMLApp::slotFileExportDocbook()
-{
- DocbookGenerator().generateDocbookForProject();
-}
-
void UMLApp::slotEditUndo() {
m_doc->loadUndoData();
slotStatusMsg(i18n("Ready."));
@@ -1651,6 +1641,12 @@
#endif
}
+void UMLApp::slotXhtmlDocGenerationFinished()
+{
+ delete m_xhtmlGenerator;
+ m_xhtmlGenerator = 0;
+}
+
KTabWidget* UMLApp::tabWidget() {
return m_tabWidget;
}
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.h #556294:556295
@@ -42,6 +42,7 @@
class UMLViewImageExporterAll;
class RefactoringAssistant;
class KPlayerPopupSliderAction;
+class XhtmlGenerator;
// KDE forward declarations
class KActionMenu;
@@ -489,14 +490,6 @@
void slotFileQuit();
/**
- * Exports the current model to docbook in a subdir of the
- * current model directory named from the model name.
- * @todo Let the user chose the destination directory and
- * name.
- */
- void slotFileExportDocbook();
-
- /**
* Put the marked text/object into the clipboard and remove
* it from the document.
*/
@@ -797,6 +790,12 @@
KConfig *getConfig() { return m_config; }
+ /**
+ * This slot deletes the current XHTML documentation generator as soon as
+ * this one signals that it has finished.
+ */
+ void slotXhtmlDocGenerationFinished();
+
private:
static UMLApp* s_instance;
@@ -904,12 +903,11 @@
KAction* fileOpen;
KRecentFilesAction* fileOpenRecent;
KAction* fileSave;
- KAction* fileExportDocbook;
-
KAction* fileSaveAs;
KAction* fileClose;
KAction* filePrint;
KAction* fileQuit;
+
KAction* editCut;
KAction* editCopy;
KAction* editPaste;
@@ -1005,7 +1003,13 @@
*/
UMLViewImageExporterAll* m_imageExporterAll;
-public:
+ /**
+ * The running XHTML documentation generator. null when no generation is
+ * running
+ */
+ XhtmlGenerator* m_xhtmlGenerator;
+
+ public:
Settings::OptionState getOptionState() {
return m_optionState;
}
More information about the umbrello-devel
mailing list