[Kstars-devel] KDE/kdeedu
Jasem Mutlaq
mutlaqja at ikarustech.com
Sun Aug 19 10:01:47 CEST 2007
SVN commit 701773 by mutlaqja:
Removing 'add link' from popupmenu, since it already exists in the
details dialog. A few more updates to the manual.
CCMAIL:kstars-devel at kde.org
M +2 -29 doc/kstars/commands.docbook
D doc/kstars/dcop.docbook
M +5 -5 doc/kstars/install.docbook
M +4 -51 kstars/kstars/kspopupmenu.cpp
M +0 -12 kstars/kstars/kspopupmenu.h
--- trunk/KDE/kdeedu/doc/kstars/commands.docbook #701772:701773
@@ -53,7 +53,7 @@
<guimenu>File</guimenu>
<guimenuitem>Open FITS...</guimenuitem>
</menuchoice></term>
-<listitem><para>Open a FITS image in the FITS Editor tool
+<listitem><para>Open a FITS image in the FITS Viewer tool
</para></listitem>
</varlistentry>
@@ -746,33 +746,6 @@
</para></listitem>
</varlistentry>
-<varlistentry>
-<term>[All Named Objects]</term>
-<listitem><para>
-<indexterm><primary>Objects in the Sky</primary>
-<secondary>Internet Links</secondary>
-<tertiary>Customizing</tertiary></indexterm>
-<guimenuitem>Add Link...</guimenuitem>: This allows you to add your own
-custom links to the popup menu of any object. It opens a small window
-in which you enter the &URL; of the link, and the text you want to
-appear in the popup menu. There is also a pair of radio buttons which
-allow you to specify whether the &URL; is an image or an
-<acronym>HTML</acronym> document, so &kstars; knows whether to launch
-the web browser or the image viewer. You can use this to add links to
-files on your local disk, so this feature could be used to attach
-observing logs or other custom information to objects in &kstars;.
-Your custom links are automatically loaded whenever &kstars; starts up,
-and they are stored in the folder <filename
-class="directory">~/.kde/share/apps/kstars/</filename>, in files
-<filename>myimage_url.dat</filename> and
-<filename>myinfo_url.dat</filename>. If you build an extensive list
-of custom links, consider submitting them to us, we would like to
-include them in the next version of &kstars;!
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
</sect2>
</sect1>
@@ -908,7 +881,7 @@
<varlistentry>
<term><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></term>
-<listitem><para>Run a &kstars; DCOP script</para></listitem>
+<listitem><para>Run a &kstars; DBus script</para></listitem>
</varlistentry>
<varlistentry>
--- trunk/KDE/kdeedu/doc/kstars/install.docbook #701772:701773
@@ -27,16 +27,16 @@
and Mandrake. Some distributions package &kstars; as a separate application, some
just provide a kdeedu package, which includes &kstars;.
</para><para>
-If you would like the latest CVS development version of &kstars;, please
-follow <ulink url="http://edu.kde.org/kstars/cvs.html">these instructions</ulink>.
+If you would like the latest SVN development version of &kstars;, please
+follow <ulink url="http://edu.kde.org/kstars/svn.php">these instructions</ulink>.
</para>
</sect1>
<sect1 id="requirements">
<title>Requirements</title>
<para>
-In order to successfully run &kstars;, you need &kde; >=3.2 and
-&Qt;>=3.2.
+In order to successfully run &kstars;, you need &kde; >=4.0 and
+&Qt;>=4.3.
</para>
<para>
To compile &kstars;, you will also have to have the following packages
@@ -48,7 +48,7 @@
<listitem><para>fam-devel</para></listitem>
<listitem><para>png-devel</para></listitem>
<listitem><para>jpeg-devel</para></listitem>
-<listitem><para>autoconf (>=2.5)</para></listitem>
+<listitem><para>cmake</para></listitem>
</itemizedlist></para>
<para>
--- trunk/KDE/kdeedu/kstars/kstars/kspopupmenu.cpp #701772:701773
@@ -69,18 +69,16 @@
addAction( i18nc( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ks->map(), SLOT( slotDSS2() ) );
}
-void KSPopupMenu::createStarMenu( StarObject *star ) {
+void KSPopupMenu::createStarMenu( StarObject *star )
+{
//Add name, rise/set time, center/track, and detail-window items
initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" , star->sptype()),
i18n( "star" ) );
//If the star is named, add custom items to popup menu based on object's ImageList and InfoList
- if ( star->name() != "star" ) {
- addLinksToMenu( star );
- } else {
addAction( i18nc( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ks->map(), SLOT( slotDSS() ) );
addAction( i18nc( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ks->map(), SLOT( slotDSS2() ) );
- }
+
}
void KSPopupMenu::createDeepSkyObjectMenu( SkyObject *obj ) {
@@ -89,7 +87,6 @@
if ( obj->longname() != obj->name() ) secondName = obj->translatedLongName();
initPopupMenu( obj, obj->translatedName(), secondName, TypeName );
- addLinksToMenu( obj );
}
void KSPopupMenu::createCustomObjectMenu( SkyObject *obj ) {
@@ -99,7 +96,6 @@
initPopupMenu( obj, obj->translatedName(), secondName, TypeName );
- addLinksToMenu( obj, true, false ); //don't allow user to add more links (temporary)
}
void KSPopupMenu::createPlanetMenu( SkyObject *p ) {
@@ -109,7 +105,6 @@
oname = ((KSMoon *)p)->phaseName();
}
initPopupMenu( p, p->translatedName(), oname, i18n("Solar System"), true, true, true, true, addTrail );
- addLinksToMenu( p, false ); //don't offer DSS images for planets
}
void KSPopupMenu::initPopupMenu( SkyObject *obj, const QString &_s1, const QString &s2, const QString &s3,
@@ -248,47 +243,6 @@
addSeparator();
}
-void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom ) {
- QString sURL;
- QStringList::Iterator itList, itTitle, itListEnd;
-
- itList = obj->ImageList.begin();
- itTitle = obj->ImageTitle.begin();
- itListEnd = obj->ImageList.end();
-
- int id = 100;
- for ( ; itList != itListEnd; ++itList ) {
- QString t = QString(*itTitle);
- sURL = QString(*itList);
- addAction( i18nc( "Image/info menu item (should be translated)", t.toLocal8Bit() ), ks->map(), SLOT( slotImage() ) );
- ++itTitle;
- }
-
- if ( showDSS ) {
- addAction( i18nc( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ks->map(), SLOT( slotDSS() ) );
- addAction( i18nc( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ks->map(), SLOT( slotDSS2() ) );
- addSeparator();
- }
- else if ( obj->ImageList.count() ) addSeparator();
-
- itList = obj->InfoList.begin();
- itTitle = obj->InfoTitle.begin();
- itListEnd = obj->InfoList.end();
-
- id = 200;
- for ( ; itList != itListEnd; ++itList ) {
- QString t = QString(*itTitle);
- sURL = QString(*itList);
- addAction( i18nc( "Image/info menu item (should be translated)", t.toLocal8Bit() ), ks->map(), SLOT( slotInfo() ) );
- ++itTitle;
- }
-
- if ( allowCustom ) {
- addSeparator();
- addAction( i18n( "Add Link..." ), ks->map(), SLOT( addLink() ) );
- }
-}
-
bool KSPopupMenu::addINDI(void)
{
INDIMenu *indiMenu = ks->getINDIMenu();
@@ -297,7 +251,6 @@
INDI_G *grp;
INDI_P *prop(NULL);
INDI_E *element;
- int id=0;
if (indiMenu->mgr.count() == 0)
return false;
@@ -373,7 +326,7 @@
{
menuDevice->addSeparator();
//menuDevice->insertItem(i18n("Center && Track Crosshair"), id++);
- QAction *a = menuDevice->addAction(i18n("Center && Track Crosshair"));
+ menuDevice->addAction(i18n("Center && Track Crosshair"));
if (dev->findElem("RA"))
prop = dev->findElem("RA")->pp;
else
--- trunk/KDE/kdeedu/kstars/kstars/kspopupmenu.h #701772:701773
@@ -69,18 +69,6 @@
bool addTrail=false, bool showAngularDistance=true,
bool showObsList=true );
-/**Add an item to the popup menu for each of the URL links associated with
- *this object. URL links appear in two categories: images and information pages.
- *For some objects, a link to Digitized Sky Survey images will automatically be added
- *in addition to the object's normal image links. Also, for some objects, an
- *"Add link..." item will be included, which allows the user to add their own custom
- *URLs for this object.
- *@param obj pointer to the skyobject which the menu describes
- *@param showDSS if true, include DSS Image links
- *@param allowCustom if true, include the "Add Link..." item
- */
- void addLinksToMenu( SkyObject *obj, bool showDSS=true, bool allowCustom=true );
-
/**@short Create a popup menu for a star.
*
*Stars get the following labels: a primary name and/or a genetive name,
More information about the Kstars-devel
mailing list