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

List:       kde-commits
Subject:    kdeedu/khangman/khangman
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2003-04-04 2:02:33
[Download RAW message or body]

CVS commit by annma: 

cleaning of splahscreen files and pic
update Makefile.am
add a warning if background pics are not found


  M +2 -2      Makefile.am   1.18
  M +8 -0      khangmanview.cpp   1.19
  M +1 -4      pics/Makefile.am   1.8
  R            info.cpp   1.2
  R            info.h   1.1
  R            infodlg.ui   1.2
  R            pics/khm_splash.png   1.2


--- kdeedu/khangman/khangman/Makefile.am  #1.17:1.18
@@ -1,10 +1,10 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = khangman
-khangman_SOURCES = info.cpp infodlg.ui mainw.ui pref1ui.ui pref2ui.ui khangman.cpp \
main.cpp khangmanview.cpp pref.cpp +khangman_SOURCES = mainw.ui pref1ui.ui pref2ui.ui \
khangman.cpp main.cpp khangmanview.cpp pref.cpp  khangman_LDADD   =  $(LIB_KDEUI)
 
 SUBDIRS = data pics sounds
 
-EXTRA_DIST = main.cpp lo16-app-khangman.png khangman.cpp lo32-app-khangman.png \
khangman.h khangman.desktop cr16-app-khangman.png cr32-app-khangman.png mainw.ui \
infodlg.ui pref1ui.ui pref2ui.ui info.cpp info.h khangmanview.h pref.h version.h \
+EXTRA_DIST = main.cpp lo16-app-khangman.png khangman.cpp lo32-app-khangman.png \
khangman.h khangman.desktop cr16-app-khangman.png cr32-app-khangman.png mainw.ui \
pref1ui.ui pref2ui.ui khangmanview.h pref.h version.h  
 KDE_ICON = khangman

--- kdeedu/khangman/khangman/khangmanview.cpp  #1.18:1.19
@@ -42,4 +42,12 @@ KHangManView::KHangManView(QWidget *pare
         bluePix = QPixmap(QPixmap(locate("data","khangman/pics/blue.png") ) );
         naturePix = QPixmap(QPixmap(locate("data","khangman/pics/nature.png") ) );
+        if (bluePix.isNull() || naturePix.isNull())
+        {
+                QString mString=i18n("The backgrounds files are not found.\n"
+                                     "Check your installation, please!");
+                KMessageBox::sorry( this, mString,
+                                    i18n("KHangMan - Error") );
+                exit(1);
+        }
         //put some warning if background file is not found
 

--- kdeedu/khangman/khangman/pics/Makefile.am  #1.7:1.8
@@ -1,9 +1,7 @@
 
-EXTRA_DIST = khm_splash.png hg10.jpg hg12.jpg hg1.jpg hg2.jpg hg3.jpg hg4.jpg \
hg5.jpg hg6.jpg hg7.jpg hg8.jpg hg9.jpg blue.png nature.png +EXTRA_DIST = hg10.jpg \
hg12.jpg hg1.jpg hg2.jpg hg3.jpg hg4.jpg hg5.jpg hg6.jpg hg7.jpg hg8.jpg hg9.jpg \
blue.png nature.png  
 install-data-local:
         $(mkinstalldirs) $(kde_datadir)/khangman/pics/
-        $(INSTALL_DATA) $(srcdir)/khm_splash.png \
                $(kde_datadir)/khangman/pics/khm_splash.png
-        $(mkinstalldirs) $(kde_datadir)/khangman/pics/
         $(INSTALL_DATA) $(srcdir)/hg10.jpg $(kde_datadir)/khangman/pics/hg10.jpg
         $(mkinstalldirs) $(kde_datadir)/khangman/pics/
@@ -33,5 +31,4 @@
 
 uninstall-local:
-        -rm -f $(kde_datadir)/khangman/pics/khm_splash.png
         -rm -f $(kde_datadir)/khangman/pics/hg10.jpg
         -rm -f $(kde_datadir)/khangman/pics/hg12.jpg


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