Changeset 3e3137afb4974b6b1530daf1f3626aaf8563502d

Show
Ignore:
Timestamp:
05/12/2007 12:24:04 AM (2 years ago)
Author:
daf <daf>
git-committer:
daf <daf> 1178954644 +0000
git-parent:

[3022c329cd01edbd7dfa3400d41a87dfbf59e56e]

git-author:
daf <daf> 1178954644 +0000
Message:

Added main application icons, ready for 1.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ChangeLog

    r3022c32 r3e3137a  
     1Fri May 11 15:09:04 EDT 2007    Dave Foster <daf@minuslab.net> 
     2        * Added main application icons by Craig Duquette. 
     3        * Updated license info to include CC license for icons. 
     4 
    15Fri Apr  6 14:04:46 EDT 2007    Javeed Shaikh <syscrash2k@gmail.com> 
    26        * Trying to fix a bug where icons are not being found, causing 
  • README

    rcbcc36f r3e3137a  
    4242irc.freenode.net, and talk to nightm4re or syscrash2k. 
    4343 
     44 
     45Nitrogen is licensed under the GPL.  See COPYING. 
     46Icons are licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 2.5 
     47license.  
     48 
     49see http://creativecommons.org/licenses/by-nc-nd/2.5/ 
  • data/icons/Makefile.am

    rcabd580 r3e3137a  
    22themedir=$(datadir)/icons/$(theme) 
    33theme_icons = \ 
     4        apps,nitrogen-128.png \ 
     5        apps,nitrogen-16.png \ 
     6        apps,nitrogen-22.png \ 
     7        apps,nitrogen-32.png \ 
     8        apps,nitrogen-48.png \ 
    49        devices,video-display-16.png \ 
    510        actions,wallpaper-bestfit-16.png \ 
  • src/NWindow.cc

    r3022c32 r3e3137a  
    6464 
    6565        // set icon 
    66         extern guint8 ni_icon[]; 
    67         Glib::RefPtr<Gdk::Pixbuf> icon = Gdk::Pixbuf::create_from_inline(24+32767, ni_icon); 
    68         this->set_icon(icon); 
     66        try { 
     67                Glib::RefPtr<Gtk::IconTheme> icontheme = Gtk::IconTheme::get_default(); 
     68                std::vector<Glib::RefPtr<Gdk::Pixbuf> > vec; 
     69                vec.push_back(icontheme->load_icon("nitrogen", 16, Gtk::ICON_LOOKUP_NO_SVG)); 
     70                vec.push_back(icontheme->load_icon("nitrogen", 22, Gtk::ICON_LOOKUP_NO_SVG)); 
     71                vec.push_back(icontheme->load_icon("nitrogen", 32, Gtk::ICON_LOOKUP_NO_SVG)); 
     72                vec.push_back(icontheme->load_icon("nitrogen", 48, Gtk::ICON_LOOKUP_NO_SVG)); 
     73                vec.push_back(icontheme->load_icon("nitrogen", 128, Gtk::ICON_LOOKUP_NO_SVG)); 
     74                Glib::ListHandle<Glib::RefPtr<Gdk::Pixbuf> > lister(vec); 
     75 
     76                this->set_icon_list(lister); 
     77        } catch  (...) { 
     78                // don't even worry about it! 
     79        } 
     80         
    6981} 
    7082