KDE/kdepim

Jaroslaw Staniek js at iidea.pl
Wed Mar 26 10:51:05 CET 2008


SVN commit 790258 by staniek:

Set icons for executables under Windows and Mac.

Now our apps look like this:
 http://kexi-project.org/pics/kde/kdepim/2008-03/kde-pim-icons.png

CCMAIL:kde-pim at kde.org
CCMAIL:kde-windows at kde.org



 M  +2 -0      CMakeLists.txt  
 M  +5 -1      akonadi/agents/nepomuk_email_feeder/CMakeLists.txt  
 M  +2 -0      akonadi/clients/akonamail/CMakeLists.txt  
 M  +5 -0      akonadi/clients/kabc/CMakeLists.txt  
 M  +4 -0      akonadi/kabc/kcontactmanager/CMakeLists.txt  
 M  +1 -0      akregator/src/CMakeLists.txt  
 M  +3 -0      console/kabcclient/src/CMakeLists.txt  
 M  +2 -0      console/konsolekalendar/CMakeLists.txt  
 M  +2 -0      kaddressbook/CMakeLists.txt  
 M  +3 -0      kitchensync/src/CMakeLists.txt  
 M  +5 -1      kleopatra/CMakeLists.txt  
 M  +7 -1      kleopatra/kgpgconf/CMakeLists.txt  
 M  +2 -0      kmail/CMakeLists.txt  
 M  +1 -0      kmailcvt/CMakeLists.txt  
 M  +2 -0      kmobiletools/kmobiletools/CMakeLists.txt  
 M  +3 -0      knode/CMakeLists.txt  
 M  +1 -0      knotes/CMakeLists.txt  
 M  +1 -0      kontact/src/CMakeLists.txt  
 M  +2 -0      korganizer/CMakeLists.txt  
 M  +2 -0      korganizer/korgac/CMakeLists.txt  
 M  +3 -0      korn/CMakeLists.txt  
 M  +6 -0      kpilot/kpilot/CMakeLists.txt  
 M  +2 -0      kresources/groupwise/soap/CMakeLists.txt  
 M  +3 -0      kresources/scalix/scalixadmin/CMakeLists.txt  
 M  +4 -0      ktimetracker/CMakeLists.txt  
 M  +3 -0      ktnef/CMakeLists.txt  
 M  +14 -0     libkdepim/kmeditor.cpp  
 M  +3 -0      libkdepim/kmeditor.h  
 M  +16 -0     wizards/CMakeLists.txt  


--- trunk/KDE/kdepim/CMakeLists.txt #790257:790258
@@ -20,6 +20,8 @@
                         ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
 endif(WIN32)
 
+set(KDE4_ICON_DIR ${KDE4_INSTALL_DIR}/share/icons)
+
 # this macro exists to work around a stupid Mac OS X linker bug
 # where it can't handle the same library being referenced multiple
 # times on the linker line
--- trunk/KDE/kdepim/akonadi/agents/nepomuk_email_feeder/CMakeLists.txt #790257:790258
@@ -5,8 +5,12 @@
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-kde4_add_executable(akonadi_nepomuk_email_feeder RUN_UNINSTALLED nepomukemailfeeder.cpp)
+set(akonadi_nepomuk_email_feeder_SRCS nepomukemailfeeder.cpp)
 
+kde4_add_app_icon(akonadi_nepomuk_email_feeder_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/nepomuk.png")
+
+kde4_add_executable(akonadi_nepomuk_email_feeder RUN_UNINSTALLED ${akonadi_nepomuk_email_feeder_SRCS})
+
 target_link_libraries(akonadi_nepomuk_email_feeder
   ${AKONADI_LIBS}
   ${QT_QTCORE_LIBRARY}
--- trunk/KDE/kdepim/akonadi/clients/akonamail/CMakeLists.txt #790257:790258
@@ -11,6 +11,8 @@
   ../../server/interfaces/org.kde.Akonadi.TracerNotification.xml
 )
 
+kde4_add_app_icon(akonamail_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/email.png")
+
 kde4_add_executable(akonamail_bin ${akonamail_bin_SRCS})
 set_target_properties(akonamail_bin PROPERTIES OUTPUT_NAME akonamail)
 
--- trunk/KDE/kdepim/akonadi/clients/kabc/CMakeLists.txt #790257:790258
@@ -6,6 +6,9 @@
 )
 
 
+# todo: more appropriate icon?
+kde4_add_app_icon(kabcviewer_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
+
 kde4_add_executable(kabcviewer_bin ${kabcviewer_bin_SRCS})
 set_target_properties(kabcviewer_bin PROPERTIES OUTPUT_NAME kabcviewer)
 
@@ -19,6 +22,8 @@
   kabceditor.cpp
 )
 
+# todo: more appropriate icon?
+kde4_add_app_icon(kabceditor_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
 
 kde4_add_executable(kabceditor_bin ${kabceditor_bin_SRCS})
 set_target_properties(kabceditor_bin PROPERTIES OUTPUT_NAME kabceditor)
--- trunk/KDE/kdepim/akonadi/kabc/kcontactmanager/CMakeLists.txt #790257:790258
@@ -17,6 +17,10 @@
   mainwindow.cpp
 )
 
+
+# todo: more appropriate icon?
+kde4_add_app_icon(kcontactmanager_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/view-pim-contacts.png")
+
 kde4_add_executable(kcontactmanager RUN_UNINSTALLED ${kcontactmanager_SRCS})
 
 target_link_libraries(kcontactmanager ${AKONADI_LIBS} akonadi-kabc ${KDE4_KDEUI_LIBRARY} )
--- trunk/KDE/kdepim/akregator/src/CMakeLists.txt #790257:790258
@@ -15,6 +15,7 @@
 
 set(akregator_SRCS main.cpp mainwindow.cpp )
 
+kde4_add_app_icon(akregator_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/akregator.png")
 
 kde4_add_executable(akregator ${akregator_SRCS})
 
--- trunk/KDE/kdepim/console/kabcclient/src/CMakeLists.txt #790257:790258
@@ -17,6 +17,9 @@
     outputformatimpls.cpp)
 
 
+# todo: more appropriate icon?
+kde4_add_app_icon(kabcclient_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
+
 kde4_add_executable(kabcclient NOGUI ${kabcclient_SRCS})
 
 target_link_libraries(kabcclient ${KDE4_KABC_LIBS} ${KDE4_KDEUI_LIBS} )
--- trunk/KDE/kdepim/console/konsolekalendar/CMakeLists.txt #790257:790258
@@ -20,6 +20,8 @@
    main.cpp )
 
 
+kde4_add_app_icon(konsolekalendar_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-calendar.png")
+
 kde4_add_executable(konsolekalendar NOGUI ${konsolekalendar_SRCS})
 
 target_link_libraries(konsolekalendar  ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kdepim)
--- trunk/KDE/kdepim/kaddressbook/CMakeLists.txt #790257:790258
@@ -69,6 +69,8 @@
 
 qt4_add_dbus_adaptor(kaddressbook_bin_SRCS org.kde.KAddressbook.Core.xml kaddressbookmain.h KAddressBookMain kaddressbookadaptor )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kaddressbook_bin_SRCS "hi*-app-kaddressbook.png")
 kde4_add_executable(kaddressbook_bin ${kaddressbook_bin_SRCS})
 set_target_properties(kaddressbook_bin PROPERTIES OUTPUT_NAME kaddressbook)
 
--- trunk/KDE/kdepim/kitchensync/src/CMakeLists.txt #790257:790258
@@ -12,6 +12,9 @@
 )
 
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kitchensync_SRCS "pics/hi*-app-kitchensync.png")
+
 KDE4_ADD_EXECUTABLE(kitchensync ${kitchensync_SRCS})
 
 TARGET_LINK_LIBRARIES(kitchensync kitchensyncprivate ${QT_QTGUI_LIBRARY} ${KDE_KDEUI_LIBRARY} )
--- trunk/KDE/kdepim/kleopatra/CMakeLists.txt #790257:790258
@@ -17,8 +17,10 @@
 if (USABLE_ASSUAN_FOUND)
    include_directories(${ASSUAN_INCLUDES})
 endif(USABLE_ASSUAN_FOUND)
-add_definitions ( -DQT_STL -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS ${KDE4_ENABLE_EXCEPTIONS} -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL )
+add_definitions ( -DQT_STL -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
 add_subdirectory( pics )
 add_subdirectory( conf )
 add_subdirectory( kgpgconf )
@@ -178,6 +180,8 @@
 
 add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
 
+
+kde4_add_app_icon(_kleopatra_mainwindow_SRCS "ox*-app-kleopatra.png")
 kde4_add_executable(kleopatra_bin ${_kleopatra_common_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} )
 set_target_properties(kleopatra_bin  PROPERTIES OUTPUT_NAME kleopatra)
 
--- trunk/KDE/kdepim/kleopatra/kgpgconf/CMakeLists.txt #790257:790258
@@ -1,8 +1,10 @@
 project(kgpgconf)
 
 include_directories( ${CMAKE_SOURCE_DIR}/libkleo/backends/qgpgme )
-add_definitions ( ${KDE4_ENABLE_EXCEPTIONS} -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL -DKDE_DEFAULT_DEBUG_AREA=5154 )
+add_definitions ( -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL -DKDE_DEFAULT_DEBUG_AREA=5154 )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
 set(_kgpgconf_SRCS
     configreader.cpp
     configwriter.cpp
@@ -14,6 +16,10 @@
 
 kde4_add_ui_files( _kgpgconf_SRCS mainwidget.ui )
 
+
+# todo: more appropriate icon?
+kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
 kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
 target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
 
--- trunk/KDE/kdepim/kmail/CMakeLists.txt #790257:790258
@@ -320,6 +320,8 @@
 
 set(kmail_SRCS main.cpp )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kmail_SRCS "hi*-app-kmail.png")
 
 kde4_add_executable(kmail ${kmail_SRCS})
 
--- trunk/KDE/kdepim/kmailcvt/CMakeLists.txt #790257:790258
@@ -31,6 +31,7 @@
 
 kde4_add_ui_files(kmailcvt_SRCS kselfilterpagedlg.ui kimportpagedlg.ui)
 
+kde4_add_app_icon(kmailcvt_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/kmailcvt.png")
 kde4_add_executable(kmailcvt ${kmailcvt_SRCS})
 add_dependencies(kmailcvt kmail_xml)
 
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/CMakeLists.txt #790257:790258
@@ -20,6 +20,8 @@
 
 set(kmobiletools_SRCS main.cpp kmobiletools.cpp kmobiletools.h )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kmobiletools_SRCS "libkmobiletools/icons/hi*-app-kmobiletools.png")
 
 kde4_add_executable(kmobiletools_bin ${kmobiletools_SRCS})
 set_target_properties(kmobiletools_bin PROPERTIES OUTPUT_NAME kmobiletools)
--- trunk/KDE/kdepim/knode/CMakeLists.txt #790257:790258
@@ -119,6 +119,9 @@
 set(knode_SRCS knode.cpp knapplication.cpp main.cpp )
 
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(knode_SRCS "hi*-app-knode2.png")
+
 kde4_add_executable(knode ${knode_SRCS})
 
 kdepim4_link_unique_libraries(knode ${KDE4_KDECORE_LIBS} knodecommon )
--- trunk/KDE/kdepim/knotes/CMakeLists.txt #790257:790258
@@ -24,6 +24,7 @@
 
 kde4_add_kcfg_files(knotes_SRCS ${libknotesconfig_SRCS})
 
+kde4_add_app_icon(knotes_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/knotes.png")
 
 kde4_add_executable(knotes ${knotes_SRCS})
 
--- trunk/KDE/kdepim/kontact/src/CMakeLists.txt #790257:790258
@@ -27,6 +27,7 @@
 
 set(kontact_bin_SRCS main.cpp )
 
+kde4_add_app_icon(kontact_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/kontact.png")
 
 kde4_add_executable(kontact_bin ${kontact_bin_SRCS})
 
--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #790257:790258
@@ -31,6 +31,8 @@
    koapp.cpp
 )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(korganizer_SRCS "hi*-app-korganizer.png")
 
 kde4_add_executable(korganizer ${korganizer_SRCS})
 
--- trunk/KDE/kdepim/korganizer/korgac/CMakeLists.txt #790257:790258
@@ -23,6 +23,8 @@
 qt4_add_dbus_adaptor(korgac_SRCS org.kde.korganizer.KOrgac.xml koalarmclient.h KOAlarmClient )
 
 
+kde4_add_app_icon(korgac_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-notification-bell.png")
+
 kde4_add_executable(korgac ${korgac_SRCS})
 
 target_link_libraries(korgac  ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} korganizer_eventviewer)
--- trunk/KDE/kdepim/korn/CMakeLists.txt #790257:790258
@@ -63,6 +63,9 @@
 qt4_add_dbus_adaptor(korn_SRCS org.kde.korn.BoxContainerItem.xml boxcontaineritem.h BoxContainerItem )
 qt4_add_dbus_adaptor(korn_SRCS org.kde.korn.MailDrop.xml dbusdrop.h DBUSDrop )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(korn_SRCS "hi*-app-korn.png")
+
 kde4_add_executable(korn ${korn_SRCS})
 
 target_link_libraries(korn  ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KMIME_LIBS})
--- trunk/KDE/kdepim/kpilot/kpilot/CMakeLists.txt #790257:790258
@@ -111,6 +111,9 @@
 	org.kde.kpilot.daemon.xml kpilot_daemon_interface
 )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kpilotDaemon_SRCS "icons/hi*-app-kpilotDaemon.png")
+
 kde4_add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
 
 target_link_libraries(kpilotDaemon
@@ -164,6 +167,9 @@
 	org.kde.kpilot.daemon.xml daemon_interface
 )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(kpilot_bin_SRCS "icons/hi*-app-kpilot.png")
+
 kde4_add_executable(kpilot_bin ${kpilot_bin_SRCS})
 
 target_link_libraries(kpilot_bin 
--- trunk/KDE/kdepim/kresources/groupwise/soap/CMakeLists.txt #790257:790258
@@ -7,6 +7,8 @@
 set(soapdebug_SRCS soapdebug.cpp )
 
 
+# todo: more appropriate icon?
+kde4_add_app_icon(soapdebug_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/kbugbuster.png")
 
 kde4_add_executable(soapdebug TEST ${soapdebug_SRCS})
 
--- trunk/KDE/kdepim/kresources/scalix/scalixadmin/CMakeLists.txt #790257:790258
@@ -22,6 +22,9 @@
   settings.cpp
 )
 
+# todo: more appropriate icon?
+kde4_add_app_icon(scalixadmin_SRCS "${KDE4_ICON_DIR}/oxygen/*/categories/preferences-system-network.png")
+
 kde4_add_executable(scalixadmin ${scalixadmin_SRCS})
 TARGET_LINK_LIBRARIES(scalixadmin ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KLDAP_LIBS} kdepim )
 set_target_properties(scalixadmin PROPERTIES OUTPUT_NAME scalixadmin)
--- trunk/KDE/kdepim/ktimetracker/CMakeLists.txt #790257:790258
@@ -46,6 +46,10 @@
 
 
 kde4_add_executable(karm karm.cpp)
+
+# todo: move to Oxygen icon
+kde4_add_app_icon(karm_SRCS "hi*-app-ktimetracker.png")
+
 kde4_add_executable(ktimetracker ${karm_SRCS})
 
 
--- trunk/KDE/kdepim/ktnef/CMakeLists.txt #790257:790258
@@ -18,6 +18,9 @@
 
 kde4_add_ui_files(ktnef_bin_SRCS attachpropertydialogbase.ui )
 
+# todo: move to Oxygen icon
+kde4_add_app_icon(ktnef_bin_SRCS "pics/hi*-app-ktnef.png")
+
 kde4_add_executable(ktnef_bin ${ktnef_bin_SRCS})
 set_target_properties(ktnef_bin PROPERTIES OUTPUT_NAME ktnefviewer)
 
--- trunk/KDE/kdepim/libkdepim/kmeditor.cpp #790257:790258
@@ -63,6 +63,7 @@
 #include <QAction>
 #include <QProcess>
 #include <QTextLayout>
+#include <QTimer>
 
 //system includes
 #include <assert.h>
@@ -91,6 +92,7 @@
     //
     void addSuggestion( const QString&,const QStringList& );
 
+    void ensureCursorVisibleDelayed();
 
     //
     // Normal functions
@@ -239,6 +241,11 @@
   replacements[originalWord] = lst;
 }
 
+void KMeditorPrivate::ensureCursorVisibleDelayed()
+{
+  static_cast<KTextEdit*>( q )->ensureCursorVisible();
+}
+
 void KMeditorPrivate::mergeFormatOnWordOrSelection( const QTextCharFormat &format )
 {
   QTextCursor cursor = q->textCursor();
@@ -1169,4 +1176,11 @@
   return temp;
 }
 
+void KMeditor::ensureCursorVisible()
+{
+  QCoreApplication::processEvents();
+  // ugly hack because the layout changes afterwards, making the cursor hidden...
+  QTimer::singleShot(500, this, SLOT(ensureCursorVisibleDelayed()));
+}
+
 #include "kmeditor.moc"
--- trunk/KDE/kdepim/libkdepim/kmeditor.h #790257:790258
@@ -267,6 +267,8 @@
      */
     QString toWrappedPlainText() const;
 
+    void ensureCursorVisible();
+
   public Q_SLOTS:
 
     /**
@@ -380,6 +382,7 @@
     KMeditorPrivate *const d;
     friend class KMeditorPrivate;
     Q_PRIVATE_SLOT( d, void addSuggestion( const QString&, const QStringList& ) )
+    Q_PRIVATE_SLOT( d, void ensureCursorVisibleDelayed() )
 };
 
 }
--- trunk/KDE/kdepim/wizards/CMakeLists.txt #790257:790258
@@ -16,6 +16,10 @@
 
 kde4_add_kcfg_files(groupwarewizard_SRCS egroupwareconfig.kcfgc kolabconfig.kcfgc sloxconfig.kcfgc)
 
+
+# todo: more appropriate icon?
+kde4_add_app_icon(groupwarewizard_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
+
 kde4_add_executable(groupwarewizard ${groupwarewizard_SRCS})
 
 target_link_libraries(groupwarewizard  ${KDE4_KDECORE_LIBS} 
@@ -36,6 +40,9 @@
 
 kde4_add_kcfg_files(egroupwarewizard_SRCS egroupwareconfig.kcfgc)
 
+# todo: more appropriate icon?
+kde4_add_app_icon(egroupwarewizard_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
+
 kde4_add_executable(egroupwarewizard ${egroupwarewizard_SRCS})
 
 target_link_libraries(egroupwarewizard  ${KDE4_KDECORE_LIBS} kabc_xmlrpc kcal_xmlrpc knotes_xmlrpc ${KDE4_KCAL_LIBS} kdepim)
@@ -50,6 +57,9 @@
 
 kde4_add_kcfg_files(sloxwizard_SRCS sloxconfig.kcfgc)
 
+# todo: more appropriate icon?
+kde4_add_app_icon(sloxwizard_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
+
 kde4_add_executable(sloxwizard ${sloxwizard_SRCS})
 
 target_link_libraries(sloxwizard  ${KDE4_KDECORE_LIBS} kcal_slox kabc_slox ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} kdepim)
@@ -68,6 +78,9 @@
 
 kde4_add_kcfg_files(kolabwizard_SRCS kolabconfig.kcfgc)
 
+# todo: more appropriate icon?
+kde4_add_app_icon(kolabwizard_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
+
 kde4_add_executable(kolabwizard ${kolabwizard_SRCS})
 
 target_link_libraries(kolabwizard  ${KDE4_KCAL_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kabckolab knoteskolab kcalkolab kdepim)
@@ -85,6 +98,9 @@
 
 kde4_add_kcfg_files(scalixwizard_SRCS scalixconfig.kcfgc)
 
+# todo: more appropriate icon?
+kde4_add_app_icon(scalixwizard_SRCS "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
+
 kde4_add_executable(scalixwizard ${scalixwizard_SRCS})
 
 target_link_libraries(scalixwizard  ${KDE4_KCAL_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kabcscalix knotesscalix kcalscalix kdepim)


More information about the Kde-windows mailing list