Changeset dadb922 for src


Ignore:
Timestamp:
04/19/12 23:12:50 (10 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
687d76f
Parents:
1ba9324
Message:

Changed favourite icons as a response to ticket #40.

Location:
src
Files:
3 added
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • src/gui/eventdialog.cpp

    r1ba9324 rdadb922  
    5555    if(event.isFavourite())
    5656    {
    57         favouriteButton->setIcon(QIcon(":/icons/emblem-new.png"));
     57        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
    5858    }
    5959
     
    7272    {
    7373        event.setFavourite(false);
    74         favouriteButton->setIcon(QIcon(":/icons/emblem-new-off.png"));
     74        favouriteButton->setIcon(QIcon(":/icons/favourite-off.png"));
    7575    }
    7676    else
    7777    {
    7878        event.setFavourite(true);
    79         favouriteButton->setIcon(QIcon(":/icons/emblem-new.png"));
     79        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
    8080    }
    8181    event.update("favourite");
  • src/gui/eventdialog.ui

    r1ba9324 rdadb922  
    6767         <rect>
    6868          <x>0</x>
    69           <y>0</y>
    70           <width>461</width>
    71           <height>276</height>
     69          <y>-1</y>
     70          <width>446</width>
     71          <height>262</height>
    7272         </rect>
    7373        </property>
     
    291291           <normaloff>:/icons/appointment-soon-off.png</normaloff>:/icons/appointment-soon-off.png</iconset>
    292292         </property>
     293         <property name="iconSize">
     294          <size>
     295           <width>32</width>
     296           <height>32</height>
     297          </size>
     298         </property>
     299         <property name="shortcut">
     300          <string>CapsLock</string>
     301         </property>
    293302        </widget>
    294303       </item>
     
    300309         <property name="icon">
    301310          <iconset resource="../icons.qrc">
    302            <normaloff>:/icons/emblem-new-off.png</normaloff>:/icons/emblem-new-off.png</iconset>
     311           <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
     312         </property>
     313         <property name="iconSize">
     314          <size>
     315           <width>32</width>
     316           <height>32</height>
     317          </size>
    303318         </property>
    304319        </widget>
  • src/icons.qrc

    r1ba9324 rdadb922  
    11<RCC>
    2   <qresource prefix="/">
    3     <file>icons/add.png</file>
    4     <file>icons/remove.png</file>
    5     <file>icons/reload.png</file>
    6     <file>icons/appointment-soon-off.png</file>
    7     <file>icons/appointment-soon.png</file>
    8     <file>icons/emblem-new-off.png</file>
    9     <file>icons/emblem-new.png</file>
    10     <file>icons/dialog-warning.png</file>
    11     <file>icons/search.png</file>
    12     <file>icons/today.png</file>
    13   </qresource>
     2    <qresource prefix="/">
     3        <file>icons/add.png</file>
     4        <file>icons/remove.png</file>
     5        <file>icons/reload.png</file>
     6        <file>icons/appointment-soon-off.png</file>
     7        <file>icons/appointment-soon.png</file>
     8        <file>icons/dialog-warning.png</file>
     9        <file>icons/search.png</file>
     10        <file>icons/today.png</file>
     11        <file>icons/favourite-off.png</file>
     12        <file>icons/favourite-on.png</file>
     13    </qresource>
    1414</RCC>
  • src/mvc/delegate.cpp

    r1ba9324 rdadb922  
    306306    // FAVOURITE ICONs
    307307    // on
    308     mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/emblem-new.png"), NULL));
     308    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/favourite-on.png"), NULL));
    309309    // off
    310     mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/emblem-new-off.png"), NULL));
     310    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
    311311
    312312#ifdef MAEMO
Note: See TracChangeset for help on using the changeset viewer.