[Kstars-devel] KDE/kdeedu/kstars/kstars

[Médéric Boquien]

SVN commit 931234 by mboquien:

Reorganisation part 3: move the options modules into an options/ dir.

CCMAIL: kstars-devel at kde.org


 M  +19 -4     CMakeLists.txt  
 M  +5 -5      kstarsactions.cpp  
 D             opsadvanced.cpp  
 D             opsadvanced.h  
 D             opsadvanced.ui  
 D             opscatalog.cpp  
 D             opscatalog.h  
 D             opscatalog.ui  
 D             opscolors.cpp  
 D             opscolors.h  
 D             opscolors.ui  
 D             opsguides.cpp  
 D             opsguides.h  
 D             opsguides.ui  
 D             opssolarsystem.cpp  
 D             opssolarsystem.h  
 D             opssolarsystem.ui  
 A             options (directory)  
 AM            options/opsadvanced.cpp   opsadvanced.cpp#931209 [License: GPL (v2+)]
 AM            options/opsadvanced.h   opsadvanced.h#931209 [License: GPL (v2+)]
 AM            options/opsadvanced.ui   opsadvanced.ui#931209
 AM            options/opscatalog.cpp   opscatalog.cpp#931209 [License: GPL (v2+)]
 AM            options/opscatalog.h   opscatalog.h#931209 [License: GPL (v2+)]
 AM            options/opscatalog.ui   opscatalog.ui#931209
 AM            options/opscolors.cpp   opscolors.cpp#931209 [License: GPL (v2+)]
 AM            options/opscolors.h   opscolors.h#931209 [License: GPL (v2+)]
 AM            options/opscolors.ui   opscolors.ui#931209
 AM            options/opsguides.cpp   opsguides.cpp#931209 [License: GPL (v2+)]
 AM            options/opsguides.h   opsguides.h#931209 [License: GPL (v2+)]
 AM            options/opsguides.ui   opsguides.ui#931209
 AM            options/opssolarsystem.cpp   opssolarsystem.cpp#931209 [License: GPL (v2+)]
 AM            options/opssolarsystem.h   opssolarsystem.h#931209 [License: GPL (v2+)]
 AM            options/opssolarsystem.ui   opssolarsystem.ui#931209


--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #931233:931234
@@ -228,6 +228,22 @@
 
 set( kstars_KCFG_SRCS Options.kcfgc )
 
+set(kstars_options_SRCS
+  options/opsadvanced.cpp
+  options/opscatalog.cpp
+  options/opscolors.cpp
+  options/opsguides.cpp
+  options/opssolarsystem.cpp 
+)
+
+set(kstars_optionsui_SRCS
+  options/opsadvanced.ui 
+  options/opscatalog.ui
+  options/opscolors.ui
+  options/opsguides.ui
+  options/opssolarsystem.ui 
+)
+
 set(kstars_extra_SRCS
 	addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp
 	deepskyobject.cpp detaildialog.cpp dms.cpp finddialog.cpp 
@@ -237,7 +253,6 @@
 	ksplanetbase.cpp kspluto.cpp kspopupmenu.cpp kssun.cpp kstars.cpp 
 	kstarsactions.cpp kstarsdata.cpp kstarsdatetime.cpp kstarsdcop.cpp kstarsinit.cpp 
 	kstarssplash.cpp ksutils.cpp kswizard.cpp locationdialog.cpp main.cpp 
-	opsadvanced.cpp opscatalog.cpp opscolors.cpp opsguides.cpp opssolarsystem.cpp 
 	simclock.cpp skymap.cpp skymapdraw.cpp skymapevents.cpp trailobject.cpp
 	skyobject.cpp skypoint.cpp skyline.cpp starobject.cpp timedialog.cpp timezonerule.cpp 
 	thumbnailpicker.cpp thumbnaileditor.cpp quaternion.cpp binfilehelper.cpp
@@ -245,6 +260,7 @@
 
 set(kstars_SRCS ${indi_SRCS} ${fits_SRCS} 
 	${libkstarswidgets_SRCS} ${libkstarscomponents_SRCS} ${libkstarstools_SRCS} ${kstars_extra_SRCS} ${xplanet_SRCS}
+	${kstars_options_SRCS}
 )
 
 qt4_add_dbus_adaptor(kstars_SRCS org.kde.kstars.xml kstars.h KStars)
@@ -256,12 +272,11 @@
 #kde4_add_dcop_skels(kstars_SRCS kstarsinterface.h simclockinterface.h )
 
 kde4_add_ui_files(kstars_SRCS
-       ${indiui_SRCS} ${fitsui_SRCS} ${xplanetui_SRCS}
+       ${indiui_SRCS} ${fitsui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS}
        addcatdialog.ui addlinkdialog.ui details_data.ui details_position.ui
        details_links.ui details_database.ui details_log.ui finddialog.ui
        focusdialog.ui fovdialog.ui newfov.ui locationdialog.ui 
-       wizwelcome.ui wizlocation.ui wizdownload.ui opsadvanced.ui 
-       opscatalog.ui opscolors.ui opsguides.ui opssolarsystem.ui 
+       wizwelcome.ui wizlocation.ui wizdownload.ui 
        thumbnailpicker.ui thumbnaileditor.ui 
 )
 
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #931233:931234
@@ -47,11 +47,11 @@
 #include <kicon.h>
 #include <knewstuff2/engine.h>
 
-#include "opscatalog.h"
-#include "opsguides.h"
-#include "opssolarsystem.h"
-#include "opscolors.h"
-#include "opsadvanced.h"
+#include "options/opscatalog.h"
+#include "options/opsguides.h"
+#include "options/opssolarsystem.h"
+#include "options/opscolors.h"
+#include "options/opsadvanced.h"
 
 #include "Options.h"
 #include "kstars.h"
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/options/opsadvanced.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/options/opscatalog.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/options/opscolors.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/options/opsguides.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/options/opssolarsystem.ui #property svn:mergeinfo
   +