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

List:       kde-commits
Subject:    kdeextragear-2/kimdaba
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2005-01-04 20:36:00
Message-ID: 20050104203600.117171BB36 () office ! kde ! org
[Download RAW message or body]

CVS commit by blackie: 

reverted the kdeinit module stuff, as it required that I did a make install for each \
compile, which was a pain in the but


  M +0 -7      ChangeLog   1.150
  M +4 -7      Makefile.am   1.67
  M +2 -3      main.cpp   1.40
  M +4 -3      mysplashscreen.cpp   1.10


--- kdeextragear-2/kimdaba/ChangeLog  #1.149:1.150
@@ -1,9 +1,2 @@
-2005-01-03  Jesper K. Pedersen  <blackie@klaralvdalens-datakonsult.se>
-
-        * Made KimDaBa into a kdeinit loadable module. On non Linux
-        systems this should speed up start up time significantly, when
-        KimDaBa is started from the menu. Thanks to David Faure for once
-        again helping me out with automake.
-
 2005-01-02  Jesper K. Pedersen  <blackie@klaralvdalens-datakonsult.se>
 

--- kdeextragear-2/kimdaba/Makefile.am  #1.66:1.67
@@ -12,9 +12,6 @@
 INCLUDES = $(all_includes) $(COMPAT_INCLUDE)
 
-bin_PROGRAMS =
-lib_LTLIBRARIES=
-kdeinit_LTLIBRARIES = kimdaba.la
-
-kimdaba_la_SOURCES = \
+bin_PROGRAMS = kimdaba
+kimdaba_SOURCES = \
         main.cpp thumbnailview.cpp thumbnail.cpp imagemanager.cpp imageloader.cpp \
         options.cpp imageinfo.cpp viewer.cpp listselect.cpp mainview.cpp \
imageconfig.cpp \ @@ -35,6 +32,6 @@
         invaliddatefinder.cpp fileinfo.cpp imageinfolist.cpp
 
-kimdaba_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-kimdaba_la_LIBADD = $(LIB_KIO) $(COMPAT_LIBS) $(LIBJPEG) $(KIPI_LIBS)
+kimdaba_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kimdaba_LDADD = $(LIB_KIO) $(COMPAT_LIBS) -ljpeg $(KIPI_LIBS)
 
 METASOURCES = AUTO

--- kdeextragear-2/kimdaba/main.cpp  #1.39:1.40
@@ -35,7 +35,6 @@ static const KCmdLineOptions options[] =
 };
 
-extern "C" int kdemain(int argc, char **argv) {
-
-    KAboutData aboutData( "kimdaba", I18N_NOOP("KimDaBa"), "snapshot 1/1-05",
+int main( int argc, char** argv ) {
+    KAboutData aboutData( "kimdaba", I18N_NOOP("KimDaBa"), "CVS version of upcomming \
                2.1",
                           I18N_NOOP("KDE Image Database"), KAboutData::License_GPL,
                           0, 0, "http://ktown.kde.org/kimdaba");

--- kdeextragear-2/kimdaba/mysplashscreen.cpp  #1.9:1.10
@@ -22,4 +22,5 @@
 #include <kaboutdata.h>
 #include <qpainter.h>
+#include <qregexp.h>
 
 MySplashScreen* MySplashScreen::_instance = 0;
@@ -40,8 +41,8 @@ MySplashScreen::MySplashScreen()
     QString txt;
     QString version = KGlobal::instance()->aboutData()->version();
-    if ( version.startsWith( QString::fromLatin1("snap") ) )
-        txt = i18n( "KimDaBa %1" ).arg( version );
-    else
+    if ( QRegExp( QString::fromLatin1("[0-9.-]+") ).exactMatch( version ) )
         txt = i18n( "KimDaBa version %1" ).arg( version );
+    else
+        txt = i18n( "KimDaBa %1" ).arg( version );
     painter.drawText( QRect( QPoint(10, 400), QPoint( 630, 470 )), AlignRight | \
AlignBottom, txt );  }


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