From kde-commits  Sun Feb 29 23:42:16 2004
From: Dominique Devriese <devriese () kde ! org>
Date: Sun, 29 Feb 2004 23:42:16 +0000
To: kde-commits
Subject: kdeedu/kig
Message-Id: <20040229234216.4ABA29959 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107809814309925

CVS commit by domi: 

Commit a patch by Pino Toscano that adds unfinished work on a new
DrGeo import filter.  I have disabled it from the UI until it is ready.

CCMAIL:Pino Toscano <toscano.pino@tiscali.it>
CCMAIL:paolini@dmf.unicatt.it


  A            filters/drgeo-filter-chooser.cc   1.1 [GPL (v2+)]
  A            filters/drgeo-filter-chooser.h   1.1 [GPL (v2+)]
  A            filters/drgeo-filter-chooserbase.ui   1.1
  A            filters/drgeo-filter.cc   1.1 [GPL (v2+)]
  A            filters/drgeo-filter.h   1.1 [GPL (v2+)]
  M +7 -3      filters/Makefile.am   1.10
  M +3 -0      filters/filter.cc   1.13
  M +4 -1      kig/kig.cpp   1.38


--- kdeedu/kig/filters/Makefile.am  #1.9:1.10
@@ -13,5 +13,7 @@
         kseg-defs.h \
         kseg-filter.h \
-        native-filter.h
+        native-filter.h \
+        drgeo-filter.h \
+        drgeo-filter-chooser.h
 libfilters_la_SOURCES= \
         cabri-filter.cc \
@@ -22,4 +24,6 @@
         kgeo-filter.cc \
         kseg-filter.cc \
-        native-filter.cc
-
+        native-filter.cc \
+        drgeo-filter.cc \
+        drgeo-filter-chooser.cc \
+        drgeo.filter-chooserbase.ui

--- kdeedu/kig/filters/filter.cc  #1.12:1.13
@@ -25,4 +25,5 @@
 #include "native-filter.h"
 #include "kseg-filter.h"
+#include "drgeo-filter.h"
 
 #include <kmessagebox.h>
@@ -46,4 +47,6 @@ KigFilters::KigFilters()
   mFilters.push_back( KigFilterCabri::instance() );
   mFilters.push_back( KigFilterNative::instance() );
+  // domi:disabled for now, reenable when it's ready.
+  // mFilters.push_back( KigFilterDrgeo::instance() );
 }
 

--- kdeedu/kig/kig/kig.cpp  #1.37:1.38
@@ -241,5 +241,8 @@ void Kig::fileOpen()
                                                                      "*.kig|Kig Documents (*.kig)\n"
                                                                      "*.kgeo|KGeo Documents (*.kgeo)\n"
-                                                                     "*.seg|KSeg Documents (*.seg)" ));
+                                                                     "*.seg|KSeg Documents (*.seg)" ) );
+
+  // domi: disabled for now, reenable when ready
+  //                                                                   "*.fgeo|DrGeo Documents (*.fgeo)\n" ) );
 
   if (!file_name.isEmpty()) openURL(file_name);