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

List:       kde-i18n-doc
Subject:    KDE/kdeedu/marble/src
From:       Dennis Nienhüser <earthwings () gentoo ! org>
Date:       2010-11-14 19:13:31
Message-ID: 20101114191331.6EAEEAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197049 by nienhueser:

Starting with KDE 4.6, we separate the Marble applications (KDE and Qt) version \
numbers from the Marble library version number: The library version number will \
continue as before (KDE 4.5: 0.10, KDE 4.6: 0.11), but the Marble applications will \
be released as version 1.0 now (KDE 4.5: 0.10, KDE 4.6: 1.0). This separation is \
intended to underline that we have mature applications (1.x), but keep improving the \
library API under the hood, breaking ABI at times (0.x). The application version will \
                be bumped when branching 4.6.
RB: 5840
CCMAIL: kde-i18n-doc@kde.org

 M  +5 -0      ControlView.cpp  
 M  +6 -0      ControlView.h  
 M  +1 -0      QtMainWindow.cpp  
 M  +1 -1      kdemain.cpp  
 M  +7 -2      lib/MarbleAboutDialog.cpp  
 M  +6 -0      lib/MarbleAboutDialog.h  
 M  +1 -1      marble_part.cpp  


--- trunk/KDE/kdeedu/marble/src/ControlView.cpp #1197048:1197049
@@ -86,6 +86,11 @@
     delete m_mapThemeManager;
 }
 
+QString ControlView::applicationVersion()
+{
+    return "PRE-0.11.0 SVN";
+}
+
 void ControlView::zoomIn()
 {
     m_marbleWidget->zoomIn();
--- trunk/KDE/kdeedu/marble/src/ControlView.h #1197048:1197049
@@ -42,6 +42,12 @@
     explicit ControlView( QWidget * = 0 );
     virtual ~ControlView();
 
+    /**
+      * Returns the version of the Marble applications (which differs from
+      * the Marble library version).
+      */
+    static QString applicationVersion();
+
     MarbleWidget      *marbleWidget()  const { return m_marbleWidget; }
     MarbleControlBox  *marbleControl() const { return m_control;      }
 
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1197048:1197049
@@ -751,6 +751,7 @@
 void MainWindow::aboutMarble()
 {
     MarbleAboutDialog dlg(this);
+    dlg.setApplicationTitle( tr( "Marble Virtual Globe %1" ).arg( \
ControlView::applicationVersion() ) );  dlg.exec();
 }
 
--- trunk/KDE/kdeedu/marble/src/kdemain.cpp #1197048:1197049
@@ -61,7 +61,7 @@
 {
     KAboutData aboutData( "marble", 0, 
                           ki18n( "Marble Desktop Globe" ),
-                          MARBLE_VERSION_STRING.toLatin1(), 
+                          ControlView::applicationVersion().toLatin1(),
                           ki18n( "A World Atlas." ),
                           KAboutData::License_LGPL, ki18n( "(c) 2007, 2008, 2009, \
2010" ),  KLocalizedString(),
--- trunk/KDE/kdeedu/marble/src/lib/MarbleAboutDialog.cpp #1197048:1197049
@@ -47,7 +47,6 @@
     bool licenseLoaded;
 };
 
-
 MarbleAboutDialog::MarbleAboutDialog(QWidget *parent)
     : QDialog( parent ),
       d( new MarbleAboutDialogPrivate )
@@ -66,7 +65,8 @@
         d->uiWidget.m_pMarbleLogoLabel->setPixmap( 
                 QPixmap( MarbleDirs::path("svg/marble-logo-72dpi.png") ) );
     }
-    d->uiWidget.m_pMarbleVersionLabel->setText( tr("Version \
%1").arg(MARBLE_VERSION_STRING) ); +    setApplicationTitle( QObject::tr( "Marble \
Virtual Globe" ) ); +    d->uiWidget.m_pMarbleVersionLabel->setText( tr( "Using \
Marble Library version %1" ).arg( MARBLE_VERSION_STRING ) );  
     connect( d->uiWidget.tabWidget, SIGNAL( currentChanged( int ) ), 
              this, SLOT( loadPageContents( int ) ) );
@@ -258,6 +258,11 @@
     }
 }
 
+void MarbleAboutDialog::setApplicationTitle( const QString &title )
+{
+    d->uiWidget.m_pMarbleTitleLabel->setText( "<b>" + title + "</b>" );
 }
 
+}
+
 #include "MarbleAboutDialog.moc"
--- trunk/KDE/kdeedu/marble/src/lib/MarbleAboutDialog.h #1197048:1197049
@@ -35,6 +35,12 @@
     explicit MarbleAboutDialog(QWidget *parent = 0);
     ~MarbleAboutDialog();
 
+    /**
+      * Set the application title (usually name and version) to show
+      * The default application title is 'Marble Virtual Globe'
+      */
+    void setApplicationTitle( const QString &title );
+
  private Q_SLOTS:
     void loadPageContents( int idx );
 
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1197048:1197049
@@ -190,7 +190,7 @@
 {
     return new KAboutData( I18N_NOOP( "marble_part" ), 0,
                            ki18n( "A Desktop Globe" ),
-                           MARBLE_VERSION_STRING.toLatin1() );
+                           ControlView::applicationVersion().toLatin1() );
 }
 
 bool MarblePart::openUrl( const KUrl &url )


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