[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src
From:       Torsten Rahn <tackat () kde ! org>
Date:       2007-06-02 15:45:58
Message-ID: 1180799158.171549.14272.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670798 by rahn:

Welcome Navigator Plugin. :-)




 M  +2 -25     lib/CMakeLists.txt  
 M  +0 -14     lib/libmarble.qrc  
 D             lib/marblecontrol.cpp  
 D             lib/marblecontrol.h  
 D             lib/marblecontrol.ui  
 A             plugins/CMakeLists.txt  
 D             plugins/MarbleWidgetPlugin.cpp  
 D             plugins/MarbleWidgetPlugin.h  
 A             plugins/marblewidget (directory)  
 A             plugins/marblewidget/CMakeLists.txt  
 A             plugins/marblewidget/MarbleWidgetPlugin.cpp   \
plugins/MarbleWidgetPlugin.cpp#670572 [License: UNKNOWN]  A             \
plugins/marblewidget/MarbleWidgetPlugin.h   plugins/MarbleWidgetPlugin.h#670572 \
[License: UNKNOWN]  A             plugins/navigator (directory)  
 A             plugins/navigator/CMakeLists.txt  
 A             plugins/navigator/MarbleNavigator.cpp   lib/marblecontrol.cpp#670572 \
[License: UNKNOWN]  A             plugins/navigator/MarbleNavigator.h   \
lib/marblecontrol.h#670572 [License: UNKNOWN]  A             \
plugins/navigator/MarbleNavigator.ui   lib/marblecontrol.ui#670572  A             \
plugins/navigator/MarbleNavigatorPlugin.cpp   [License: UNKNOWN]  A             \
plugins/navigator/MarbleNavigatorPlugin.h   [License: UNKNOWN]


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #670797:670798
@@ -26,7 +26,6 @@
            HttpDownloadManager.cpp
            httpfetchfile.cpp
            katlasaboutdialog.cpp
-#           katlascontrol.cpp
            katlascrosshair.cpp
            katlasflag.cpp
            katlasglobe.cpp
@@ -37,7 +36,6 @@
            katlasviewpopupmenu.cpp
            katlaswindrose.cpp
            maptheme.cpp
-#           marblecontrol.cpp
            MarbleWidget.cpp
            measuretool.cpp
            placecontainer.cpp
@@ -59,41 +57,22 @@
            vectormap.cpp
            xmlhandler.cpp
 )
-#MESSAGE( STATUS ${marblewidget_SRCS} )
+MESSAGE( STATUS ${marblewidget_SRCS} )
 
-#if (QTONLY)
-#  set(marble_SRCS ${marble_SRCS} qtmain.cpp QtMainWindow.cpp)
-#  set(marble_HDRS ${marble_HDRS} QtMainWindow.h)
-#else (QTONLY)
-#  set(marble_SRCS ${marble_SRCS} kdemain.cpp KdeMainWindow.cpp)
-#  set(marble_HDRS ${marble_HDRS} KdeMainWindow.h)
-#endif (QTONLY)
-
 set (marblewidget_UI katlastilecreatordialog.ui placemarkinfodialog.ui \
                katlasaboutdialog.ui
-#           marblecontrol.ui	   MarbleControlBox.ui 
 )
 MESSAGE( STATUS ${marble_UI} )
 
 qt4_add_resources(marblewidget_SRCS libmarble.qrc)
 
 if (QTONLY)
-  qt4_wrap_ui(SOURCES_UI_HDRS ${marblewidget_UI})
+  qt4_wrap_ui(marblewidget_SRCS ${marblewidget_UI})
   qt4_automoc(${marblewidget_SRCS})
 else (QTONLY)
   kde4_add_ui_files(marblewidget_SRCS ${marblewidget_UI})
   kde4_automoc(${marblewidget_SRCS})
 endif (QTONLY)
 
-# qt4_generate_moc(${CMAKE_SOURCE_DIR}/src/MarbleWidgetPlugin.h \
                ${CMAKE_CURRENT_BINARY_DIR}/src/MarbleWidgetPlugin.moc)
-
-
-#kde4_add_library (marble SHARED ${marble_SRCS})
-#if (QTONLY)
-#  add_executable (marble WIN32 ${marble_SRCS} ${marble_HDRS})
-#else (QTONLY)
-#  kde4_add_executable (marble ${marble_SRCS} ${marble_HDRS})
-#endif (QTONLY)
-
 # why this??
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
@@ -136,7 +115,6 @@
            HttpDownloadManager.h
            httpfetchfile.h
            katlasaboutdialog.h
-#           katlascontrol.h
            katlascrosshair.h
            katlasdirs.h
            katlasflag.h
@@ -148,7 +126,6 @@
            katlasviewpopupmenu.h
            katlaswindrose.h
            maptheme.h
-           marblecontrol.h
            MarbleWidget.h
            measuretool.h
            placecontainer.h
--- trunk/KDE/kdeedu/marble/src/lib/libmarble.qrc #670797:670798
@@ -9,18 +9,4 @@
         <file>../../data/bitmaps/cursor_tl.xpm</file>
         <file>../../data/bitmaps/cursor_tr.xpm</file>
     </qresource>
-    <qresource>
-        <file>../icons/arrow-left.png</file>
-        <file>../icons/arrow-down.png</file>
-        <file>../icons/arrow-right.png</file>
-        <file>../icons/go-home.png</file>
-        <file>../icons/arrow-up.png</file>
-        <file>../icons/zoom-in.png</file>
-        <file>../icons/zoom-out.png</file>
-        <file>../icons/application-exit.png</file>
-        <file>../icons/document-save-as.png</file>
-        <file>../icons/document-print.png</file>
-        <file>../icons/edit-copy.png</file>
-        <file>../icons/marble.png</file>
-    </qresource>
 </RCC>


[prev in list] [next in list] [prev in thread] [next in thread]