Browse Source

Add small version of TIGCC IDE icon. Use it for the .desktop file in the RPM and for the task bar.

git-svn-id: file:///var/svn/tigccpp/trunk@719 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 18 years ago
parent
commit
74a26f26e9
6 changed files with 16 additions and 6 deletions
  1. 2 1
      ktigcc/KTIGCC.prj
  2. 8 4
      ktigcc/fedora/ktigcc.spec
  3. BIN
      ktigcc/images/ktigcc.png
  4. 2 1
      ktigcc/ktigcc.pro
  5. 2 0
      ktigcc/mainform.ui.h
  6. 2 0
      ktigcc/srcfilewin.ui.h

+ 2 - 1
ktigcc/KTIGCC.prj

@@ -149,7 +149,8 @@ module.pixmap.files=\
 	images/filereplace.png\
 	images/error.png\
 	images/warning.png\
-	images/info.png
+	images/info.png\
+	images/ktigcc.png
 
 module.data.name=.
 module.data.type=

+ 8 - 4
ktigcc/fedora/ktigcc.spec

@@ -31,8 +31,10 @@ make
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 mkdir -p $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/applications
-cat >${RPM_BUILD_ROOT}/usr/share/applications/ktigcc.desktop <<EOF
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons
+cp -pf images/ktigcc.png ${RPM_BUILD_ROOT}%{_datadir}/icons/ktigcc.png
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+cat >${RPM_BUILD_ROOT}%{_datadir}/applications/ktigcc.desktop <<EOF
 [Desktop Entry]
 Name=KTIGCC
 Comment=TIGCC IDE for KDE
@@ -41,13 +43,13 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Exec=%{tigccdir}/bin/ktigcc
-Icon=kdevelop
+Icon=%{_datadir}/icons/ktigcc.png
 Terminal=false
 Categories=Development;
 EOF
 desktop-file-install --delete-original --vendor tigcc     \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  ${RPM_BUILD_ROOT}/usr/share/applications/ktigcc.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/ktigcc.desktop
 
 %post
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -63,12 +65,14 @@ rm -rf $RPM_BUILD_ROOT
 %{tigccdir}/bin/ktigcc
 %{_datadir}/apps/katepart/syntax/gnuasm68k.xml
 %{_datadir}/apps/katepart/syntax/masm68k.xml
+%{_datadir}/icons/ktigcc.png
 %{_datadir}/applications/tigcc-ktigcc.desktop
 %doc %{tigccdir}/doc/ktigcc
 
 %changelog
 * Wed Jul 26 2006 Kevin Kofler <Kevin@tigcc.ticalc.org>
 Require kdebase (needed at least for proxy settings).
+Install icon and use it in the .desktop file.
 
 * Sun Jul 23 2006 Kevin Kofler <Kevin@tigcc.ticalc.org>
 Use libti*-devel instead of libti* in BuildRequires.

BIN
ktigcc/images/ktigcc.png


+ 2 - 1
ktigcc/ktigcc.pro

@@ -72,7 +72,8 @@ IMAGES	= images/00 \
 	images/filereplace.png \
 	images/error.png \
 	images/warning.png \
-	images/info.png
+	images/info.png \
+	images/ktigcc.png
 
 # If this is not used, a build from /usr/.... will generate
 # Makefiles with relative paths for install.  This totally

+ 2 - 0
ktigcc/mainform.ui.h

@@ -948,6 +948,8 @@ bool MainForm::findSourceFile(bool &inProject, void *&srcFile, const QString &fi
 
 void MainForm::init()
 {
+  setIcon(QPixmap::fromMimeSource("icon.png"));
+  KWin::setIcons(winId(),*(icon()),QPixmap::fromMimeSource("ktigcc.png"));
   ticables_library_init();
   tifiles_library_init();
   ticalcs_library_init();

+ 2 - 0
ktigcc/srcfilewin.ui.h

@@ -145,6 +145,8 @@ class KReplaceWithSelectionS : public KReplace {
 
 void SourceFileWindow::initBase()
 {
+  setIcon(QPixmap::fromMimeSource("icon.png"));
+  KWin::setIcons(winId(),*(icon()),QPixmap::fromMimeSource("ktigcc.png"));
   sourceFiles.append(THIS);
   THIS->dirWatch=new KDirWatch(this);
   setCaption(caption()+" - "+THIS->fileName);