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

List:       kde-commits
Subject:    kdenetwork/ksirc
From:       Antonio Larrosa Jimenez <larrosa () kde ! org>
Date:       2003-08-27 20:54:21
[Download RAW message or body]

CVS commit by antlarr: 

Fixed the icons for the system tray.
Also, simplified the directory structure. Why were two directories holding pictures?
Now one directory (icons) contains the standard themed icons, and the img directory
has the user icons


  A            icons/cr16-app-ksirc.png   1.1
  A            icons/cr22-action-info.png   1.1
  A            icons/cr22-action-ksirc_dock.png   1.1
  A            icons/cr32-app-ksirc.png   1.1
  A            icons/cr48-app-ksirc.png   1.1
  A            img/X.png   1.1
  A            img/action.png   1.1
  A            img/bminus.png   1.1
  A            img/bplus.png   1.1
  A            img/ctcpping.png   1.1
  A            img/dcc.png   1.1
  A            img/dccget.png   1.1
  A            img/dccsend.png   1.1
  A            img/elipsis.png   1.1
  A            img/error.png   1.1
  A            img/join.png   1.1
  A            img/kick.png   1.1
  A            img/minus.png   1.1
  A            img/misc1.png   1.1
  A            img/misc2.png   1.1
  A            img/misc3.png   1.1
  A            img/misc4.png   1.1
  A            img/misc5.png   1.1
  A            img/misc6.png   1.1
  A            img/misc7.png   1.1
  A            img/misc8.png   1.1
  A            img/misc9.png   1.1
  A            img/miscA.png   1.1
  A            img/mode.png   1.1
  A            img/notice.png   1.1
  A            img/ominus.png   1.1
  A            img/oplus.png   1.1
  A            img/part.png   1.1
  A            img/plus.png   1.1
  A            img/quit.png   1.1
  A            img/servinfo.png   1.1
  A            img/topic.png   1.1
  M +3 -3      dockservercontroller.cpp   1.20
  M +2 -12     icons/Makefile.am   1.3
  M +9 -3      img/Makefile.am   1.19
  R            icons/action.png   1.1
  R            icons/bminus.png   1.1
  R            icons/bplus.png   1.1
  R            icons/dcc.png   1.1
  R            icons/dccget.png   1.1
  R            icons/dccsend.png   1.1
  R            icons/elipsis.png   1.1
  R            icons/join.png   1.1
  R            icons/kick.png   1.1
  R            icons/minus.png   1.1
  R            icons/misc1.png   1.1
  R            icons/misc2.png   1.1
  R            icons/misc3.png   1.1
  R            icons/misc4.png   1.1
  R            icons/misc5.png   1.1
  R            icons/misc6.png   1.1
  R            icons/misc7.png   1.1
  R            icons/misc8.png   1.1
  R            icons/misc9.png   1.1
  R            icons/miscA.png   1.1
  R            icons/mode.png   1.1
  R            icons/notice.png   1.1
  R            icons/ominus.png   1.1
  R            icons/oplus.png   1.1
  R            icons/part.png   1.1
  R            icons/plus.png   1.1
  R            icons/quit.png   1.1
  R            icons/servinfo.png   1.1
  R            icons/topic.png   1.1
  R            img/lo16-app-ksirc.png   1.6
  R            img/lo32-app-ksirc.png   1.4


--- kdenetwork/ksirc/dockservercontroller.cpp  #1.19:1.20
@@ -80,6 +80,6 @@ dockServerController::dockServerControll
   connect(this, SIGNAL(quitSelected()), m_sc, SLOT(endksirc()));
 
-  m_pic_dock = UserIcon("ksirc_dock");
-  m_pic_info = UserIcon("info");
+  m_pic_dock = loadIcon("ksirc_dock");
+  m_pic_info = loadIcon("info");
 
   if ( !m_pic_dock.isNull() )

--- kdenetwork/ksirc/icons/Makefile.am  #1.2:1.3
@@ -1,15 +1,5 @@
-#SUBDIRS = emoticons
-
-# List of files to install
-emo_DATA = dcc.png      kick.png   mode.png    quit.png \
-X.png         dccget.png   minus.png  notice.png  servinfo.png \
-action.png    dccsend.png  ominus.png  topic.png \
-bminus.png    elipsis.png  oplus.png \
-bplus.png     error.png    part.png \
-ctcpping.png  join.png     plus.png
-
 # Directory where to install them
-emodir = $(kde_datadir)/ksirc/pics
+ksircicondir = $(kde_datadir)/ksirc/icons
+ksircicon_ICON = AUTO
 
 KDE_ICON = ksirc
-

--- kdenetwork/ksirc/img/Makefile.am  #1.18:1.19
@@ -3,8 +3,14 @@
 # List of files to install
 emo_DATA = server.xpm channel.xpm channels.xpm \
-        ksirc_a.xpm ksirc_b.xpm ksirc_dock.png \
+        ksirc_a.xpm ksirc_b.xpm \
         arrow.png greenpin.png madsmiley.png smiley.png sadsmiley.png \
-    blueball.png info.png star.png bluepin.png info1.png \
-        mini-run.png ksirc.png sdi.png mdi.png 
+    blueball.png star.png bluepin.png info1.png \
+        mini-run.png ksirc.png sdi.png mdi.png \
+    dcc.png      kick.png   mode.png    quit.png \
+    X.png         dccget.png   minus.png  notice.png  servinfo.png \
+    action.png    dccsend.png  ominus.png  topic.png \
+    bminus.png    elipsis.png  oplus.png \
+    bplus.png     error.png    part.png \
+    ctcpping.png  join.png     plus.png
 
 # Directory where to install them


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